Bug 1119264 - Mark virtual overridden functions as MOZ_OVERRIDE in chrome; r=bsmedberg
☠☠ backed out by ee5ea7b0bb86 ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 08 Jan 2015 10:16:15 -0500
changeset 240918 3a5fe7c44ce4223afd05e0d5135b00f219922664
parent 240917 58cb6ed025530ae5a808d1b9d40e04cb78781534
child 240919 c034dba7a4175196c0dcaeb466751f7ee31b7d51
push id7677
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 18:11:24 +0000
treeherdermozilla-aurora@f531d838c055 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1119264
milestone38.0a1
Bug 1119264 - Mark virtual overridden functions as MOZ_OVERRIDE in chrome; r=bsmedberg
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();
-  NS_IMETHOD RefreshSkins();
+  NS_IMETHOD ReloadChrome() MOZ_OVERRIDE;
+  NS_IMETHOD RefreshSkins() MOZ_OVERRIDE;
   NS_IMETHOD AllowScriptsForPackage(nsIURI* url,
-                                    bool* _retval);
+                                    bool* _retval) MOZ_OVERRIDE;
   NS_IMETHOD AllowContentToAccess(nsIURI* url,
-                                  bool* _retval);
+                                  bool* _retval) MOZ_OVERRIDE;
 
   // nsIChromeRegistry methods:
-  NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI);
-  NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult);
+  NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI) MOZ_OVERRIDE;
+  NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) MOZ_OVERRIDE;
 
   // 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);
+                               bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
                               char *const * argv, bool platform,
-                              bool contentaccessible);
+                              bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
                             char *const * argv, bool platform,
-                            bool contentaccessible);
+                            bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno,
                                char *const * argv, bool platform,
-                               bool contentaccessible);
+                               bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno,
                              char *const * argv, bool platform,
-                             bool contentaccessible);
+                             bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
                                 char *const * argv, bool platform,
-                                bool contentaccessible);
+                                bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
                                 char *const * argv, bool platform,
-                                bool contentaccessible);
+                                bool contentaccessible) MOZ_OVERRIDE;
 };
 
 #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);
+                               bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
                               char *const * argv, bool platform,
-                              bool contentaccessible);
+                              bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
                             char *const * argv, bool platform,
-                            bool contentaccessible);
+                            bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno,
                                char *const * argv, bool platform,
-                               bool contentaccessible);
+                               bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno,
                              char *const * argv, bool platform,
-                             bool contentaccessible);
+                             bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
                                 char *const * argv, bool platform,
-                                bool contentaccessible);
+                                bool contentaccessible) MOZ_OVERRIDE;
   virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
                                 char *const * argv, bool platform,
-                                bool contentaccessible);
+                                bool contentaccessible) MOZ_OVERRIDE;
 };
 
 #endif // nsChromeRegistryContent_h