diff options
Diffstat (limited to 'chrome/browser/extensions/api/mdns')
5 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h b/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h index 060af2f..6e0053c 100644 --- a/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h +++ b/chrome/browser/extensions/api/mdns/dns_sd_device_lister.h @@ -32,9 +32,9 @@ class DnsSdDeviceLister protected: virtual void OnDeviceChanged( bool added, - const local_discovery::ServiceDescription& service_description) OVERRIDE; - virtual void OnDeviceRemoved(const std::string& service_name) OVERRIDE; - virtual void OnDeviceCacheFlushed() OVERRIDE; + const local_discovery::ServiceDescription& service_description) override; + virtual void OnDeviceRemoved(const std::string& service_name) override; + virtual void OnDeviceCacheFlushed() override; private: // The delegate to notify of changes to services. diff --git a/chrome/browser/extensions/api/mdns/dns_sd_registry.h b/chrome/browser/extensions/api/mdns/dns_sd_registry.h index e3d59d8..e6dc922 100644 --- a/chrome/browser/extensions/api/mdns/dns_sd_registry.h +++ b/chrome/browser/extensions/api/mdns/dns_sd_registry.h @@ -91,10 +91,10 @@ class DnsSdRegistry : public DnsSdDelegate { // DnsSdDelegate implementation: virtual void ServiceChanged(const std::string& service_type, bool added, - const DnsSdService& service) OVERRIDE; + const DnsSdService& service) override; virtual void ServiceRemoved(const std::string& service_type, - const std::string& service_name) OVERRIDE; - virtual void ServicesFlushed(const std::string& service_type) OVERRIDE; + const std::string& service_name) override; + virtual void ServicesFlushed(const std::string& service_type) override; DnsSdServiceTypeDataMap service_data_map_; diff --git a/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc b/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc index 42e5fa0..a40f85a 100644 --- a/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc +++ b/chrome/browser/extensions/api/mdns/dns_sd_registry_unittest.cc @@ -15,7 +15,7 @@ class MockDnsSdDeviceLister : public DnsSdDeviceLister { MockDnsSdDeviceLister() : DnsSdDeviceLister(NULL, NULL, "") {} virtual ~MockDnsSdDeviceLister() {} - virtual void Discover(bool force_update) OVERRIDE {} + virtual void Discover(bool force_update) override {} }; class TestDnsSdRegistry : public DnsSdRegistry { @@ -43,7 +43,7 @@ class TestDnsSdRegistry : public DnsSdRegistry { DnsSdDelegate* delegate, const std::string& service_type, local_discovery::ServiceDiscoverySharedClient* discovery_client) - OVERRIDE { + override { delegate_ = delegate; MockDnsSdDeviceLister* lister = new MockDnsSdDeviceLister(); listers_[service_type] = lister; @@ -67,7 +67,7 @@ class DnsSdRegistryTest : public testing::Test { DnsSdRegistryTest() {} virtual ~DnsSdRegistryTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { registry_.reset(new TestDnsSdRegistry()); registry_->AddObserver(&observer_); } diff --git a/chrome/browser/extensions/api/mdns/mdns_api.h b/chrome/browser/extensions/api/mdns/mdns_api.h index c58fcb5..e659b0a 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api.h +++ b/chrome/browser/extensions/api/mdns/mdns_api.h @@ -49,13 +49,13 @@ class MDnsAPI : public BrowserContextKeyedAPI, friend class BrowserContextKeyedAPIFactory<MDnsAPI>; // 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; // DnsSdRegistry::Observer virtual void OnDnsSdEvent( const std::string& service_type, - const DnsSdRegistry::DnsSdServiceList& services) OVERRIDE; + const DnsSdRegistry::DnsSdServiceList& services) override; // BrowserContextKeyedAPI implementation. static const char* service_name() { diff --git a/chrome/browser/extensions/api/mdns/mdns_apitest.cc b/chrome/browser/extensions/api/mdns/mdns_apitest.cc index 4be0607..5e4657a 100644 --- a/chrome/browser/extensions/api/mdns/mdns_apitest.cc +++ b/chrome/browser/extensions/api/mdns/mdns_apitest.cc @@ -42,7 +42,7 @@ class MDnsAPITest : public ExtensionApiTest { public: MDnsAPITest() {} - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { ExtensionApiTest::SetUpCommandLine(command_line); command_line->AppendSwitchASCII( extensions::switches::kWhitelistedExtensionID, |