diff options
Diffstat (limited to 'chrome/browser/extensions/api/dial')
6 files changed, 24 insertions, 24 deletions
diff --git a/chrome/browser/extensions/api/dial/dial_api.h b/chrome/browser/extensions/api/dial/dial_api.h index e1d982c..cc56b84 100644 --- a/chrome/browser/extensions/api/dial/dial_api.h +++ b/chrome/browser/extensions/api/dial/dial_api.h @@ -40,16 +40,16 @@ class DialAPI : public RefcountedBrowserContextKeyedService, virtual ~DialAPI(); // RefcountedBrowserContextKeyedService: - virtual void ShutdownOnUIThread() OVERRIDE; + virtual void ShutdownOnUIThread() override; // EventRouter::Observer: - 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; // DialRegistry::Observer: virtual void OnDialDeviceEvent( - const DialRegistry::DeviceList& devices) OVERRIDE; - virtual void OnDialError(DialRegistry::DialErrorCode type) OVERRIDE; + const DialRegistry::DeviceList& devices) override; + virtual void OnDialError(DialRegistry::DialErrorCode type) override; // Methods to notify the DialRegistry on the correct thread of new/removed // listeners. @@ -78,9 +78,9 @@ class DialDiscoverNowFunction : public AsyncApiFunction { virtual ~DialDiscoverNowFunction() {} // AsyncApiFunction: - virtual bool Prepare() OVERRIDE; - virtual void Work() OVERRIDE; - virtual bool Respond() OVERRIDE; + virtual bool Prepare() override; + virtual void Work() override; + virtual bool Respond() override; private: DECLARE_EXTENSION_FUNCTION("dial.discoverNow", DIAL_DISCOVERNOW) diff --git a/chrome/browser/extensions/api/dial/dial_api_factory.h b/chrome/browser/extensions/api/dial/dial_api_factory.h index 035ec6d..8d64203 100644 --- a/chrome/browser/extensions/api/dial/dial_api_factory.h +++ b/chrome/browser/extensions/api/dial/dial_api_factory.h @@ -27,9 +27,9 @@ class DialAPIFactory : public RefcountedBrowserContextKeyedServiceFactory { // BrowserContextKeyedServiceFactory: virtual scoped_refptr<RefcountedBrowserContextKeyedService> - BuildServiceInstanceFor(content::BrowserContext* profile) const OVERRIDE; - virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE; - virtual bool ServiceIsNULLWhileTesting() const OVERRIDE; + BuildServiceInstanceFor(content::BrowserContext* profile) const override; + virtual bool ServiceIsCreatedWithBrowserContext() const override; + virtual bool ServiceIsNULLWhileTesting() const override; DISALLOW_COPY_AND_ASSIGN(DialAPIFactory); }; diff --git a/chrome/browser/extensions/api/dial/dial_apitest.cc b/chrome/browser/extensions/api/dial/dial_apitest.cc index 62ab634..f2c0e75 100644 --- a/chrome/browser/extensions/api/dial/dial_apitest.cc +++ b/chrome/browser/extensions/api/dial/dial_apitest.cc @@ -25,7 +25,7 @@ class DialAPITest : public ExtensionApiTest { public: DialAPITest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, diff --git a/chrome/browser/extensions/api/dial/dial_registry.h b/chrome/browser/extensions/api/dial/dial_registry.h index d78f531..ac474c5e 100644 --- a/chrome/browser/extensions/api/dial/dial_registry.h +++ b/chrome/browser/extensions/api/dial/dial_registry.h @@ -88,16 +88,16 @@ class DialRegistry : public DialService::Observer, typedef std::map<std::string, linked_ptr<DialDeviceData> > DeviceByLabelMap; // DialService::Observer: - virtual void OnDiscoveryRequest(DialService* service) OVERRIDE; + virtual void OnDiscoveryRequest(DialService* service) override; virtual void OnDeviceDiscovered(DialService* service, - const DialDeviceData& device) OVERRIDE; - virtual void OnDiscoveryFinished(DialService* service) OVERRIDE; + const DialDeviceData& device) override; + virtual void OnDiscoveryFinished(DialService* service) override; virtual void OnError(DialService* service, - const DialService::DialServiceErrorCode& code) OVERRIDE; + const DialService::DialServiceErrorCode& code) override; // net::NetworkChangeObserver: virtual void OnNetworkChanged( - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; + net::NetworkChangeNotifier::ConnectionType type) override; // Starts and stops periodic discovery. Periodic discovery is done when there // are registered event listeners. diff --git a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc index 15658b5..608cfe4 100644 --- a/chrome/browser/extensions/api/dial/dial_registry_unittest.cc +++ b/chrome/browser/extensions/api/dial/dial_registry_unittest.cc @@ -64,15 +64,15 @@ class MockDialRegistry : public DialRegistry { Time time_; protected: - virtual base::Time Now() const OVERRIDE { + virtual base::Time Now() const override { return time_; } - virtual DialService* CreateDialService() OVERRIDE { + virtual DialService* CreateDialService() override { return &mock_service_; } - virtual void ClearDialService() OVERRIDE { + virtual void ClearDialService() override { // Release the pointer but don't delete the object because the test owns it. CHECK_EQ(&mock_service_, dial_.release()); } diff --git a/chrome/browser/extensions/api/dial/dial_service.h b/chrome/browser/extensions/api/dial/dial_service.h index 82efb3e..3f84732 100644 --- a/chrome/browser/extensions/api/dial/dial_service.h +++ b/chrome/browser/extensions/api/dial/dial_service.h @@ -105,10 +105,10 @@ class DialServiceImpl : public DialService, virtual ~DialServiceImpl(); // DialService implementation - virtual bool Discover() OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual bool HasObserver(Observer* observer) OVERRIDE; + virtual bool Discover() override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObserver(Observer* observer) override; private: // Represents a socket binding to a single network interface. |