diff options
| author | mostynb <mostynb@opera.com> | 2014-10-06 08:04:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-06 15:05:09 +0000 |
| commit | fe59f48c251e124f4b896e589cb635979bb2f1fb (patch) | |
| tree | 7b07cb56427dfe63f2775683555da84a557aeb90 /components/keyed_service | |
| parent | 4749549c06525071692f777fc6a1fa5a9ad7f877 (diff) | |
| download | chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.zip chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.tar.gz chromium_src-fe59f48c251e124f4b896e589cb635979bb2f1fb.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in components/
BUG=417463
Review URL: https://codereview.chromium.org/623133002
Cr-Commit-Position: refs/heads/master@{#298237}
Diffstat (limited to 'components/keyed_service')
3 files changed, 12 insertions, 12 deletions
diff --git a/components/keyed_service/content/browser_context_dependency_manager_unittest.cc b/components/keyed_service/content/browser_context_dependency_manager_unittest.cc index 6e5abad..e3bbdc1 100644 --- a/components/keyed_service/content/browser_context_dependency_manager_unittest.cc +++ b/components/keyed_service/content/browser_context_dependency_manager_unittest.cc @@ -34,13 +34,13 @@ class TestService : public BrowserContextKeyedServiceFactory { fill_on_shutdown_(fill_on_shutdown) {} virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* context) const OVERRIDE { + content::BrowserContext* context) const override { ADD_FAILURE() << "This isn't part of the tests!"; return NULL; } virtual void BrowserContextShutdown(content::BrowserContext* context) - OVERRIDE { + override { fill_on_shutdown_->push_back(name_); } diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.h b/components/keyed_service/content/browser_context_keyed_service_factory.h index 2049ccf..31608e3 100644 --- a/components/keyed_service/content/browser_context_keyed_service_factory.h +++ b/components/keyed_service/content/browser_context_keyed_service_factory.h @@ -93,14 +93,14 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedServiceFactory // and the default implementation removes it from |mapping_| and deletes // the pointer. virtual void BrowserContextShutdown(content::BrowserContext* context) - OVERRIDE; + override; virtual void BrowserContextDestroyed(content::BrowserContext* context) - OVERRIDE; + override; virtual void SetEmptyTestingFactory(content::BrowserContext* context) - OVERRIDE; - virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE; - virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE; + override; + virtual bool HasTestingFactory(content::BrowserContext* context) override; + virtual void CreateServiceNow(content::BrowserContext* context) override; private: friend class BrowserContextDependencyManager; diff --git a/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h b/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h index 15fd9d9..3898e20 100644 --- a/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h +++ b/components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h @@ -72,13 +72,13 @@ class KEYED_SERVICE_EXPORT RefcountedBrowserContextKeyedServiceFactory BuildServiceInstanceFor(content::BrowserContext* context) const = 0; virtual void BrowserContextShutdown(content::BrowserContext* context) - OVERRIDE; + override; virtual void BrowserContextDestroyed(content::BrowserContext* context) - OVERRIDE; + override; virtual void SetEmptyTestingFactory(content::BrowserContext* context) - OVERRIDE; - virtual bool HasTestingFactory(content::BrowserContext* context) OVERRIDE; - virtual void CreateServiceNow(content::BrowserContext* context) OVERRIDE; + override; + virtual bool HasTestingFactory(content::BrowserContext* context) override; + virtual void CreateServiceNow(content::BrowserContext* context) override; private: typedef std::map<content::BrowserContext*, |