| Index: chrome/browser/extensions/api/networking_private/networking_private_service_client.h
|
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client.h b/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
|
| index 63708c5bd55f5125c5f29284ba3d580648b6f5b2..f266c65c856b28dcbb0f3f615af9d3f6eb8e54ae 100644
|
| --- a/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
|
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client.h
|
| @@ -112,71 +112,71 @@ class NetworkingPrivateServiceClient
|
| CryptoVerify* crypto_verify);
|
|
|
| // KeyedService
|
| - virtual void Shutdown() OVERRIDE;
|
| + virtual void Shutdown() override;
|
|
|
| // NetworkingPrivateDelegate
|
| virtual void GetProperties(const std::string& guid,
|
| const DictionaryCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void GetManagedProperties(
|
| const std::string& guid,
|
| const DictionaryCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void GetState(const std::string& guid,
|
| const DictionaryCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void SetProperties(const std::string& guid,
|
| scoped_ptr<base::DictionaryValue> properties_dict,
|
| const VoidCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void CreateNetwork(bool shared,
|
| scoped_ptr<base::DictionaryValue> properties_dict,
|
| const StringCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void GetNetworks(const std::string& network_type,
|
| bool configured_only,
|
| bool visible_only,
|
| int limit,
|
| const NetworkListCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void StartConnect(const std::string& guid,
|
| const VoidCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void StartDisconnect(
|
| const std::string& guid,
|
| const VoidCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void VerifyDestination(
|
| const VerificationProperties& verification_properties,
|
| const BoolCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void VerifyAndEncryptCredentials(
|
| const std::string& guid,
|
| const VerificationProperties& verification_properties,
|
| const StringCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void VerifyAndEncryptData(
|
| const VerificationProperties& verification_properties,
|
| const std::string& data,
|
| const StringCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void SetWifiTDLSEnabledState(
|
| const std::string& ip_or_mac_address,
|
| bool enabled,
|
| const StringCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void GetWifiTDLSStatus(
|
| const std::string& ip_or_mac_address,
|
| const StringCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| virtual void GetCaptivePortalStatus(
|
| const std::string& guid,
|
| const StringCallback& success_callback,
|
| - const FailureCallback& failure_callback) OVERRIDE;
|
| - virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() OVERRIDE;
|
| - virtual bool EnableNetworkType(const std::string& type) OVERRIDE;
|
| - virtual bool DisableNetworkType(const std::string& type) OVERRIDE;
|
| - virtual bool RequestScan() OVERRIDE;
|
| + const FailureCallback& failure_callback) override;
|
| + virtual scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override;
|
| + virtual bool EnableNetworkType(const std::string& type) override;
|
| + virtual bool DisableNetworkType(const std::string& type) override;
|
| + virtual bool RequestScan() override;
|
|
|
| // Adds observer to network events.
|
| void AddObserver(Observer* network_events_observer);
|
| @@ -187,7 +187,7 @@ class NetworkingPrivateServiceClient
|
|
|
| // NetworkChangeNotifier::NetworkChangeObserver implementation.
|
| virtual void OnNetworkChanged(
|
| - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
|
| + net::NetworkChangeNotifier::ConnectionType type) override;
|
|
|
| private:
|
| // Callbacks to extension api function objects. Keep reference to API object
|
|
|