diff options
author | dcheng <dcheng@chromium.org> | 2015-02-05 19:34:00 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-06 03:35:05 +0000 |
commit | 12590ce9e74571df716b9f2db9ee18999820d7b7 (patch) | |
tree | 4937b6117f7fd0f42cc6a661b62b3016c435a947 /chrome | |
parent | 7f7ef67cfe4ba1198a82db04ff8ca52ad416e627 (diff) | |
download | chromium_src-12590ce9e74571df716b9f2db9ee18999820d7b7.zip chromium_src-12590ce9e74571df716b9f2db9ee18999820d7b7.tar.gz chromium_src-12590ce9e74571df716b9f2db9ee18999820d7b7.tar.bz2 |
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}
Diffstat (limited to 'chrome')
5 files changed, 11 insertions, 11 deletions
diff --git a/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h b/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h index 1bbe6b1..a4ee791 100644 --- a/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h +++ b/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h @@ -10,9 +10,9 @@ class ChromeMainDelegateChromeShellAndroid : public ChromeMainDelegateAndroid { public: ChromeMainDelegateChromeShellAndroid(); - virtual ~ChromeMainDelegateChromeShellAndroid(); + ~ChromeMainDelegateChromeShellAndroid() override; - virtual bool BasicStartupComplete(int* exit_code) override; + bool BasicStartupComplete(int* exit_code) override; private: DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeShellAndroid); diff --git a/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h b/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h index 6b65925..bec75bf0 100644 --- a/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h +++ b/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h @@ -11,11 +11,11 @@ class ChromeMainDelegateChromeSyncShellAndroid : public ChromeMainDelegateAndroid { public: 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: DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeSyncShellAndroid); diff --git a/chrome/app/android/chrome_main_delegate_android.h b/chrome/app/android/chrome_main_delegate_android.h index b268ab1..450e53a 100644 --- a/chrome/app/android/chrome_main_delegate_android.h +++ b/chrome/app/android/chrome_main_delegate_android.h @@ -19,13 +19,13 @@ class ChromeMainDelegateAndroid : public ChromeMainDelegate { protected: 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 content::MainFunctionParams& main_function_params) override; diff --git a/chrome/app/chrome_crash_reporter_client.h b/chrome/app/chrome_crash_reporter_client.h index d3eb42f..9e45ed0 100644 --- a/chrome/app/chrome_crash_reporter_client.h +++ b/chrome/app/chrome_crash_reporter_client.h @@ -58,7 +58,7 @@ class ChromeCrashReporterClient : public crash_reporter::CrashReporterClient { #endif #if defined(OS_ANDROID) - virtual int GetAndroidMinidumpDescriptor() override; + int GetAndroidMinidumpDescriptor() override; #endif #if defined(OS_MACOSX) diff --git a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.h b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.h index af5cc18..5680138 100644 --- a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.h +++ b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.h @@ -16,7 +16,7 @@ class BookmarkImageServiceFactory : public BrowserContextKeyedServiceFactory { static BookmarkImageService* GetForBrowserContext( content::BrowserContext* context); - virtual ~BookmarkImageServiceFactory(); + ~BookmarkImageServiceFactory() override; private: friend struct DefaultSingletonTraits<BookmarkImageServiceFactory>; |