Backout 3a5fe7c44ce4

chrome/nsChromeRegistry.h

@@ -47,16 +47,16 @@ 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) { }

chrome/nsChromeRegistryChrome.h

@@ -167,25 +167,25 @@ class nsChromeRegistryChrome : public nsChromeRegistry
 
   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

chrome/nsChromeRegistryContent.h

@@ -66,25 +66,25 @@ class nsChromeRegistryContent : public nsChromeRegistry
 
   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