Skip to content

Commit

Permalink
Update {virtual,override,final} to follow C++11 style in chrome.
Browse files Browse the repository at this point in the history
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}
  • Loading branch information
zetafunction authored and Commit bot committed Feb 6, 2015
1 parent 7f7ef67 commit 12590ce
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions chrome/app/android/chrome_main_delegate_android.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion chrome/app/chrome_crash_reporter_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class BookmarkImageServiceFactory : public BrowserContextKeyedServiceFactory {
static BookmarkImageService* GetForBrowserContext(
content::BrowserContext* context);

virtual ~BookmarkImageServiceFactory();
~BookmarkImageServiceFactory() override;

private:
friend struct DefaultSingletonTraits<BookmarkImageServiceFactory>;
Expand Down

0 comments on commit 12590ce

Please sign in to comment.