Bug 1119264 - Mark virtual overridden functions as MOZ_OVERRIDE in chrome; r=bsmedberg

This commit is contained in:
Ehsan Akhgari 2015-01-08 10:16:15 -05:00
parent 39a84837c7
commit 29123d36c9
3 changed files with 20 additions and 20 deletions

View File

@ -47,16 +47,16 @@ public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
// nsIXULChromeRegistry methods: // nsIXULChromeRegistry methods:
NS_IMETHOD ReloadChrome(); NS_IMETHOD ReloadChrome() MOZ_OVERRIDE;
NS_IMETHOD RefreshSkins(); NS_IMETHOD RefreshSkins() MOZ_OVERRIDE;
NS_IMETHOD AllowScriptsForPackage(nsIURI* url, NS_IMETHOD AllowScriptsForPackage(nsIURI* url,
bool* _retval); bool* _retval) MOZ_OVERRIDE;
NS_IMETHOD AllowContentToAccess(nsIURI* url, NS_IMETHOD AllowContentToAccess(nsIURI* url,
bool* _retval); bool* _retval) MOZ_OVERRIDE;
// nsIChromeRegistry methods: // nsIChromeRegistry methods:
NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI); NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI) MOZ_OVERRIDE;
NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult); NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) MOZ_OVERRIDE;
// nsChromeRegistry methods: // nsChromeRegistry methods:
nsChromeRegistry() : mInitialized(false) { } nsChromeRegistry() : mInitialized(false) { }

View File

@ -167,25 +167,25 @@ class nsChromeRegistryChrome : public nsChromeRegistry
virtual void ManifestContent(ManifestProcessingContext& cx, int lineno, virtual void ManifestContent(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno, virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno, virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno, virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno, virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno, virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestResource(ManifestProcessingContext& cx, int lineno, virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
}; };
#endif // nsChromeRegistryChrome_h #endif // nsChromeRegistryChrome_h

View File

@ -66,25 +66,25 @@ class nsChromeRegistryContent : public nsChromeRegistry
virtual void ManifestContent(ManifestProcessingContext& cx, int lineno, virtual void ManifestContent(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno, virtual void ManifestLocale(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno, virtual void ManifestSkin(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno, virtual void ManifestOverlay(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno, virtual void ManifestStyle(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno, virtual void ManifestOverride(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
virtual void ManifestResource(ManifestProcessingContext& cx, int lineno, virtual void ManifestResource(ManifestProcessingContext& cx, int lineno,
char *const * argv, bool platform, char *const * argv, bool platform,
bool contentaccessible); bool contentaccessible) MOZ_OVERRIDE;
}; };
#endif // nsChromeRegistryContent_h #endif // nsChromeRegistryContent_h