diff options
| author | mostynb <mostynb@opera.com> | 2014-10-03 17:40:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-04 00:40:55 +0000 |
| commit | a15bee143f21dcc0fb91b8b7f81848a7e51a38bb (patch) | |
| tree | 10b6e06058381b392a2e0147360afea9de38b36b /chrome/browser/extensions/api/gcm | |
| parent | e7c9f7781cbc6db099dacbefdc19ac2fd9bfc19a (diff) | |
| download | chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.zip chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.gz chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/
BUG=417463
Review URL: https://codereview.chromium.org/624153002
Cr-Commit-Position: refs/heads/master@{#298134}
Diffstat (limited to 'chrome/browser/extensions/api/gcm')
| -rw-r--r-- | chrome/browser/extensions/api/gcm/gcm_api.h | 8 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/gcm/gcm_apitest.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/gcm/gcm_api.h b/chrome/browser/extensions/api/gcm/gcm_api.h index 322a5d2..01a21cc 100644 --- a/chrome/browser/extensions/api/gcm/gcm_api.h +++ b/chrome/browser/extensions/api/gcm/gcm_api.h @@ -26,7 +26,7 @@ class GcmApiFunction : public AsyncExtensionFunction { virtual ~GcmApiFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE FINAL; + virtual bool RunAsync() override final; // Actual implementation of specific functions. virtual bool DoWork() = 0; @@ -47,7 +47,7 @@ class GcmRegisterFunction : public GcmApiFunction { virtual ~GcmRegisterFunction(); // Register function implementation. - virtual bool DoWork() OVERRIDE FINAL; + virtual bool DoWork() override final; private: void CompleteFunctionWithResult(const std::string& registration_id, @@ -64,7 +64,7 @@ class GcmUnregisterFunction : public GcmApiFunction { virtual ~GcmUnregisterFunction(); // Register function implementation. - virtual bool DoWork() OVERRIDE FINAL; + virtual bool DoWork() override final; private: void CompleteFunctionWithResult(gcm::GCMClient::Result result); @@ -80,7 +80,7 @@ class GcmSendFunction : public GcmApiFunction { virtual ~GcmSendFunction(); // Send function implementation. - virtual bool DoWork() OVERRIDE FINAL; + virtual bool DoWork() override final; private: void CompleteFunctionWithResult(const std::string& message_id, diff --git a/chrome/browser/extensions/api/gcm/gcm_apitest.cc b/chrome/browser/extensions/api/gcm/gcm_apitest.cc index b6b07a5..0889c1d 100644 --- a/chrome/browser/extensions/api/gcm/gcm_apitest.cc +++ b/chrome/browser/extensions/api/gcm/gcm_apitest.cc @@ -61,8 +61,8 @@ class GcmApiTest : public ExtensionApiTest { GcmApiTest() : fake_gcm_profile_service_(NULL) {} protected: - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE; - virtual void SetUpOnMainThread() OVERRIDE; + virtual void SetUpCommandLine(CommandLine* command_line) override; + virtual void SetUpOnMainThread() override; void StartCollecting(); |