| Index: chrome/browser/local_discovery/service_discovery_client_mac.h
|
| diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.h b/chrome/browser/local_discovery/service_discovery_client_mac.h
|
| index 4532e5e22684d53cca8e41d5a25f1eda77555133..bc67de4a155d2d8515236e934b617a6a44834646 100644
|
| --- a/chrome/browser/local_discovery/service_discovery_client_mac.h
|
| +++ b/chrome/browser/local_discovery/service_discovery_client_mac.h
|
| @@ -37,14 +37,14 @@ class ServiceDiscoveryClientMac : public ServiceDiscoverySharedClient {
|
| // ServiceDiscoveryClient implementation.
|
| virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher(
|
| const std::string& service_type,
|
| - const ServiceWatcher::UpdatedCallback& callback) OVERRIDE;
|
| + const ServiceWatcher::UpdatedCallback& callback) override;
|
| virtual scoped_ptr<ServiceResolver> CreateServiceResolver(
|
| const std::string& service_name,
|
| - const ServiceResolver::ResolveCompleteCallback& callback) OVERRIDE;
|
| + const ServiceResolver::ResolveCompleteCallback& callback) override;
|
| virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
|
| const std::string& domain,
|
| net::AddressFamily address_family,
|
| - const LocalDomainResolver::IPAddressCallback& callback) OVERRIDE;
|
| + const LocalDomainResolver::IPAddressCallback& callback) override;
|
|
|
| void StartThreadIfNotStarted();
|
|
|
| @@ -102,11 +102,11 @@ class ServiceWatcherImplMac : public ServiceWatcher {
|
| private:
|
| virtual ~ServiceWatcherImplMac();
|
|
|
| - virtual void Start() OVERRIDE;
|
| - virtual void DiscoverNewServices(bool force_update) OVERRIDE;
|
| + virtual void Start() override;
|
| + virtual void DiscoverNewServices(bool force_update) override;
|
| virtual void SetActivelyRefreshServices(
|
| - bool actively_refresh_services) OVERRIDE;
|
| - virtual std::string GetServiceType() const OVERRIDE;
|
| + bool actively_refresh_services) override;
|
| + virtual std::string GetServiceType() const override;
|
|
|
| std::string service_type_;
|
| ServiceWatcher::UpdatedCallback callback_;
|
| @@ -170,8 +170,8 @@ class ServiceResolverImplMac : public ServiceResolver {
|
| private:
|
| virtual ~ServiceResolverImplMac();
|
|
|
| - virtual void StartResolving() OVERRIDE;
|
| - virtual std::string GetName() const OVERRIDE;
|
| + virtual void StartResolving() override;
|
| + virtual std::string GetName() const override;
|
|
|
| void OnResolveComplete(RequestStatus status,
|
| const ServiceDescription& description);
|
|
|