| Index: chromeos/network/network_device_handler_impl.h
|
| diff --git a/chromeos/network/network_device_handler_impl.h b/chromeos/network/network_device_handler_impl.h
|
| index 3db410bea150595bb9e6c38ffd9ac50f4d6c4d80..fb10f3c2e8426338767af706e2bd7fb6f6b5cb88 100644
|
| --- a/chromeos/network/network_device_handler_impl.h
|
| +++ b/chromeos/network/network_device_handler_impl.h
|
| @@ -31,79 +31,79 @@ class CHROMEOS_EXPORT NetworkDeviceHandlerImpl
|
| virtual void GetDeviceProperties(
|
| const std::string& device_path,
|
| const network_handler::DictionaryResultCallback& callback,
|
| - const network_handler::ErrorCallback& error_callback) const OVERRIDE;
|
| + const network_handler::ErrorCallback& error_callback) const override;
|
|
|
| virtual void SetDeviceProperty(
|
| const std::string& device_path,
|
| const std::string& property_name,
|
| const base::Value& value,
|
| const base::Closure& callback,
|
| - const network_handler::ErrorCallback& error_callback) OVERRIDE;
|
| + const network_handler::ErrorCallback& error_callback) override;
|
|
|
| virtual void RequestRefreshIPConfigs(
|
| const std::string& device_path,
|
| const base::Closure& callback,
|
| - const network_handler::ErrorCallback& error_callback) OVERRIDE;
|
| + const network_handler::ErrorCallback& error_callback) override;
|
|
|
| virtual void ProposeScan(const std::string& device_path,
|
| const base::Closure& callback,
|
| const network_handler::ErrorCallback& error_callback)
|
| - OVERRIDE;
|
| + override;
|
|
|
| virtual void RegisterCellularNetwork(
|
| const std::string& device_path,
|
| const std::string& network_id,
|
| const base::Closure& callback,
|
| - const network_handler::ErrorCallback& error_callback) OVERRIDE;
|
| + const network_handler::ErrorCallback& error_callback) override;
|
|
|
| virtual void SetCarrier(const std::string& device_path,
|
| const std::string& carrier,
|
| const base::Closure& callback,
|
| const network_handler::ErrorCallback& error_callback)
|
| - OVERRIDE;
|
| + override;
|
|
|
| virtual void RequirePin(const std::string& device_path,
|
| bool require_pin,
|
| const std::string& pin,
|
| const base::Closure& callback,
|
| const network_handler::ErrorCallback& error_callback)
|
| - OVERRIDE;
|
| + override;
|
|
|
| virtual void EnterPin(const std::string& device_path,
|
| const std::string& pin,
|
| const base::Closure& callback,
|
| const network_handler::ErrorCallback& error_callback)
|
| - OVERRIDE;
|
| + override;
|
|
|
| virtual void UnblockPin(const std::string& device_path,
|
| const std::string& puk,
|
| const std::string& new_pin,
|
| const base::Closure& callback,
|
| const network_handler::ErrorCallback& error_callback)
|
| - OVERRIDE;
|
| + override;
|
|
|
| virtual void ChangePin(const std::string& device_path,
|
| const std::string& old_pin,
|
| const std::string& new_pin,
|
| const base::Closure& callback,
|
| const network_handler::ErrorCallback& error_callback)
|
| - OVERRIDE;
|
| + override;
|
|
|
| - virtual void SetCellularAllowRoaming(bool allow_roaming) OVERRIDE;
|
| + virtual void SetCellularAllowRoaming(bool allow_roaming) override;
|
|
|
| virtual void SetWifiTDLSEnabled(
|
| const std::string& ip_or_mac_address,
|
| bool enabled,
|
| const network_handler::StringResultCallback& callback,
|
| - const network_handler::ErrorCallback& error_callback) OVERRIDE;
|
| + const network_handler::ErrorCallback& error_callback) override;
|
|
|
| virtual void GetWifiTDLSStatus(
|
| const std::string& ip_or_mac_address,
|
| const network_handler::StringResultCallback& callback,
|
| - const network_handler::ErrorCallback& error_callback) OVERRIDE;
|
| + const network_handler::ErrorCallback& error_callback) override;
|
|
|
| // NetworkStateHandlerObserver overrides
|
| - virtual void DeviceListChanged() OVERRIDE;
|
| + virtual void DeviceListChanged() override;
|
|
|
| private:
|
| friend class NetworkHandler;
|
|
|