Bug 1114841 - Part 2: Remove DOMMMIError (DOM). r=aknow
authorBen Hsu <bhsu@mozilla.com>
Sun, 04 Jan 2015 18:19:00 -0500
changeset 222453 61507e9f3bcf2460f8fea0fb67596f216d78316c
parent 222452 d4f3dee6afd6c6ed0598970688907cf6879c0ea9
child 222454 7d115ddc412e9d9af74400585e822869828e6228
push id13072
push userryanvm@gmail.com
push dateWed, 07 Jan 2015 18:42:25 +0000
treeherderb2g-inbound@7d115ddc412e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaknow
bugs1114841
milestone37.0a1
Bug 1114841 - Part 2: Remove DOMMMIError (DOM). r=aknow
dom/mobileconnection/DOMMMIError.cpp
dom/mobileconnection/DOMMMIError.h
dom/mobileconnection/moz.build
deleted file mode 100644
--- a/dom/mobileconnection/DOMMMIError.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "mozilla/dom/DOMMMIError.h"
-#include "mozilla/dom/DOMMMIErrorBinding.h"
-
-using namespace mozilla::dom;
-
-NS_IMPL_CYCLE_COLLECTION_CLASS(DOMMMIError)
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(DOMMMIError, DOMError)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(DOMMMIError, DOMError)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DOMMMIError)
-NS_INTERFACE_MAP_END_INHERITING(DOMError)
-
-NS_IMPL_ADDREF_INHERITED(DOMMMIError, DOMError)
-NS_IMPL_RELEASE_INHERITED(DOMMMIError, DOMError)
-
-DOMMMIError::DOMMMIError(nsPIDOMWindow* aWindow, const nsAString& aName,
-                         const nsAString& aMessage, const nsAString& aServiceCode,
-                         const Nullable<int16_t>& aInfo)
-  : DOMError(aWindow, aName, aMessage)
-  , mServiceCode(aServiceCode)
-  , mInfo(aInfo)
-{
-}
-
-JSObject*
-DOMMMIError::WrapObject(JSContext* aCx)
-{
-  return DOMMMIErrorBinding::Wrap(aCx, this);
-}
deleted file mode 100644
--- a/dom/mobileconnection/DOMMMIError.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_dom_MmiError_h
-#define mozilla_dom_MmiError_h
-
-#include "mozilla/dom/DOMError.h"
-
-namespace mozilla {
-namespace dom {
-
-class DOMMMIError MOZ_FINAL : public DOMError
-{
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DOMMMIError, DOMError)
-
-  DOMMMIError(nsPIDOMWindow* aWindow, const nsAString& aName,
-              const nsAString& aMessage, const nsAString& aServiceCode,
-              const Nullable<int16_t>& aInfo);
-
-  virtual JSObject*
-  WrapObject(JSContext* aCx) MOZ_OVERRIDE;
-
-  // WebIDL interface
-
-  void
-  GetServiceCode(nsString& aServiceCode) const
-  {
-    aServiceCode = mServiceCode;
-  }
-
-  Nullable<int16_t>
-  GetAdditionalInformation() const
-  {
-    return mInfo;
-  }
-
-private:
-  ~DOMMMIError() {}
-
-private:
-  nsString mServiceCode;
-  Nullable<int16_t> mInfo;
-};
-
-} // namespace dom
-} // namespace mozilla
-
-#endif // mozilla_dom_MmiError_h
--- a/dom/mobileconnection/moz.build
+++ b/dom/mobileconnection/moz.build
@@ -2,17 +2,16 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
 
 EXPORTS.mozilla.dom += [
-    'DOMMMIError.h',
     'MobileCellInfo.h',
     'MobileConnection.h',
     'MobileConnectionArray.h',
     'MobileConnectionInfo.h',
     'MobileNetworkInfo.h',
 ]
 
 EXPORTS.mozilla.dom.mobileconnection += [
@@ -29,17 +28,16 @@ XPIDL_SOURCES += [
     'interfaces/nsIMobileConnectionInfo.idl',
     'interfaces/nsIMobileConnectionService.idl',
     'interfaces/nsIMobileNetworkInfo.idl',
     'interfaces/nsINeighboringCellInfo.idl',
 ]
 
 UNIFIED_SOURCES += [
     'Assertions.cpp',
-    'DOMMMIError.cpp',
     'ipc/MobileConnectionChild.cpp',
     'ipc/MobileConnectionIPCService.cpp',
     'ipc/MobileConnectionParent.cpp',
     'MobileCallForwardingOptions.cpp',
     'MobileCellInfo.cpp',
     'MobileConnectionArray.cpp',
     'MobileConnectionCallback.cpp',
     'MobileConnectionInfo.cpp',