Bug 898445 - Part 1-2: Move MozMobileNetworkInfo to webidl. r=hsinyi,…

…smaug
dothq · Apr 24, 2014 · afbd861 · afbd861
1 parent 65d2475
commit afbd861
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 31 deletions.
diff --git a/dom/mobileconnection/interfaces/moz.build b/dom/mobileconnection/interfaces/moz.build
@@ -8,6 +8,7 @@ XPIDL_SOURCES += [
     'nsIDOMMobileConnection.idl',
     'nsIMobileCellInfo.idl',
     'nsIMobileConnectionProvider.idl',
+    'nsIMobileNetworkInfo.idl',
 ]
 
 XPIDL_MODULE = 'dom_mobileconnection'
diff --git a/dom/mobileconnection/interfaces/nsIDOMMobileConnection.idl b/dom/mobileconnection/interfaces/nsIDOMMobileConnection.idl
@@ -540,37 +540,6 @@ interface nsIDOMMozMobileConnectionInfo : nsISupports
 
 };
 
-[scriptable, uuid(40018fc7-4c42-47b6-8de6-3591a9c622bc)]
-interface nsIDOMMozMobileNetworkInfo: nsISupports
-{
-  /**
-   * Short name of the network operator
-   */
-  readonly attribute DOMString shortName;
-
-  /**
-   * Long name of the network operator
-   */
-  readonly attribute DOMString longName;
-
-  /**
-   * Mobile Country Code (MCC) of the network operator
-   */
-  readonly attribute DOMString mcc;
-
-  /**
-   * Mobile Network Code (MNC) of the network operator
-   */
-  readonly attribute DOMString mnc;
-
-  /**
-   * State of this network operator.
-   *
-   * Possible values: 'available', 'connected', 'forbidden', or null (unknown)
-   */
-  readonly attribute DOMString state;
-};
-
 [scriptable, uuid(d1b35ad8-99aa-47cc-ab49-2e72b00e39df)]
 interface nsIDOMMozMobileCFInfo : nsISupports
 {

diff --git a/dom/mobileconnection/interfaces/nsIMobileNetworkInfo.idl b/dom/mobileconnection/interfaces/nsIMobileNetworkInfo.idl
@@ -0,0 +1,36 @@
+/* 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 "nsISupports.idl"
+
+[scriptable, uuid(d7e1364c-61a0-4cf1-bae3-a960e87064e1)]
+interface nsIMobileNetworkInfo: nsISupports
+{
+  /**
+   * Short name of the network operator.
+   */
+  readonly attribute DOMString shortName;
+
+  /**
+   * Long name of the network operator.
+   */
+  readonly attribute DOMString longName;
+
+  /**
+   * Mobile Country Code (MCC) of the network operator.
+   */
+  readonly attribute DOMString mcc;
+
+  /**
+   * Mobile Network Code (MNC) of the network operator.
+   */
+  readonly attribute DOMString mnc;
+
+  /**
+   * State of this network operator.
+   *
+   * Possible values: 'available', 'connected', 'forbidden', or null (unknown).
+   */
+  readonly attribute DOMString state;
+};
diff --git a/dom/webidl/MozMobileNetworkInfo.webidl b/dom/webidl/MozMobileNetworkInfo.webidl
@@ -0,0 +1,36 @@
+/* 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/. */
+
+enum MobileNetworkState {"available", "connected", "forbidden"};
+
+[Pref="dom.mobileconnection.enabled",
+ ChromeConstructor(DOMString shortName, DOMString longName, DOMString mcc,
+                   DOMString mnc, DOMString state)]
+interface MozMobileNetworkInfo
+{
+  /**
+   * Short name of the network operator.
+   */
+  readonly attribute DOMString? shortName;
+
+  /**
+   * Long name of the network operator.
+   */
+  readonly attribute DOMString? longName;
+
+  /**
+   * Mobile Country Code (MCC) of the network operator.
+   */
+  readonly attribute DOMString? mcc;
+
+  /**
+   * Mobile Network Code (MNC) of the network operator.
+   */
+  readonly attribute DOMString? mnc;
+
+  /**
+   * State of this network operator.
+   */
+  readonly attribute MobileNetworkState? state;
+};
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
@@ -553,6 +553,7 @@ if CONFIG['MOZ_B2G_RIL']:
         'MozIccManager.webidl',
         'MozMobileCellInfo.webidl',
         'MozMobileConnectionArray.webidl',
+        'MozMobileNetworkInfo.webidl',
         'MozVoicemail.webidl',
         'MozVoicemailEvent.webidl',
     ]