Commit 12590ce9 authored by dcheng's avatar dcheng Committed by Commit bot

Update {virtual,override,final} to follow C++11 style in chrome.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

This patch was automatically generated with an OS=android build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463

Review URL: https://codereview.chromium.org/900183004

Cr-Commit-Position: refs/heads/master@{#314953}
parent 7f7ef67c
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
class ChromeMainDelegateChromeShellAndroid : public ChromeMainDelegateAndroid { class ChromeMainDelegateChromeShellAndroid : public ChromeMainDelegateAndroid {
public: public:
ChromeMainDelegateChromeShellAndroid(); ChromeMainDelegateChromeShellAndroid();
virtual ~ChromeMainDelegateChromeShellAndroid(); ~ChromeMainDelegateChromeShellAndroid() override;
virtual bool BasicStartupComplete(int* exit_code) override; bool BasicStartupComplete(int* exit_code) override;
private: private:
DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeShellAndroid); DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeShellAndroid);
......
...@@ -11,11 +11,11 @@ class ChromeMainDelegateChromeSyncShellAndroid ...@@ -11,11 +11,11 @@ class ChromeMainDelegateChromeSyncShellAndroid
: public ChromeMainDelegateAndroid { : public ChromeMainDelegateAndroid {
public: public:
ChromeMainDelegateChromeSyncShellAndroid(); ChromeMainDelegateChromeSyncShellAndroid();
virtual ~ChromeMainDelegateChromeSyncShellAndroid(); ~ChromeMainDelegateChromeSyncShellAndroid() override;
virtual bool RegisterApplicationNativeMethods(JNIEnv* env) override; bool RegisterApplicationNativeMethods(JNIEnv* env) override;
virtual bool BasicStartupComplete(int* exit_code) override; bool BasicStartupComplete(int* exit_code) override;
private: private:
DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeSyncShellAndroid); DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeSyncShellAndroid);
......
...@@ -19,13 +19,13 @@ class ChromeMainDelegateAndroid : public ChromeMainDelegate { ...@@ -19,13 +19,13 @@ class ChromeMainDelegateAndroid : public ChromeMainDelegate {
protected: protected:
ChromeMainDelegateAndroid(); ChromeMainDelegateAndroid();
virtual ~ChromeMainDelegateAndroid(); ~ChromeMainDelegateAndroid() override;
virtual bool BasicStartupComplete(int* exit_code) override; bool BasicStartupComplete(int* exit_code) override;
virtual void SandboxInitialized(const std::string& process_type) override; void SandboxInitialized(const std::string& process_type) override;
virtual int RunProcess( int RunProcess(
const std::string& process_type, const std::string& process_type,
const content::MainFunctionParams& main_function_params) override; const content::MainFunctionParams& main_function_params) override;
......
...@@ -58,7 +58,7 @@ class ChromeCrashReporterClient : public crash_reporter::CrashReporterClient { ...@@ -58,7 +58,7 @@ class ChromeCrashReporterClient : public crash_reporter::CrashReporterClient {
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
virtual int GetAndroidMinidumpDescriptor() override; int GetAndroidMinidumpDescriptor() override;
#endif #endif
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
......
...@@ -16,7 +16,7 @@ class BookmarkImageServiceFactory : public BrowserContextKeyedServiceFactory { ...@@ -16,7 +16,7 @@ class BookmarkImageServiceFactory : public BrowserContextKeyedServiceFactory {
static BookmarkImageService* GetForBrowserContext( static BookmarkImageService* GetForBrowserContext(
content::BrowserContext* context); content::BrowserContext* context);
virtual ~BookmarkImageServiceFactory(); ~BookmarkImageServiceFactory() override;
private: private:
friend struct DefaultSingletonTraits<BookmarkImageServiceFactory>; friend struct DefaultSingletonTraits<BookmarkImageServiceFactory>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment