Bug 1115676 - update contractID for mozNFC. r=smaug, dimi
authorYoshi Huang <allstars.chh@mozilla.com>
Fri, 26 Dec 2014 20:57:11 +0800
changeset 247576 0c6e1ca875fba763facd74d2cdc096e83f34550f
parent 247575 c776f112102f59e49d4cb3988c756263c23745e0
child 247577 2e48751cf1ed5b94c407f70d3b61c101068a67cb
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug, dimi
bugs1115676
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1115676 - update contractID for mozNFC. r=smaug, dimi From 84d5d3ccb88ea78ea65cd38cf5e17da145338d61 Mon Sep 17 00:00:00 2001 --- dom/nfc/nsNfc.js | 6 +++--- dom/nfc/nsNfc.manifest | 6 +++--- dom/webidl/MozNFC.webidl | 2 +- dom/webidl/MozNFCPeer.webidl | 2 +- dom/webidl/MozNFCTag.webidl | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
dom/nfc/nsNfc.js
dom/nfc/nsNfc.manifest
dom/webidl/MozNFC.webidl
dom/webidl/MozNFCPeer.webidl
dom/webidl/MozNFCTag.webidl
--- a/dom/nfc/nsNfc.js
+++ b/dom/nfc/nsNfc.js
@@ -188,17 +188,17 @@ MozNFCTagImpl.prototype = {
     }
 
     let callback = new NfcCallback(this._window);
     this._nfcContentHelper.format(this.session, callback);
     return callback.promise;
   },
 
   classID: Components.ID("{4e1e2e90-3137-11e3-aa6e-0800200c9a66}"),
-  contractID: "@mozilla.org/nfc/NFCTag;1",
+  contractID: "@mozilla.org/nfc/tag;1",
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
                                          Ci.nsIDOMGlobalPropertyInitializer]),
 };
 
 /**
  * Implementation of NFCPeer.
  *
  * @param window  global window object.
@@ -240,17 +240,17 @@ MozNFCPeerImpl.prototype = {
 
     let callback = new NfcCallback(this._window);
     this._nfcContentHelper.sendFile(Cu.cloneInto(data, this._window),
                                     this.session, callback);
     return callback.promise;
   },
 
   classID: Components.ID("{c1b2bcf0-35eb-11e3-aa6e-0800200c9a66}"),
-  contractID: "@mozilla.org/nfc/NFCPeer;1",
+  contractID: "@mozilla.org/nfc/peer;1",
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
                                          Ci.nsIDOMGlobalPropertyInitializer]),
 };
 
 // Should be mapped to the RFState defined in WebIDL.
 let RFState = {
   IDLE: "idle",
   LISTEN: "listen",
@@ -534,17 +534,17 @@ MozNFCImpl.prototype = {
     return false;
   },
 
   hasDeadWrapper: function hasDeadWrapper() {
     return Cu.isDeadWrapper(this._window) || Cu.isDeadWrapper(this.__DOM_IMPL__);
   },
 
   classID: Components.ID("{6ff2b290-2573-11e3-8224-0800200c9a66}"),
-  contractID: "@mozilla.org/navigatorNfc;1",
+  contractID: "@mozilla.org/nfc/manager;1",
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
                                          Ci.nsIDOMGlobalPropertyInitializer,
                                          Ci.nsINfcEventListener,
                                          Ci.nsIDOMEventListener]),
 };
 
 function NFCSendFileWrapper() {
 }
--- a/dom/nfc/nsNfc.manifest
+++ b/dom/nfc/nsNfc.manifest
@@ -1,14 +1,14 @@
 component {6ff2b290-2573-11e3-8224-0800200c9a66} nsNfc.js
-contract @mozilla.org/navigatorNfc;1 {6ff2b290-2573-11e3-8224-0800200c9a66}
+contract @mozilla.org/nfc/manager;1 {6ff2b290-2573-11e3-8224-0800200c9a66}
 
 component {4e1e2e90-3137-11e3-aa6e-0800200c9a66} nsNfc.js
-contract @mozilla.org/nfc/NFCTag;1 {4e1e2e90-3137-11e3-aa6e-0800200c9a66}
+contract @mozilla.org/nfc/tag;1 {4e1e2e90-3137-11e3-aa6e-0800200c9a66}
 
 component {c1b2bcf0-35eb-11e3-aa6e-0800200c9a66} nsNfc.js
-contract @mozilla.org/nfc/NFCPeer;1 {c1b2bcf0-35eb-11e3-aa6e-0800200c9a66}
+contract @mozilla.org/nfc/peer;1 {c1b2bcf0-35eb-11e3-aa6e-0800200c9a66}
 
 component {c5063a5c-8cb9-41d2-baf5-56062a2e30e9} nsNfc.js
 contract @mozilla.org/dom/system-messages/wrapper/nfc-manager-send-file;1 {c5063a5c-8cb9-41d2-baf5-56062a2e30e9}
 
 component {2e7f9285-3c72-4e1f-b985-141a00a23a75} nsNfc.js
 contract @mozilla.org/dom/system-messages/wrapper/nfc-manager-tech-discovered;1 {2e7f9285-3c72-4e1f-b985-141a00a23a75}
--- a/dom/webidl/MozNFC.webidl
+++ b/dom/webidl/MozNFC.webidl
@@ -64,17 +64,17 @@ interface MozNFCManager {
 
   /**
    * Power off the NFC hardware.
    */
   [CheckPermissions="nfc-manager", AvailableIn=CertifiedApps]
   Promise<void> powerOff();
 };
 
-[JSImplementation="@mozilla.org/navigatorNfc;1",
+[JSImplementation="@mozilla.org/nfc/manager;1",
  NavigatorProperty="mozNfc",
  Func="Navigator::HasNFCSupport",
  CheckPermissions="nfc nfc-share",
  AvailableIn="PrivilegedApps"]
 interface MozNFC : EventTarget {
   /**
    * Indicate if NFC is enabled.
    */
--- a/dom/webidl/MozNFCPeer.webidl
+++ b/dom/webidl/MozNFCPeer.webidl
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * Part of this IDL file is from:
  * http://w3c.github.io/nfc/proposals/common/nfc.html#idl-def-NFCPeer
  *
  * Copyright © 2013 Deutsche Telekom, Inc.
  */
 
-[JSImplementation="@mozilla.org/nfc/NFCPeer;1", AvailableIn="PrivilegedApps"]
+[JSImplementation="@mozilla.org/nfc/peer;1", AvailableIn="PrivilegedApps"]
 interface MozNFCPeer {
   /**
    * Send NDEF data to peer device.
    */
   [Throws]
   Promise<void> sendNDEF(sequence<MozNDEFRecord> records);
 
   /**
--- a/dom/webidl/MozNFCTag.webidl
+++ b/dom/webidl/MozNFCTag.webidl
@@ -27,17 +27,17 @@ enum NFCTechType {
 enum NFCTagType {
   "type1",
   "type2",
   "type3",
   "type4",
   "mifare_classic"
 };
 
-[JSImplementation="@mozilla.org/nfc/NFCTag;1", AvailableIn="PrivilegedApps"]
+[JSImplementation="@mozilla.org/nfc/tag;1", AvailableIn="PrivilegedApps"]
 interface MozNFCTag {
   /**
    * The supported technologies of this tag, null if unknown.
    */
   [Cached, Pure] readonly attribute sequence<NFCTechType>? techList;
 
   /**
    * The identifier of this tag.