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/idle | |
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/idle')
5 files changed, 20 insertions, 20 deletions
diff --git a/chrome/browser/extensions/api/idle/idle_api.h b/chrome/browser/extensions/api/idle/idle_api.h index 6e18f47..005cc7d 100644 --- a/chrome/browser/extensions/api/idle/idle_api.h +++ b/chrome/browser/extensions/api/idle/idle_api.h @@ -19,7 +19,7 @@ class IdleQueryStateFunction : public ChromeAsyncExtensionFunction { virtual ~IdleQueryStateFunction() {} // ExtensionFunction: - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void IdleStateCallback(IdleState state); @@ -35,7 +35,7 @@ class IdleSetDetectionIntervalFunction : public ChromeSyncExtensionFunction { virtual ~IdleSetDetectionIntervalFunction() {} // ExtensionFunction: - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; } // namespace extensions diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc index 82779fe..52edd52 100644 --- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc +++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc @@ -44,9 +44,9 @@ class TestIdleProvider : public IdleManager::IdleTimeProvider { TestIdleProvider(); virtual ~TestIdleProvider(); virtual void CalculateIdleState(int idle_threshold, - IdleCallback notify) OVERRIDE; - virtual void CalculateIdleTime(IdleTimeCallback notify) OVERRIDE; - virtual bool CheckIdleStateIsLocked() OVERRIDE; + IdleCallback notify) override; + virtual void CalculateIdleTime(IdleTimeCallback notify) override; + virtual bool CheckIdleStateIsLocked() override; void set_idle_time(int idle_time); void set_locked(bool locked); @@ -126,7 +126,7 @@ KeyedService* IdleManagerTestFactory(content::BrowserContext* profile) { class IdleTest : public ExtensionApiUnittest { public: - virtual void SetUp() OVERRIDE; + virtual void SetUp() override; protected: IdleManager* idle_manager_; diff --git a/chrome/browser/extensions/api/idle/idle_manager.cc b/chrome/browser/extensions/api/idle/idle_manager.cc index 31f465d..6d44958 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.cc +++ b/chrome/browser/extensions/api/idle/idle_manager.cc @@ -31,9 +31,9 @@ class DefaultEventDelegate : public IdleManager::EventDelegate { virtual ~DefaultEventDelegate(); virtual void OnStateChanged(const std::string& extension_id, - IdleState new_state) OVERRIDE; - virtual void RegisterObserver(EventRouter::Observer* observer) OVERRIDE; - virtual void UnregisterObserver(EventRouter::Observer* observer) OVERRIDE; + IdleState new_state) override; + virtual void RegisterObserver(EventRouter::Observer* observer) override; + virtual void UnregisterObserver(EventRouter::Observer* observer) override; private: Profile* profile_; @@ -73,9 +73,9 @@ class DefaultIdleProvider : public IdleManager::IdleTimeProvider { virtual ~DefaultIdleProvider(); virtual void CalculateIdleState(int idle_threshold, - IdleCallback notify) OVERRIDE; - virtual void CalculateIdleTime(IdleTimeCallback notify) OVERRIDE; - virtual bool CheckIdleStateIsLocked() OVERRIDE; + IdleCallback notify) override; + virtual void CalculateIdleTime(IdleTimeCallback notify) override; + virtual bool CheckIdleStateIsLocked() override; }; DefaultIdleProvider::DefaultIdleProvider() { diff --git a/chrome/browser/extensions/api/idle/idle_manager.h b/chrome/browser/extensions/api/idle/idle_manager.h index 29a9bd1..8e96e27 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.h +++ b/chrome/browser/extensions/api/idle/idle_manager.h @@ -74,17 +74,17 @@ class IdleManager : public ExtensionRegistryObserver, void Init(); // KeyedService implementation. - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; // ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded( content::BrowserContext* browser_context, const Extension* extension, - UnloadedExtensionInfo::Reason reason) OVERRIDE; + UnloadedExtensionInfo::Reason reason) override; // EventRouter::Observer implementation. - virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE; - virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE; + virtual void OnListenerAdded(const EventListenerInfo& details) override; + virtual void OnListenerRemoved(const EventListenerInfo& details) override; void QueryState(int threshold, QueryStateCallback notify); void SetThreshold(const std::string& extension_id, int threshold); diff --git a/chrome/browser/extensions/api/idle/idle_manager_factory.h b/chrome/browser/extensions/api/idle/idle_manager_factory.h index 1a9f9b7..ac4d005 100644 --- a/chrome/browser/extensions/api/idle/idle_manager_factory.h +++ b/chrome/browser/extensions/api/idle/idle_manager_factory.h @@ -27,11 +27,11 @@ class IdleManagerFactory : public BrowserContextKeyedServiceFactory { // BrowserContextKeyedBaseFactory implementation. virtual KeyedService* BuildServiceInstanceFor( - content::BrowserContext* profile) const OVERRIDE; + content::BrowserContext* profile) const override; virtual content::BrowserContext* GetBrowserContextToUse( - content::BrowserContext* context) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + content::BrowserContext* context) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; }; } // namespace extensions |