Backout 3a5fe7c44ce4
authorWes Kocher <wkocher@mozilla.com>
Mon, 12 Jan 2015 14:47:03 -0800
changeset 223416 ee5ea7b0bb8611fb1de80da318e59465b8b74a3c
parent 223415 38250fe6e828833dba43650237d920bf4896ee18
child 223417 fdb407e3ab06284ddb3bfff43b662d8b87c546f9
push id53902
push userkwierso@gmail.com
push dateMon, 12 Jan 2015 22:48:31 +0000
treeherdermozilla-inbound@fdb407e3ab06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone38.0a1
backs out3a5fe7c44ce4223afd05e0d5135b00f219922664
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
Backout 3a5fe7c44ce4
chrome/nsChromeRegistry.h
chrome/nsChromeRegistryChrome.h
chrome/nsChromeRegistryContent.h
--- a/chrome/nsChromeRegistry.h
+++ b/chrome/nsChromeRegistry.h
@@ -42,26 +42,26 @@ class nsChromeRegistry : public nsIToolk
 #endif
                          public nsIObserver,
                          public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
 
   // nsIXULChromeRegistry methods:
-  NS_IMETHOD ReloadChrome() MOZ_OVERRIDE;
-  NS_IMETHOD RefreshSkins() MOZ_OVERRIDE;
+  NS_IMETHOD ReloadChrome();
+  NS_IMETHOD RefreshSkins();
   NS_IMETHOD AllowScriptsForPackage(nsIURI* url,
-                                    bool* _retval) MOZ_OVERRIDE;
+                                    bool* _retval);
   NS_IMETHOD AllowContentToAccess(nsIURI* url,
-                                  bool* _retval) MOZ_OVERRIDE;
+                                  bool* _retval);
 
   // nsIChromeRegistry methods:
-  NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI) MOZ_OVERRIDE;
-  NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) MOZ_OVERRIDE;
+  NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI);
+  NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult);
 
   // nsChromeRegistry methods:
   nsChromeRegistry() : mInitialized(false) { }
 
   virtual nsresult Init();
 
   static already_AddRefed<nsIChromeRegistry> GetService();
 
--- a/chrome/nsChromeRegistryChrome.h
+++ b/chrome/nsChromeRegistryChrome.h
@@ -162,30 +162,30 @@ class nsChromeRegistryChrome : public ns
   nsCString mSelectedLocale;
   nsCString mSelectedSkin;
 
   // Hash of package names ("global") to PackageEntry objects
   nsClassHashtable<nsCStringHashKey, PackageEntry> mPackagesHash;
 
   virtual void ManifestContent(ManifestProcessingContext& cx, int lineno,
                                char *const * argv, bool platform,
-                               bool contentaccessible) MOZ_OVERRIDE;
+                               bool contentaccessible);
   virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
                               char *const * argv, bool platform,
-                              bool contentaccessible) MOZ_OVERRIDE;
+                              bool contentaccessible);
   virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
                             char *const * argv, bool platform,
-                            bool contentaccessible) MOZ_OVERRIDE;
+                            bool contentaccessible);
   virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno,
                                char *const * argv, bool platform,
-                               bool contentaccessible) MOZ_OVERRIDE;
+                               bool contentaccessible);
   virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno,
                              char *const * argv, bool platform,
-                             bool contentaccessible) MOZ_OVERRIDE;
+                             bool contentaccessible);
   virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
                                 char *const * argv, bool platform,
-                                bool contentaccessible) MOZ_OVERRIDE;
+                                bool contentaccessible);
   virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
                                 char *const * argv, bool platform,
-                                bool contentaccessible) MOZ_OVERRIDE;
+                                bool contentaccessible);
 };
 
 #endif // nsChromeRegistryChrome_h
--- a/chrome/nsChromeRegistryContent.h
+++ b/chrome/nsChromeRegistryContent.h
@@ -61,30 +61,30 @@ class nsChromeRegistryContent : public n
                      const nsCString& aPath) MOZ_OVERRIDE;
   nsresult GetFlagsFromPackage(const nsCString& aPackage, uint32_t* aFlags) MOZ_OVERRIDE;
 
   nsClassHashtable<nsCStringHashKey, PackageEntry> mPackagesHash;
   nsCString mLocale;
 
   virtual void ManifestContent(ManifestProcessingContext& cx, int lineno,
                                char *const * argv, bool platform,
-                               bool contentaccessible) MOZ_OVERRIDE;
+                               bool contentaccessible);
   virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
                               char *const * argv, bool platform,
-                              bool contentaccessible) MOZ_OVERRIDE;
+                              bool contentaccessible);
   virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
                             char *const * argv, bool platform,
-                            bool contentaccessible) MOZ_OVERRIDE;
+                            bool contentaccessible);
   virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno,
                                char *const * argv, bool platform,
-                               bool contentaccessible) MOZ_OVERRIDE;
+                               bool contentaccessible);
   virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno,
                              char *const * argv, bool platform,
-                             bool contentaccessible) MOZ_OVERRIDE;
+                             bool contentaccessible);
   virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
                                 char *const * argv, bool platform,
-                                bool contentaccessible) MOZ_OVERRIDE;
+                                bool contentaccessible);
   virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
                                 char *const * argv, bool platform,
-                                bool contentaccessible) MOZ_OVERRIDE;
+                                bool contentaccessible);
 };
 
 #endif // nsChromeRegistryContent_h