From 13387ed757460fefcb198e7893aece70be0419d0 Mon Sep 17 00:00:00 2001
From: Yoshi Huang <allstars.chh@mozilla.com>
Date: Tue, 29 Apr 2014 11:50:25 +0800
Subject: [PATCH] Bug 993946 - B2G NFC: Consistent naming between Nfc or NFC in
 WebIDL. r=dimi, sr=smaug

--HG--
rename : dom/webidl/MozNfc.webidl => dom/webidl/MozNFC.webidl
---
 dom/base/Navigator.cpp                      |  6 +++---
 dom/base/Navigator.h                        |  6 +++---
 dom/webidl/{MozNfc.webidl => MozNFC.webidl} | 16 ++++++++--------
 dom/webidl/moz.build                        |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename dom/webidl/{MozNfc.webidl => MozNFC.webidl} (84%)

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index df1eaa6b510d..f802eb20c728 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -2209,7 +2209,7 @@ Navigator::HasFMRadioSupport(JSContext* /* unused */, JSObject* aGlobal)
 #ifdef MOZ_NFC
 /* static */
 bool
-Navigator::HasNfcSupport(JSContext* /* unused */, JSObject* aGlobal)
+Navigator::HasNFCSupport(JSContext* /* unused */, JSObject* aGlobal)
 {
   // Do not support NFC if NFC content helper does not exist.
   nsCOMPtr<nsISupports> contentHelper = do_GetService("@mozilla.org/nfc/content-helper;1");
@@ -2224,7 +2224,7 @@ Navigator::HasNfcSupport(JSContext* /* unused */, JSObject* aGlobal)
 
 /* static */
 bool
-Navigator::HasNfcPeerSupport(JSContext* /* unused */, JSObject* aGlobal)
+Navigator::HasNFCPeerSupport(JSContext* /* unused */, JSObject* aGlobal)
 {
   nsCOMPtr<nsPIDOMWindow> win = GetWindowFromGlobal(aGlobal);
   return win && CheckPermission(win, "nfc-write");
@@ -2232,7 +2232,7 @@ Navigator::HasNfcPeerSupport(JSContext* /* unused */, JSObject* aGlobal)
 
 /* static */
 bool
-Navigator::HasNfcManagerSupport(JSContext* /* unused */, JSObject* aGlobal)
+Navigator::HasNFCManagerSupport(JSContext* /* unused */, JSObject* aGlobal)
 {
   nsCOMPtr<nsPIDOMWindow> win = GetWindowFromGlobal(aGlobal);
   return win && CheckPermission(win, "nfc-manager");
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
index a4cbf42bdded..b257bae39717 100644
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -282,9 +282,9 @@ public:
   static bool HasFMRadioSupport(JSContext* /* unused */, JSObject* aGlobal);
 #endif // MOZ_B2G_FM
 #ifdef MOZ_NFC
-  static bool HasNfcSupport(JSContext* /* unused */, JSObject* aGlobal);
-  static bool HasNfcPeerSupport(JSContext* /* unused */, JSObject* aGlobal);
-  static bool HasNfcManagerSupport(JSContext* /* unused */, JSObject* aGlobal);
+  static bool HasNFCSupport(JSContext* /* unused */, JSObject* aGlobal);
+  static bool HasNFCPeerSupport(JSContext* /* unused */, JSObject* aGlobal);
+  static bool HasNFCManagerSupport(JSContext* /* unused */, JSObject* aGlobal);
 #endif // MOZ_NFC
 #ifdef MOZ_TIME_MANAGER
   static bool HasTimeSupport(JSContext* /* unused */, JSObject* aGlobal);
diff --git a/dom/webidl/MozNfc.webidl b/dom/webidl/MozNFC.webidl
similarity index 84%
rename from dom/webidl/MozNfc.webidl
rename to dom/webidl/MozNFC.webidl
index 91a30382e557..b6c37e81d21b 100644
--- a/dom/webidl/MozNfc.webidl
+++ b/dom/webidl/MozNFC.webidl
@@ -5,8 +5,8 @@
  /* Copyright © 2013 Deutsche Telekom, Inc. */
 
 [NoInterfaceObject,
- Func="Navigator::HasNfcManagerSupport"]
-interface MozNfcManager {
+ Func="Navigator::HasNFCManagerSupport"]
+interface MozNFCManager {
    /**
     * API to check if the given application's manifest
     * URL is registered with the Chrome Process or not.
@@ -44,23 +44,23 @@ interface MozNfcManager {
 
 [JSImplementation="@mozilla.org/navigatorNfc;1",
  NavigatorProperty="mozNfc",
- Func="Navigator::HasNfcSupport"]
-interface MozNfc : EventTarget {
+ Func="Navigator::HasNFCSupport"]
+interface MozNFC : EventTarget {
    MozNFCTag getNFCTag(DOMString sessionId);
    MozNFCPeer getNFCPeer(DOMString sessionId);
 
-   [Func="Navigator::HasNfcPeerSupport"]
+   [Func="Navigator::HasNFCPeerSupport"]
    attribute EventHandler onpeerready;
-   [Func="Navigator::HasNfcPeerSupport"]
+   [Func="Navigator::HasNFCPeerSupport"]
    attribute EventHandler onpeerlost;
 };
 
 // Mozilla Only
-partial interface MozNfc {
+partial interface MozNFC {
    [ChromeOnly]
    void eventListenerWasAdded(DOMString aType);
    [ChromeOnly]
    void eventListenerWasRemoved(DOMString aType);
 };
 
-MozNfc implements MozNfcManager;
+MozNFC implements MozNFCManager;
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index f55e1ada6011..ac1bd8d3e1e0 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -557,7 +557,7 @@ if CONFIG['MOZ_B2G_RIL']:
 if CONFIG['MOZ_NFC']:
     WEBIDL_FILES += [
          'MozNDEFRecord.webidl',
-         'MozNfc.webidl',
+         'MozNFC.webidl',
          'MozNFCPeer.webidl',
          'MozNFCTag.webidl',
     ]