diff options
154 files changed, 1243 insertions, 1243 deletions
diff --git a/chromeos/attestation/mock_attestation_flow.h b/chromeos/attestation/mock_attestation_flow.h index 1774964..a4a26b9 100644 --- a/chromeos/attestation/mock_attestation_flow.h +++ b/chromeos/attestation/mock_attestation_flow.h @@ -25,10 +25,10 @@ class FakeServerProxy : public ServerProxy { } virtual void SendEnrollRequest(const std::string& request, - const DataCallback& callback) OVERRIDE; + const DataCallback& callback) override; virtual void SendCertificateRequest(const std::string& request, - const DataCallback& callback) OVERRIDE; + const DataCallback& callback) override; private: bool result_; diff --git a/chromeos/audio/audio_devices_pref_handler_stub.h b/chromeos/audio/audio_devices_pref_handler_stub.h index 5f07dc8..756038d 100644 --- a/chromeos/audio/audio_devices_pref_handler_stub.h +++ b/chromeos/audio/audio_devices_pref_handler_stub.h @@ -22,16 +22,16 @@ class CHROMEOS_EXPORT AudioDevicesPrefHandlerStub AudioDevicesPrefHandlerStub(); - virtual double GetOutputVolumeValue(const AudioDevice* device) OVERRIDE; - virtual double GetInputGainValue(const AudioDevice* device) OVERRIDE; + virtual double GetOutputVolumeValue(const AudioDevice* device) override; + virtual double GetInputGainValue(const AudioDevice* device) override; virtual void SetVolumeGainValue(const AudioDevice& device, - double value) OVERRIDE; - virtual bool GetMuteValue(const AudioDevice& device) OVERRIDE; - virtual void SetMuteValue(const AudioDevice& device, bool mute_on) OVERRIDE; - virtual bool GetAudioCaptureAllowedValue() OVERRIDE; - virtual bool GetAudioOutputAllowedValue() OVERRIDE; - virtual void AddAudioPrefObserver(AudioPrefObserver* observer) OVERRIDE; - virtual void RemoveAudioPrefObserver(AudioPrefObserver* observer) OVERRIDE; + double value) override; + virtual bool GetMuteValue(const AudioDevice& device) override; + virtual void SetMuteValue(const AudioDevice& device, bool mute_on) override; + virtual bool GetAudioCaptureAllowedValue() override; + virtual bool GetAudioOutputAllowedValue() override; + virtual void AddAudioPrefObserver(AudioPrefObserver* observer) override; + virtual void RemoveAudioPrefObserver(AudioPrefObserver* observer) override; protected: virtual ~AudioDevicesPrefHandlerStub(); diff --git a/chromeos/audio/cras_audio_handler.h b/chromeos/audio/cras_audio_handler.h index a377cf5..d80f794 100644 --- a/chromeos/audio/cras_audio_handler.h +++ b/chromeos/audio/cras_audio_handler.h @@ -202,16 +202,16 @@ class CHROMEOS_EXPORT CrasAudioHandler : public CrasAudioClient::Observer, friend class CrasAudioHandlerTest; // CrasAudioClient::Observer overrides. - virtual void AudioClientRestarted() OVERRIDE; - virtual void NodesChanged() OVERRIDE; - virtual void ActiveOutputNodeChanged(uint64 node_id) OVERRIDE; - virtual void ActiveInputNodeChanged(uint64 node_id) OVERRIDE; + virtual void AudioClientRestarted() override; + virtual void NodesChanged() override; + virtual void ActiveOutputNodeChanged(uint64 node_id) override; + virtual void ActiveInputNodeChanged(uint64 node_id) override; // AudioPrefObserver overrides. - virtual void OnAudioPolicyPrefChanged() OVERRIDE; + virtual void OnAudioPolicyPrefChanged() override; // SessionManagerClient::Observer overrides. - virtual void EmitLoginPromptVisibleCalled() OVERRIDE; + virtual void EmitLoginPromptVisibleCalled() override; // Sets the active audio output/input node to the node with |node_id|. void SetActiveOutputNode(uint64 node_id); diff --git a/chromeos/audio/cras_audio_handler_unittest.cc b/chromeos/audio/cras_audio_handler_unittest.cc index f664c52..dc0a11b 100644 --- a/chromeos/audio/cras_audio_handler_unittest.cc +++ b/chromeos/audio/cras_audio_handler_unittest.cc @@ -193,31 +193,31 @@ class TestObserver : public chromeos::CrasAudioHandler::AudioObserver { protected: // chromeos::CrasAudioHandler::AudioObserver overrides. - virtual void OnActiveOutputNodeChanged() OVERRIDE { + virtual void OnActiveOutputNodeChanged() override { ++active_output_node_changed_count_; } - virtual void OnActiveInputNodeChanged() OVERRIDE { + virtual void OnActiveInputNodeChanged() override { ++active_input_node_changed_count_; } - virtual void OnAudioNodesChanged() OVERRIDE { + virtual void OnAudioNodesChanged() override { ++audio_nodes_changed_count_; } - virtual void OnOutputMuteChanged() OVERRIDE { + virtual void OnOutputMuteChanged() override { ++output_mute_changed_count_; } - virtual void OnInputMuteChanged() OVERRIDE { + virtual void OnInputMuteChanged() override { ++input_mute_changed_count_; } - virtual void OnOutputVolumeChanged() OVERRIDE { + virtual void OnOutputVolumeChanged() override { ++output_volume_changed_count_; } - virtual void OnInputGainChanged() OVERRIDE { + virtual void OnInputGainChanged() override { ++input_gain_changed_count_; } @@ -240,10 +240,10 @@ class CrasAudioHandlerTest : public testing::Test { } virtual ~CrasAudioHandlerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { cras_audio_handler_->RemoveAudioObserver(test_observer_.get()); test_observer_.reset(); CrasAudioHandler::Shutdown(); diff --git a/chromeos/cert_loader.h b/chromeos/cert_loader.h index 59342bc..c5fb8ae 100644 --- a/chromeos/cert_loader.h +++ b/chromeos/cert_loader.h @@ -107,9 +107,9 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer { void NotifyCertificatesLoaded(bool initial_load); // net::CertDatabase::Observer - virtual void OnCACertChanged(const net::X509Certificate* cert) OVERRIDE; - virtual void OnCertAdded(const net::X509Certificate* cert) OVERRIDE; - virtual void OnCertRemoved(const net::X509Certificate* cert) OVERRIDE; + virtual void OnCACertChanged(const net::X509Certificate* cert) override; + virtual void OnCertAdded(const net::X509Certificate* cert) override; + virtual void OnCertRemoved(const net::X509Certificate* cert) override; ObserverList<Observer> observers_; diff --git a/chromeos/cert_loader_unittest.cc b/chromeos/cert_loader_unittest.cc index e5b9c96..e614198 100644 --- a/chromeos/cert_loader_unittest.cc +++ b/chromeos/cert_loader_unittest.cc @@ -53,7 +53,7 @@ class CertLoaderTest : public testing::Test, virtual ~CertLoaderTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(primary_user_.constructed_successfully()); ASSERT_TRUE( crypto::GetPublicSlotForChromeOSUser(primary_user_.username_hash())); @@ -80,7 +80,7 @@ class CertLoaderTest : public testing::Test, // CertLoader::Observer: // The test keeps count of times the observer method was called. virtual void OnCertificatesLoaded(const net::CertificateList& cert_list, - bool initial_load) OVERRIDE { + bool initial_load) override { EXPECT_TRUE(certificates_loaded_events_count_ == 0 || !initial_load); certificates_loaded_events_count_++; } diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc index 5d9b844..3bebd30 100644 --- a/chromeos/cryptohome/async_method_caller.cc +++ b/chromeos/cryptohome/async_method_caller.cc @@ -37,7 +37,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { virtual void AsyncCheckKey(const std::string& user_email, const std::string& passhash, - Callback callback) OVERRIDE { + Callback callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncCheckKey(user_email, passhash, base::Bind( &AsyncMethodCallerImpl::RegisterAsyncCallback, @@ -49,7 +49,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { virtual void AsyncMigrateKey(const std::string& user_email, const std::string& old_hash, const std::string& new_hash, - Callback callback) OVERRIDE { + Callback callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncMigrateKey(user_email, old_hash, new_hash, base::Bind( &AsyncMethodCallerImpl::RegisterAsyncCallback, @@ -61,7 +61,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { virtual void AsyncMount(const std::string& user_email, const std::string& passhash, int flags, - Callback callback) OVERRIDE { + Callback callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncMount(user_email, passhash, flags, base::Bind( &AsyncMethodCallerImpl::RegisterAsyncCallback, @@ -73,7 +73,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { virtual void AsyncAddKey(const std::string& user_email, const std::string& passhash, const std::string& new_passhash, - Callback callback) OVERRIDE { + Callback callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncAddKey(user_email, passhash, new_passhash, base::Bind( &AsyncMethodCallerImpl::RegisterAsyncCallback, @@ -82,7 +82,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { "Couldn't initiate async key addition.")); } - virtual void AsyncMountGuest(Callback callback) OVERRIDE { + virtual void AsyncMountGuest(Callback callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncMountGuest(base::Bind( &AsyncMethodCallerImpl::RegisterAsyncCallback, @@ -93,7 +93,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { virtual void AsyncMountPublic(const std::string& public_mount_id, int flags, - Callback callback) OVERRIDE { + Callback callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncMountPublic(public_mount_id, flags, base::Bind( &AsyncMethodCallerImpl::RegisterAsyncCallback, @@ -103,7 +103,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { } virtual void AsyncRemove(const std::string& user_email, - Callback callback) OVERRIDE { + Callback callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncRemove(user_email, base::Bind( &AsyncMethodCallerImpl::RegisterAsyncCallback, @@ -114,7 +114,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { virtual void AsyncTpmAttestationCreateEnrollRequest( chromeos::attestation::PrivacyCAType pca_type, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncTpmAttestationCreateEnrollRequest(pca_type, base::Bind( &AsyncMethodCallerImpl::RegisterAsyncDataCallback, @@ -126,7 +126,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { virtual void AsyncTpmAttestationEnroll( chromeos::attestation::PrivacyCAType pca_type, const std::string& pca_response, - const Callback& callback) OVERRIDE { + const Callback& callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncTpmAttestationEnroll(pca_type, pca_response, base::Bind( &AsyncMethodCallerImpl::RegisterAsyncCallback, @@ -140,7 +140,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { chromeos::attestation::AttestationCertificateProfile certificate_profile, const std::string& user_id, const std::string& request_origin, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncTpmAttestationCreateCertRequest( pca_type, @@ -158,7 +158,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { chromeos::attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> AsyncTpmAttestationFinishCertRequest( pca_response, @@ -176,7 +176,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { chromeos::attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const Callback& callback) OVERRIDE { + const Callback& callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> TpmAttestationRegisterKey( key_type, @@ -197,7 +197,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { const std::string& device_id, chromeos::attestation::AttestationChallengeOptions options, const std::string& challenge, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> TpmAttestationSignEnterpriseChallenge( key_type, @@ -219,7 +219,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { const std::string& user_id, const std::string& key_name, const std::string& challenge, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> TpmAttestationSignSimpleChallenge( key_type, @@ -235,7 +235,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller { virtual void AsyncGetSanitizedUsername( const std::string& user, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { DBusThreadManager::Get()->GetCryptohomeClient()-> GetSanitizedUsername(user, base::Bind( diff --git a/chromeos/cryptohome/homedir_methods.cc b/chromeos/cryptohome/homedir_methods.cc index 371108a..6589030 100644 --- a/chromeos/cryptohome/homedir_methods.cc +++ b/chromeos/cryptohome/homedir_methods.cc @@ -178,7 +178,7 @@ class HomedirMethodsImpl : public HomedirMethods { virtual void GetKeyDataEx(const Identification& id, const std::string& label, - const GetKeyDataCallback& callback) OVERRIDE { + const GetKeyDataCallback& callback) override { cryptohome::AccountIdentifier id_proto; cryptohome::AuthorizationRequest kEmptyAuthProto; cryptohome::GetKeyDataRequest request; @@ -197,7 +197,7 @@ class HomedirMethodsImpl : public HomedirMethods { virtual void CheckKeyEx(const Identification& id, const Authorization& auth, - const Callback& callback) OVERRIDE { + const Callback& callback) override { cryptohome::AccountIdentifier id_proto; cryptohome::AuthorizationRequest auth_proto; cryptohome::CheckKeyRequest request; @@ -217,7 +217,7 @@ class HomedirMethodsImpl : public HomedirMethods { virtual void MountEx(const Identification& id, const Authorization& auth, const MountParameters& request, - const MountCallback& callback) OVERRIDE { + const MountCallback& callback) override { cryptohome::AccountIdentifier id_proto; cryptohome::AuthorizationRequest auth_proto; cryptohome::MountRequest request_proto; @@ -247,7 +247,7 @@ class HomedirMethodsImpl : public HomedirMethods { const Authorization& auth, const KeyDefinition& new_key, bool clobber_if_exists, - const Callback& callback) OVERRIDE { + const Callback& callback) override { cryptohome::AccountIdentifier id_proto; cryptohome::AuthorizationRequest auth_proto; cryptohome::AddKeyRequest request; @@ -269,7 +269,7 @@ class HomedirMethodsImpl : public HomedirMethods { virtual void RemoveKeyEx(const Identification& id, const Authorization& auth, const std::string& label, - const Callback& callback) OVERRIDE { + const Callback& callback) override { cryptohome::AccountIdentifier id_proto; cryptohome::AuthorizationRequest auth_proto; cryptohome::RemoveKeyRequest request; @@ -291,7 +291,7 @@ class HomedirMethodsImpl : public HomedirMethods { const Authorization& auth, const KeyDefinition& new_key, const std::string& signature, - const Callback& callback) OVERRIDE { + const Callback& callback) override { cryptohome::AccountIdentifier id_proto; cryptohome::AuthorizationRequest auth_proto; cryptohome::UpdateKeyRequest pb_update_key; diff --git a/chromeos/cryptohome/homedir_methods_unittest.cc b/chromeos/cryptohome/homedir_methods_unittest.cc index f22fa62..d028b89 100644 --- a/chromeos/cryptohome/homedir_methods_unittest.cc +++ b/chromeos/cryptohome/homedir_methods_unittest.cc @@ -49,8 +49,8 @@ class HomedirMethodsTest : public testing::Test { virtual ~HomedirMethodsTest(); // testing::Test: - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; void RunProtobufMethodCallback( const chromeos::CryptohomeClient::ProtobufMethodCallback& callback); diff --git a/chromeos/cryptohome/system_salt_getter_unittest.cc b/chromeos/cryptohome/system_salt_getter_unittest.cc index db6bc7b..f60bc7f 100644 --- a/chromeos/cryptohome/system_salt_getter_unittest.cc +++ b/chromeos/cryptohome/system_salt_getter_unittest.cc @@ -24,7 +24,7 @@ class SystemSaltGetterTest : public testing::Test { protected: SystemSaltGetterTest() : fake_cryptohome_client_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { fake_cryptohome_client_ = new FakeCryptohomeClient; DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient( scoped_ptr<CryptohomeClient>(fake_cryptohome_client_)); @@ -35,7 +35,7 @@ class SystemSaltGetterTest : public testing::Test { ASSERT_TRUE(SystemSaltGetter::Get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { SystemSaltGetter::Shutdown(); DBusThreadManager::Shutdown(); } diff --git a/chromeos/dbus/blocking_method_caller_unittest.cc b/chromeos/dbus/blocking_method_caller_unittest.cc index 9cee127..f1c088f 100644 --- a/chromeos/dbus/blocking_method_caller_unittest.cc +++ b/chromeos/dbus/blocking_method_caller_unittest.cc @@ -27,11 +27,11 @@ class FakeTaskRunner : public base::TaskRunner { public: virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE { + base::TimeDelta delay) override { task.Run(); return true; } - virtual bool RunsTasksOnCurrentThread() const OVERRIDE { return true; } + virtual bool RunsTasksOnCurrentThread() const override { return true; } protected: virtual ~FakeTaskRunner() {} diff --git a/chromeos/dbus/bluetooth_adapter_client.cc b/chromeos/dbus/bluetooth_adapter_client.cc index 3d8d213..1366eec18 100644 --- a/chromeos/dbus/bluetooth_adapter_client.cc +++ b/chromeos/dbus/bluetooth_adapter_client.cc @@ -60,20 +60,20 @@ class BluetoothAdapterClientImpl // BluetoothAdapterClient override. virtual void AddObserver(BluetoothAdapterClient::Observer* observer) - OVERRIDE { + override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothAdapterClient override. virtual void RemoveObserver(BluetoothAdapterClient::Observer* observer) - OVERRIDE { + override { DCHECK(observer); observers_.RemoveObserver(observer); } // Returns the list of adapter object paths known to the system. - virtual std::vector<dbus::ObjectPath> GetAdapters() OVERRIDE { + virtual std::vector<dbus::ObjectPath> GetAdapters() override { return object_manager_->GetObjectsWithInterface( bluetooth_adapter::kBluetoothAdapterInterface); } @@ -82,7 +82,7 @@ class BluetoothAdapterClientImpl virtual dbus::PropertySet* CreateProperties( dbus::ObjectProxy* object_proxy, const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { Properties* properties = new Properties( object_proxy, interface_name, @@ -94,7 +94,7 @@ class BluetoothAdapterClientImpl // BluetoothAdapterClient override. virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE { + override { return static_cast<Properties*>( object_manager_->GetProperties( object_path, @@ -104,7 +104,7 @@ class BluetoothAdapterClientImpl // BluetoothAdapterClient override. virtual void StartDiscovery(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_adapter::kBluetoothAdapterInterface, bluetooth_adapter::kStartDiscovery); @@ -128,7 +128,7 @@ class BluetoothAdapterClientImpl // BluetoothAdapterClient override. virtual void StopDiscovery(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_adapter::kBluetoothAdapterInterface, bluetooth_adapter::kStopDiscovery); @@ -153,7 +153,7 @@ class BluetoothAdapterClientImpl virtual void RemoveDevice(const dbus::ObjectPath& object_path, const dbus::ObjectPath& device_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_adapter::kBluetoothAdapterInterface, bluetooth_adapter::kRemoveDevice); @@ -178,7 +178,7 @@ class BluetoothAdapterClientImpl } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( @@ -191,7 +191,7 @@ class BluetoothAdapterClientImpl // Called by dbus::ObjectManager when an object with the adapter interface // is created. Informs observers. virtual void ObjectAdded(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_, AdapterAdded(object_path)); } @@ -199,7 +199,7 @@ class BluetoothAdapterClientImpl // Called by dbus::ObjectManager when an object with the adapter interface // is removed. Informs observers. virtual void ObjectRemoved(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothAdapterClient::Observer, observers_, AdapterRemoved(object_path)); } diff --git a/chromeos/dbus/bluetooth_agent_manager_client.cc b/chromeos/dbus/bluetooth_agent_manager_client.cc index a07be49..40c8ebe 100644 --- a/chromeos/dbus/bluetooth_agent_manager_client.cc +++ b/chromeos/dbus/bluetooth_agent_manager_client.cc @@ -30,7 +30,7 @@ class BluetoothAgentManagerClientImpl virtual void RegisterAgent(const dbus::ObjectPath& agent_path, const std::string& capability, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_agent_manager::kBluetoothAgentManagerInterface, bluetooth_agent_manager::kRegisterAgent); @@ -51,7 +51,7 @@ class BluetoothAgentManagerClientImpl // BluetoothAgentManagerClient override. virtual void UnregisterAgent(const dbus::ObjectPath& agent_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_agent_manager::kBluetoothAgentManagerInterface, bluetooth_agent_manager::kUnregisterAgent); @@ -73,7 +73,7 @@ class BluetoothAgentManagerClientImpl virtual void RequestDefaultAgent(const dbus::ObjectPath& agent_path, const base::Closure& callback, const ErrorCallback& error_callback) - OVERRIDE { + override { dbus::MethodCall method_call( bluetooth_agent_manager::kBluetoothAgentManagerInterface, bluetooth_agent_manager::kRequestDefaultAgent); @@ -91,7 +91,7 @@ class BluetoothAgentManagerClientImpl } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { DCHECK(bus); object_proxy_ = bus->GetObjectProxy( bluetooth_agent_manager::kBluetoothAgentManagerServiceName, diff --git a/chromeos/dbus/bluetooth_device_client.cc b/chromeos/dbus/bluetooth_device_client.cc index 00e10d3..777b1aa 100644 --- a/chromeos/dbus/bluetooth_device_client.cc +++ b/chromeos/dbus/bluetooth_device_client.cc @@ -66,14 +66,14 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual void AddObserver(BluetoothDeviceClient::Observer* observer) - OVERRIDE { + override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothDeviceClient override. virtual void RemoveObserver(BluetoothDeviceClient::Observer* observer) - OVERRIDE { + override { DCHECK(observer); observers_.RemoveObserver(observer); } @@ -82,7 +82,7 @@ class BluetoothDeviceClientImpl virtual dbus::PropertySet* CreateProperties( dbus::ObjectProxy* object_proxy, const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { Properties* properties = new Properties( object_proxy, interface_name, @@ -94,7 +94,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter( - const dbus::ObjectPath& adapter_path) OVERRIDE { + const dbus::ObjectPath& adapter_path) override { std::vector<dbus::ObjectPath> object_paths, device_paths; device_paths = object_manager_->GetObjectsWithInterface( bluetooth_device::kBluetoothDeviceInterface); @@ -109,7 +109,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE { + override { return static_cast<Properties*>( object_manager_->GetProperties( object_path, @@ -119,7 +119,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual void Connect(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kConnect); @@ -144,7 +144,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual void Disconnect(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kDisconnect); @@ -169,7 +169,7 @@ class BluetoothDeviceClientImpl virtual void ConnectProfile(const dbus::ObjectPath& object_path, const std::string& uuid, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kConnectProfile); @@ -199,7 +199,7 @@ class BluetoothDeviceClientImpl const std::string& uuid, const base::Closure& callback, const ErrorCallback& error_callback) - OVERRIDE { + override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kDisconnectProfile); @@ -226,7 +226,7 @@ class BluetoothDeviceClientImpl // BluetoothDeviceClient override. virtual void Pair(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kPair); @@ -252,7 +252,7 @@ class BluetoothDeviceClientImpl virtual void CancelPairing(const dbus::ObjectPath& object_path, const base::Closure& callback, const ErrorCallback& error_callback) - OVERRIDE { + override { dbus::MethodCall method_call( bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kCancelPairing); @@ -276,7 +276,7 @@ class BluetoothDeviceClientImpl virtual void StartConnectionMonitor( const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kStartConnectionMonitor); @@ -301,7 +301,7 @@ class BluetoothDeviceClientImpl virtual void StopConnectionMonitor( const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(bluetooth_device::kBluetoothDeviceInterface, bluetooth_device::kStopConnectionMonitor); @@ -323,7 +323,7 @@ class BluetoothDeviceClientImpl } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( @@ -336,7 +336,7 @@ class BluetoothDeviceClientImpl // Called by dbus::ObjectManager when an object with the device interface // is created. Informs observers. virtual void ObjectAdded(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_, DeviceAdded(object_path)); } @@ -344,7 +344,7 @@ class BluetoothDeviceClientImpl // Called by dbus::ObjectManager when an object with the device interface // is removed. Informs observers. virtual void ObjectRemoved(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_, DeviceRemoved(object_path)); } diff --git a/chromeos/dbus/bluetooth_gatt_characteristic_client.cc b/chromeos/dbus/bluetooth_gatt_characteristic_client.cc index 45cae14..206b8d4 100644 --- a/chromeos/dbus/bluetooth_gatt_characteristic_client.cc +++ b/chromeos/dbus/bluetooth_gatt_characteristic_client.cc @@ -54,20 +54,20 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual void AddObserver( - BluetoothGattCharacteristicClient::Observer* observer) OVERRIDE { + BluetoothGattCharacteristicClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothGattCharacteristicClient override. virtual void RemoveObserver( - BluetoothGattCharacteristicClient::Observer* observer) OVERRIDE { + BluetoothGattCharacteristicClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // BluetoothGattCharacteristicClient override. - virtual std::vector<dbus::ObjectPath> GetCharacteristics() OVERRIDE { + virtual std::vector<dbus::ObjectPath> GetCharacteristics() override { DCHECK(object_manager_); return object_manager_->GetObjectsWithInterface( bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface); @@ -75,7 +75,7 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { DCHECK(object_manager_); return static_cast<Properties*>( object_manager_->GetProperties( @@ -87,7 +87,7 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual void ReadValue(const dbus::ObjectPath& object_path, const ValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -114,7 +114,7 @@ class BluetoothGattCharacteristicClientImpl virtual void WriteValue(const dbus::ObjectPath& object_path, const std::vector<uint8>& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -142,7 +142,7 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual void StartNotify(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -168,7 +168,7 @@ class BluetoothGattCharacteristicClientImpl // BluetoothGattCharacteristicClient override. virtual void StopNotify(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -195,7 +195,7 @@ class BluetoothGattCharacteristicClientImpl virtual dbus::PropertySet* CreateProperties( dbus::ObjectProxy *object_proxy, const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { Properties* properties = new Properties( object_proxy, interface_name, @@ -207,7 +207,7 @@ class BluetoothGattCharacteristicClientImpl // dbus::ObjectManager::Interface override. virtual void ObjectAdded(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { VLOG(2) << "Remote GATT characteristic added: " << object_path.value(); FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_, GattCharacteristicAdded(object_path)); @@ -230,7 +230,7 @@ class BluetoothGattCharacteristicClientImpl // dbus::ObjectManager::Interface override. virtual void ObjectRemoved(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { VLOG(2) << "Remote GATT characteristic removed: " << object_path.value(); FOR_EACH_OBSERVER(BluetoothGattCharacteristicClient::Observer, observers_, GattCharacteristicRemoved(object_path)); @@ -238,7 +238,7 @@ class BluetoothGattCharacteristicClientImpl protected: // chromeos::DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( diff --git a/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc b/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc index 19e9f42..edc67b5 100644 --- a/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc +++ b/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.cc @@ -89,7 +89,7 @@ class BluetoothGattCharacteristicServiceProviderImpl } // BluetoothGattCharacteristicServiceProvider override. - virtual void SendValueChanged(const std::vector<uint8>& value) OVERRIDE { + virtual void SendValueChanged(const std::vector<uint8>& value) override { VLOG(2) << "Emitting a PropertiesChanged signal for characteristic value."; dbus::Signal signal( dbus::kDBusPropertiesInterface, diff --git a/chromeos/dbus/bluetooth_gatt_descriptor_client.cc b/chromeos/dbus/bluetooth_gatt_descriptor_client.cc index 850b228..e079000 100644 --- a/chromeos/dbus/bluetooth_gatt_descriptor_client.cc +++ b/chromeos/dbus/bluetooth_gatt_descriptor_client.cc @@ -50,20 +50,20 @@ class BluetoothGattDescriptorClientImpl // BluetoothGattDescriptorClientImpl override. virtual void AddObserver( - BluetoothGattDescriptorClient::Observer* observer) OVERRIDE { + BluetoothGattDescriptorClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothGattDescriptorClientImpl override. virtual void RemoveObserver( - BluetoothGattDescriptorClient::Observer* observer) OVERRIDE { + BluetoothGattDescriptorClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // BluetoothGattDescriptorClientImpl override. - virtual std::vector<dbus::ObjectPath> GetDescriptors() OVERRIDE { + virtual std::vector<dbus::ObjectPath> GetDescriptors() override { DCHECK(object_manager_); return object_manager_->GetObjectsWithInterface( bluetooth_gatt_descriptor::kBluetoothGattDescriptorInterface); @@ -71,7 +71,7 @@ class BluetoothGattDescriptorClientImpl // BluetoothGattDescriptorClientImpl override. virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { DCHECK(object_manager_); return static_cast<Properties*>( object_manager_->GetProperties( @@ -82,7 +82,7 @@ class BluetoothGattDescriptorClientImpl // BluetoothGattDescriptorClientImpl override. virtual void ReadValue(const dbus::ObjectPath& object_path, const ValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -109,7 +109,7 @@ class BluetoothGattDescriptorClientImpl virtual void WriteValue(const dbus::ObjectPath& object_path, const std::vector<uint8>& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_manager_->GetObjectProxy(object_path); if (!object_proxy) { @@ -138,7 +138,7 @@ class BluetoothGattDescriptorClientImpl virtual dbus::PropertySet* CreateProperties( dbus::ObjectProxy *object_proxy, const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { Properties* properties = new Properties( object_proxy, interface_name, @@ -150,7 +150,7 @@ class BluetoothGattDescriptorClientImpl // dbus::ObjectManager::Interface override. virtual void ObjectAdded(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { VLOG(2) << "Remote GATT descriptor added: " << object_path.value(); FOR_EACH_OBSERVER(BluetoothGattDescriptorClient::Observer, observers_, GattDescriptorAdded(object_path)); @@ -158,7 +158,7 @@ class BluetoothGattDescriptorClientImpl // dbus::ObjectManager::Interface override. virtual void ObjectRemoved(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { VLOG(2) << "Remote GATT descriptor removed: " << object_path.value(); FOR_EACH_OBSERVER(BluetoothGattDescriptorClient::Observer, observers_, GattDescriptorRemoved(object_path)); @@ -166,7 +166,7 @@ class BluetoothGattDescriptorClientImpl protected: // chromeos::DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( diff --git a/chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc b/chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc index 9bdfe1f..59d8051 100644 --- a/chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc +++ b/chromeos/dbus/bluetooth_gatt_descriptor_service_provider.cc @@ -87,7 +87,7 @@ class BluetoothGattDescriptorServiceProviderImpl } // BluetoothGattDescriptorServiceProvider override. - virtual void SendValueChanged(const std::vector<uint8>& value) OVERRIDE { + virtual void SendValueChanged(const std::vector<uint8>& value) override { VLOG(2) << "Emitting a PropertiesChanged signal for descriptor value."; dbus::Signal signal( dbus::kDBusPropertiesInterface, diff --git a/chromeos/dbus/bluetooth_gatt_manager_client.cc b/chromeos/dbus/bluetooth_gatt_manager_client.cc index 96d45b9..7455688 100644 --- a/chromeos/dbus/bluetooth_gatt_manager_client.cc +++ b/chromeos/dbus/bluetooth_gatt_manager_client.cc @@ -31,7 +31,7 @@ class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient { virtual void RegisterService(const dbus::ObjectPath& service_path, const Options& options, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_gatt_manager::kBluetoothGattManagerInterface, bluetooth_gatt_manager::kRegisterService); @@ -59,7 +59,7 @@ class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient { // BluetoothGattManagerClient override. virtual void UnregisterService(const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_gatt_manager::kBluetoothGattManagerInterface, bluetooth_gatt_manager::kUnregisterService); @@ -79,7 +79,7 @@ class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient { protected: // chromeos::DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { DCHECK(bus); object_proxy_ = bus->GetObjectProxy( bluetooth_gatt_manager::kBluetoothGattManagerServiceName, diff --git a/chromeos/dbus/bluetooth_gatt_service_client.cc b/chromeos/dbus/bluetooth_gatt_service_client.cc index aa671e6..4c9dc04 100644 --- a/chromeos/dbus/bluetooth_gatt_service_client.cc +++ b/chromeos/dbus/bluetooth_gatt_service_client.cc @@ -45,20 +45,20 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient, // BluetoothGattServiceClientImpl override. virtual void AddObserver( - BluetoothGattServiceClient::Observer* observer) OVERRIDE { + BluetoothGattServiceClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothGattServiceClientImpl override. virtual void RemoveObserver( - BluetoothGattServiceClient::Observer* observer) OVERRIDE { + BluetoothGattServiceClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // BluetoothGattServiceClientImpl override. - virtual std::vector<dbus::ObjectPath> GetServices() OVERRIDE { + virtual std::vector<dbus::ObjectPath> GetServices() override { DCHECK(object_manager_); return object_manager_->GetObjectsWithInterface( bluetooth_gatt_service::kBluetoothGattServiceInterface); @@ -66,7 +66,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient, // BluetoothGattServiceClientImpl override. virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { DCHECK(object_manager_); return static_cast<Properties*>( object_manager_->GetProperties( @@ -78,7 +78,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient, virtual dbus::PropertySet* CreateProperties( dbus::ObjectProxy *object_proxy, const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { Properties* properties = new Properties( object_proxy, interface_name, @@ -90,7 +90,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient, // dbus::ObjectManager::Interface override. virtual void ObjectAdded(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { VLOG(2) << "Remote GATT service added: " << object_path.value(); FOR_EACH_OBSERVER(BluetoothGattServiceClient::Observer, observers_, GattServiceAdded(object_path)); @@ -98,7 +98,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient, // dbus::ObjectManager::Interface override. virtual void ObjectRemoved(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { VLOG(2) << "Remote GATT service removed: " << object_path.value(); FOR_EACH_OBSERVER(BluetoothGattServiceClient::Observer, observers_, GattServiceRemoved(object_path)); @@ -106,7 +106,7 @@ class BluetoothGattServiceClientImpl : public BluetoothGattServiceClient, protected: // chromeos::DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( diff --git a/chromeos/dbus/bluetooth_input_client.cc b/chromeos/dbus/bluetooth_input_client.cc index 5f0cb4f..a433538 100644 --- a/chromeos/dbus/bluetooth_input_client.cc +++ b/chromeos/dbus/bluetooth_input_client.cc @@ -43,14 +43,14 @@ class BluetoothInputClientImpl // BluetoothInputClient override. virtual void AddObserver(BluetoothInputClient::Observer* observer) - OVERRIDE { + override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothInputClient override. virtual void RemoveObserver(BluetoothInputClient::Observer* observer) - OVERRIDE { + override { DCHECK(observer); observers_.RemoveObserver(observer); } @@ -59,7 +59,7 @@ class BluetoothInputClientImpl virtual dbus::PropertySet* CreateProperties( dbus::ObjectProxy* object_proxy, const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { Properties* properties = new Properties( object_proxy, interface_name, @@ -71,7 +71,7 @@ class BluetoothInputClientImpl // BluetoothInputClient override. virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE { + override { return static_cast<Properties*>( object_manager_->GetProperties( object_path, @@ -79,7 +79,7 @@ class BluetoothInputClientImpl } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( @@ -92,7 +92,7 @@ class BluetoothInputClientImpl // Called by dbus::ObjectManager when an object with the input interface // is created. Informs observers. virtual void ObjectAdded(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_, InputAdded(object_path)); } @@ -100,7 +100,7 @@ class BluetoothInputClientImpl // Called by dbus::ObjectManager when an object with the input interface // is removed. Informs observers. virtual void ObjectRemoved(const dbus::ObjectPath& object_path, - const std::string& interface_name) OVERRIDE { + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_, InputRemoved(object_path)); } diff --git a/chromeos/dbus/bluetooth_profile_manager_client.cc b/chromeos/dbus/bluetooth_profile_manager_client.cc index b38e7cd..c5a6205 100644 --- a/chromeos/dbus/bluetooth_profile_manager_client.cc +++ b/chromeos/dbus/bluetooth_profile_manager_client.cc @@ -38,7 +38,7 @@ class BluetoothProfileManagerClientImpl const std::string& uuid, const Options& options, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_profile_manager::kBluetoothProfileManagerInterface, bluetooth_profile_manager::kRegisterProfile); @@ -171,7 +171,7 @@ class BluetoothProfileManagerClientImpl // BluetoothProfileManagerClient override. virtual void UnregisterProfile(const dbus::ObjectPath& profile_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( bluetooth_profile_manager::kBluetoothProfileManagerInterface, bluetooth_profile_manager::kUnregisterProfile); @@ -189,7 +189,7 @@ class BluetoothProfileManagerClientImpl } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { DCHECK(bus); object_proxy_ = bus->GetObjectProxy( bluetooth_profile_manager::kBluetoothProfileManagerServiceName, diff --git a/chromeos/dbus/cras_audio_client.cc b/chromeos/dbus/cras_audio_client.cc index dd4e95a..6abf076 100644 --- a/chromeos/dbus/cras_audio_client.cc +++ b/chromeos/dbus/cras_audio_client.cc @@ -29,19 +29,19 @@ class CrasAudioClientImpl : public CrasAudioClient { } // CrasAudioClient overrides: - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } - virtual void GetVolumeState(const GetVolumeStateCallback& callback) OVERRIDE { + virtual void GetVolumeState(const GetVolumeStateCallback& callback) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kGetVolumeState); cras_proxy_->CallMethod( @@ -52,7 +52,7 @@ class CrasAudioClientImpl : public CrasAudioClient { } virtual void GetNodes(const GetNodesCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kGetNodes); cras_proxy_->CallMethodWithErrorCallback( @@ -64,7 +64,7 @@ class CrasAudioClientImpl : public CrasAudioClient { weak_ptr_factory_.GetWeakPtr(), error_callback)); } - virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) OVERRIDE { + virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetOutputNodeVolume); dbus::MessageWriter writer(&method_call); @@ -76,7 +76,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetOutputUserMute(bool mute_on) OVERRIDE { + virtual void SetOutputUserMute(bool mute_on) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetOutputUserMute); dbus::MessageWriter writer(&method_call); @@ -87,7 +87,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetInputNodeGain(uint64 node_id, int32 input_gain) OVERRIDE { + virtual void SetInputNodeGain(uint64 node_id, int32 input_gain) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetInputNodeGain); dbus::MessageWriter writer(&method_call); @@ -99,7 +99,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetInputMute(bool mute_on) OVERRIDE { + virtual void SetInputMute(bool mute_on) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetInputMute); dbus::MessageWriter writer(&method_call); @@ -110,7 +110,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetActiveOutputNode(uint64 node_id) OVERRIDE { + virtual void SetActiveOutputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -121,7 +121,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetActiveInputNode(uint64 node_id) OVERRIDE { + virtual void SetActiveInputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSetActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -132,7 +132,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void AddActiveInputNode(uint64 node_id) OVERRIDE { + virtual void AddActiveInputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kAddActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -143,7 +143,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void RemoveActiveInputNode(uint64 node_id) OVERRIDE { + virtual void RemoveActiveInputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kRemoveActiveInputNode); dbus::MessageWriter writer(&method_call); @@ -154,7 +154,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void AddActiveOutputNode(uint64 node_id) OVERRIDE { + virtual void AddActiveOutputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kAddActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -164,7 +164,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void RemoveActiveOutputNode(uint64 node_id) OVERRIDE { + virtual void RemoveActiveOutputNode(uint64 node_id) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kRemoveActiveOutputNode); dbus::MessageWriter writer(&method_call); @@ -174,7 +174,7 @@ class CrasAudioClientImpl : public CrasAudioClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SwapLeftRight(uint64 node_id, bool swap) OVERRIDE { + virtual void SwapLeftRight(uint64 node_id, bool swap) override { dbus::MethodCall method_call(cras::kCrasControlInterface, cras::kSwapLeftRight); dbus::MessageWriter writer(&method_call); @@ -186,7 +186,7 @@ class CrasAudioClientImpl : public CrasAudioClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { cras_proxy_ = bus->GetObjectProxy(cras::kCrasServiceName, dbus::ObjectPath(cras::kCrasServicePath)); diff --git a/chromeos/dbus/cras_audio_client_stub_impl.h b/chromeos/dbus/cras_audio_client_stub_impl.h index e0cf485..00adfb3 100644 --- a/chromeos/dbus/cras_audio_client_stub_impl.h +++ b/chromeos/dbus/cras_audio_client_stub_impl.h @@ -19,24 +19,24 @@ class CHROMEOS_EXPORT CrasAudioClientStubImpl : public CrasAudioClient { virtual ~CrasAudioClientStubImpl(); // CrasAudioClient overrides: - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual bool HasObserver(Observer* observer) OVERRIDE; - virtual void GetVolumeState(const GetVolumeStateCallback& callback) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObserver(Observer* observer) override; + virtual void GetVolumeState(const GetVolumeStateCallback& callback) override; virtual void GetNodes(const GetNodesCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; - virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) OVERRIDE; - virtual void SetOutputUserMute(bool mute_on) OVERRIDE; - virtual void SetInputNodeGain(uint64 node_id, int32 gain) OVERRIDE; - virtual void SetInputMute(bool mute_on) OVERRIDE; - virtual void SetActiveOutputNode(uint64 node_id) OVERRIDE; - virtual void SetActiveInputNode(uint64 node_id) OVERRIDE; - virtual void AddActiveInputNode(uint64 node_id) OVERRIDE; - virtual void RemoveActiveInputNode(uint64 node_id) OVERRIDE; - virtual void AddActiveOutputNode(uint64 node_id) OVERRIDE; - virtual void RemoveActiveOutputNode(uint64 node_id) OVERRIDE; - virtual void SwapLeftRight(uint64 node_id, bool swap) OVERRIDE; + const ErrorCallback& error_callback) override; + virtual void SetOutputNodeVolume(uint64 node_id, int32 volume) override; + virtual void SetOutputUserMute(bool mute_on) override; + virtual void SetInputNodeGain(uint64 node_id, int32 gain) override; + virtual void SetInputMute(bool mute_on) override; + virtual void SetActiveOutputNode(uint64 node_id) override; + virtual void SetActiveInputNode(uint64 node_id) override; + virtual void AddActiveInputNode(uint64 node_id) override; + virtual void RemoveActiveInputNode(uint64 node_id) override; + virtual void AddActiveOutputNode(uint64 node_id) override; + virtual void RemoveActiveOutputNode(uint64 node_id) override; + virtual void SwapLeftRight(uint64 node_id, bool swap) override; // Updates |node_list_| to contain |audio_nodes|. void SetAudioNodesForTesting(const AudioNodeList& audio_nodes); diff --git a/chromeos/dbus/cros_disks_client.cc b/chromeos/dbus/cros_disks_client.cc index a875848..d29cae1 100644 --- a/chromeos/dbus/cros_disks_client.cc +++ b/chromeos/dbus/cros_disks_client.cc @@ -102,7 +102,7 @@ class CrosDisksClientImpl : public CrosDisksClient { const std::string& source_format, const std::string& mount_label, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { dbus::MethodCall method_call(cros_disks::kCrosDisksInterface, cros_disks::kMount); dbus::MessageWriter writer(&method_call); @@ -129,7 +129,7 @@ class CrosDisksClientImpl : public CrosDisksClient { virtual void Unmount(const std::string& device_path, UnmountOptions options, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { dbus::MethodCall method_call(cros_disks::kCrosDisksInterface, cros_disks::kUnmount); dbus::MessageWriter writer(&method_call); @@ -152,7 +152,7 @@ class CrosDisksClientImpl : public CrosDisksClient { // CrosDisksClient override. virtual void EnumerateAutoMountableDevices( const EnumerateAutoMountableDevicesCallback& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { dbus::MethodCall method_call(cros_disks::kCrosDisksInterface, cros_disks::kEnumerateAutoMountableDevices); proxy_->CallMethod( @@ -166,7 +166,7 @@ class CrosDisksClientImpl : public CrosDisksClient { // CrosDisksClient override. virtual void EnumerateMountEntries( const EnumerateMountEntriesCallback& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { dbus::MethodCall method_call(cros_disks::kCrosDisksInterface, cros_disks::kEnumerateMountEntries); proxy_->CallMethod( @@ -181,7 +181,7 @@ class CrosDisksClientImpl : public CrosDisksClient { virtual void Format(const std::string& device_path, const std::string& filesystem, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { dbus::MethodCall method_call(cros_disks::kCrosDisksInterface, cros_disks::kFormat); dbus::MessageWriter writer(&method_call); @@ -202,7 +202,7 @@ class CrosDisksClientImpl : public CrosDisksClient { virtual void GetDeviceProperties( const std::string& device_path, const GetDevicePropertiesCallback& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { dbus::MethodCall method_call(cros_disks::kCrosDisksInterface, cros_disks::kGetDeviceProperties); dbus::MessageWriter writer(&method_call); @@ -218,7 +218,7 @@ class CrosDisksClientImpl : public CrosDisksClient { // CrosDisksClient override. virtual void SetMountEventHandler( - const MountEventHandler& mount_event_handler) OVERRIDE { + const MountEventHandler& mount_event_handler) override { static const SignalEventTuple kSignalEventTuples[] = { { cros_disks::kDeviceAdded, CROS_DISKS_DEVICE_ADDED }, { cros_disks::kDeviceScanned, CROS_DISKS_DEVICE_SCANNED }, @@ -244,7 +244,7 @@ class CrosDisksClientImpl : public CrosDisksClient { // CrosDisksClient override. virtual void SetMountCompletedHandler( - const MountCompletedHandler& mount_completed_handler) OVERRIDE { + const MountCompletedHandler& mount_completed_handler) override { proxy_->ConnectToSignal( cros_disks::kCrosDisksInterface, cros_disks::kMountCompleted, @@ -257,7 +257,7 @@ class CrosDisksClientImpl : public CrosDisksClient { // CrosDisksClient override. virtual void SetFormatCompletedHandler( - const FormatCompletedHandler& format_completed_handler) OVERRIDE { + const FormatCompletedHandler& format_completed_handler) override { proxy_->ConnectToSignal( cros_disks::kCrosDisksInterface, cros_disks::kFormatCompleted, @@ -269,7 +269,7 @@ class CrosDisksClientImpl : public CrosDisksClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { proxy_ = bus->GetObjectProxy( cros_disks::kCrosDisksServiceName, dbus::ObjectPath(cros_disks::kCrosDisksServicePath)); @@ -463,12 +463,12 @@ class CrosDisksClientStubImpl : public CrosDisksClient { virtual ~CrosDisksClientStubImpl() {} // CrosDisksClient overrides: - virtual void Init(dbus::Bus* bus) OVERRIDE {} + virtual void Init(dbus::Bus* bus) override {} virtual void Mount(const std::string& source_path, const std::string& source_format, const std::string& mount_label, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { // This stub implementation only accepts archive mount requests. const MountType type = MOUNT_TYPE_ARCHIVE; @@ -498,7 +498,7 @@ class CrosDisksClientStubImpl : public CrosDisksClient { virtual void Unmount(const std::string& device_path, UnmountOptions options, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { // Not mounted. if (mounted_to_source_path_map_.count(device_path) == 0) { base::MessageLoopProxy::current()->PostTask(FROM_HERE, error_callback); @@ -519,7 +519,7 @@ class CrosDisksClientStubImpl : public CrosDisksClient { virtual void EnumerateAutoMountableDevices( const EnumerateAutoMountableDevicesCallback& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { std::vector<std::string> device_paths; base::MessageLoopProxy::current()->PostTask( FROM_HERE, base::Bind(callback, device_paths)); @@ -527,7 +527,7 @@ class CrosDisksClientStubImpl : public CrosDisksClient { virtual void EnumerateMountEntries( const EnumerateMountEntriesCallback& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { std::vector<MountEntry> entries; base::MessageLoopProxy::current()->PostTask( FROM_HERE, base::Bind(callback, entries)); @@ -536,29 +536,29 @@ class CrosDisksClientStubImpl : public CrosDisksClient { virtual void Format(const std::string& device_path, const std::string& filesystem, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { base::MessageLoopProxy::current()->PostTask(FROM_HERE, error_callback); } virtual void GetDeviceProperties( const std::string& device_path, const GetDevicePropertiesCallback& callback, - const base::Closure& error_callback) OVERRIDE { + const base::Closure& error_callback) override { base::MessageLoopProxy::current()->PostTask(FROM_HERE, error_callback); } virtual void SetMountEventHandler( - const MountEventHandler& mount_event_handler) OVERRIDE { + const MountEventHandler& mount_event_handler) override { mount_event_handler_ = mount_event_handler; } virtual void SetMountCompletedHandler( - const MountCompletedHandler& mount_completed_handler) OVERRIDE { + const MountCompletedHandler& mount_completed_handler) override { mount_completed_handler_ = mount_completed_handler; } virtual void SetFormatCompletedHandler( - const FormatCompletedHandler& format_completed_handler) OVERRIDE { + const FormatCompletedHandler& format_completed_handler) override { format_completed_handler_ = format_completed_handler; } diff --git a/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc index 16bf4ed..ed5763a 100644 --- a/chromeos/dbus/cryptohome_client.cc +++ b/chromeos/dbus/cryptohome_client.cc @@ -39,32 +39,32 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void SetAsyncCallStatusHandlers( const AsyncCallStatusHandler& handler, - const AsyncCallStatusWithDataHandler& data_handler) OVERRIDE { + const AsyncCallStatusWithDataHandler& data_handler) override { async_call_status_handler_ = handler; async_call_status_data_handler_ = data_handler; } // CryptohomeClient override. - virtual void ResetAsyncCallStatusHandlers() OVERRIDE { + virtual void ResetAsyncCallStatusHandlers() override { async_call_status_handler_.Reset(); async_call_status_data_handler_.Reset(); } // CryptohomeClient override. virtual void WaitForServiceToBeAvailable( - const WaitForServiceToBeAvailableCallback& callback) OVERRIDE { + const WaitForServiceToBeAvailableCallback& callback) override { proxy_->WaitForServiceToBeAvailable(callback); } // CryptohomeClient override. - virtual void IsMounted(const BoolDBusMethodCallback& callback) OVERRIDE { + virtual void IsMounted(const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeIsMounted); CallBoolMethod(&method_call, callback); } // CryptohomeClient override. - virtual bool Unmount(bool *success) OVERRIDE { + virtual bool Unmount(bool *success) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeUnmount); return CallBoolMethodAndBlock(&method_call, success); @@ -73,7 +73,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void AsyncCheckKey(const std::string& username, const std::string& key, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncCheckKey); dbus::MessageWriter writer(&method_call); @@ -89,7 +89,7 @@ class CryptohomeClientImpl : public CryptohomeClient { virtual void AsyncMigrateKey(const std::string& username, const std::string& from_key, const std::string& to_key, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncMigrateKey); dbus::MessageWriter writer(&method_call); @@ -104,7 +104,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void AsyncRemove(const std::string& username, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncRemove); dbus::MessageWriter writer(&method_call); @@ -116,7 +116,7 @@ class CryptohomeClientImpl : public CryptohomeClient { } // CryptohomeClient override. - virtual void GetSystemSalt(const GetSystemSaltCallback& callback) OVERRIDE { + virtual void GetSystemSalt(const GetSystemSaltCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeGetSystemSalt); proxy_->CallMethod(&method_call, kTpmDBusTimeoutMs , @@ -128,7 +128,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override, virtual void GetSanitizedUsername( const std::string& username, - const StringDBusMethodCallback& callback) OVERRIDE { + const StringDBusMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeGetSanitizedUsername); dbus::MessageWriter writer(&method_call); @@ -141,7 +141,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual std::string BlockingGetSanitizedUsername( - const std::string& username) OVERRIDE { + const std::string& username) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeGetSanitizedUsername); dbus::MessageWriter writer(&method_call); @@ -163,7 +163,7 @@ class CryptohomeClientImpl : public CryptohomeClient { virtual void AsyncMount(const std::string& username, const std::string& key, int flags, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncMount); dbus::MessageWriter writer(&method_call); @@ -183,7 +183,7 @@ class CryptohomeClientImpl : public CryptohomeClient { virtual void AsyncAddKey(const std::string& username, const std::string& key, const std::string& new_key, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncAddKey); dbus::MessageWriter writer(&method_call); @@ -197,7 +197,7 @@ class CryptohomeClientImpl : public CryptohomeClient { } // CryptohomeClient override. - virtual void AsyncMountGuest(const AsyncMethodCallback& callback) OVERRIDE { + virtual void AsyncMountGuest(const AsyncMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncMountGuest); proxy_->CallMethod(&method_call, kTpmDBusTimeoutMs , @@ -209,7 +209,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void AsyncMountPublic(const std::string& public_mount_id, int flags, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncMountPublic); dbus::MessageWriter writer(&method_call); @@ -223,14 +223,14 @@ class CryptohomeClientImpl : public CryptohomeClient { } // CryptohomeClient override. - virtual void TpmIsReady(const BoolDBusMethodCallback& callback) OVERRIDE { + virtual void TpmIsReady(const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsReady); CallBoolMethod(&method_call, callback); } // CryptohomeClient override. - virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) OVERRIDE { + virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsEnabled); CallBoolMethod(&method_call, callback); @@ -238,7 +238,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. // TODO(hashimoto): Remove this method. crbug.com/141006 - virtual bool CallTpmIsEnabledAndBlock(bool* enabled) OVERRIDE { + virtual bool CallTpmIsEnabledAndBlock(bool* enabled) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsEnabled); return CallBoolMethodAndBlock(&method_call, enabled); @@ -246,7 +246,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void TpmGetPassword( - const StringDBusMethodCallback& callback) OVERRIDE { + const StringDBusMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmGetPassword); proxy_->CallMethod( @@ -257,7 +257,7 @@ class CryptohomeClientImpl : public CryptohomeClient { } // CryptohomeClient override. - virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) OVERRIDE { + virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsOwned); CallBoolMethod(&method_call, callback); @@ -265,7 +265,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. // TODO(hashimoto): Remove this method. crbug.com/141012 - virtual bool CallTpmIsOwnedAndBlock(bool* owned) OVERRIDE { + virtual bool CallTpmIsOwnedAndBlock(bool* owned) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsOwned); return CallBoolMethodAndBlock(&method_call, owned); @@ -273,7 +273,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void TpmIsBeingOwned(const BoolDBusMethodCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsBeingOwned); CallBoolMethod(&method_call, callback); @@ -281,7 +281,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. // TODO(hashimoto): Remove this method. crbug.com/141011 - virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) OVERRIDE { + virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsBeingOwned); return CallBoolMethodAndBlock(&method_call, owning); @@ -289,7 +289,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void TpmCanAttemptOwnership( - const VoidDBusMethodCallback& callback) OVERRIDE { + const VoidDBusMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmCanAttemptOwnership); CallVoidMethod(&method_call, callback); @@ -297,7 +297,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient overrides. virtual void TpmClearStoredPassword(const VoidDBusMethodCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmClearStoredPassword); CallVoidMethod(&method_call, callback); @@ -305,7 +305,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. // TODO(hashimoto): Remove this method. crbug.com/141010 - virtual bool CallTpmClearStoredPasswordAndBlock() OVERRIDE { + virtual bool CallTpmClearStoredPasswordAndBlock() override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmClearStoredPassword); scoped_ptr<dbus::Response> response( @@ -315,7 +315,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void Pkcs11IsTpmTokenReady(const BoolDBusMethodCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomePkcs11IsTpmTokenReady); CallBoolMethod(&method_call, callback); @@ -323,7 +323,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void Pkcs11GetTpmTokenInfo( - const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE { + const Pkcs11GetTpmTokenInfoCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomePkcs11GetTpmTokenInfo); proxy_->CallMethod( @@ -337,7 +337,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void Pkcs11GetTpmTokenInfoForUser( const std::string& user_email, - const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE { + const Pkcs11GetTpmTokenInfoCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomePkcs11GetTpmTokenInfoForUser); @@ -354,7 +354,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual bool InstallAttributesGet(const std::string& name, std::vector<uint8>* value, - bool* successful) OVERRIDE { + bool* successful) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeInstallAttributesGet); dbus::MessageWriter writer(&method_call); @@ -376,7 +376,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual bool InstallAttributesSet(const std::string& name, const std::vector<uint8>& value, - bool* successful) OVERRIDE { + bool* successful) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeInstallAttributesSet); dbus::MessageWriter writer(&method_call); @@ -386,7 +386,7 @@ class CryptohomeClientImpl : public CryptohomeClient { } // CryptohomeClient override. - virtual bool InstallAttributesFinalize(bool* successful) OVERRIDE { + virtual bool InstallAttributesFinalize(bool* successful) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeInstallAttributesFinalize); @@ -395,7 +395,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void InstallAttributesIsReady(const BoolDBusMethodCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeInstallAttributesIsReady); @@ -403,7 +403,7 @@ class CryptohomeClientImpl : public CryptohomeClient { } // CryptohomeClient override. - virtual bool InstallAttributesIsInvalid(bool* is_invalid) OVERRIDE { + virtual bool InstallAttributesIsInvalid(bool* is_invalid) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeInstallAttributesIsInvalid); @@ -412,7 +412,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual bool InstallAttributesIsFirstInstall( - bool* is_first_install) OVERRIDE { + bool* is_first_install) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeInstallAttributesIsFirstInstall); @@ -421,7 +421,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void TpmAttestationIsPrepared( - const BoolDBusMethodCallback& callback) OVERRIDE { + const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsAttestationPrepared); @@ -430,7 +430,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void TpmAttestationIsEnrolled( - const BoolDBusMethodCallback& callback) OVERRIDE { + const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmIsAttestationEnrolled); @@ -440,7 +440,7 @@ class CryptohomeClientImpl : public CryptohomeClient { // CryptohomeClient override. virtual void AsyncTpmAttestationCreateEnrollRequest( attestation::PrivacyCAType pca_type, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncTpmAttestationCreateEnrollRequest); @@ -456,7 +456,7 @@ class CryptohomeClientImpl : public CryptohomeClient { virtual void AsyncTpmAttestationEnroll( attestation::PrivacyCAType pca_type, const std::string& pca_response, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncTpmAttestationEnroll); @@ -477,7 +477,7 @@ class CryptohomeClientImpl : public CryptohomeClient { attestation::AttestationCertificateProfile certificate_profile, const std::string& user_id, const std::string& request_origin, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncTpmAttestationCreateCertRequest); @@ -498,7 +498,7 @@ class CryptohomeClientImpl : public CryptohomeClient { attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeAsyncTpmAttestationFinishCertRequest); @@ -521,7 +521,7 @@ class CryptohomeClientImpl : public CryptohomeClient { attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const BoolDBusMethodCallback& callback) OVERRIDE { + const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationDoesKeyExist); @@ -538,7 +538,7 @@ class CryptohomeClientImpl : public CryptohomeClient { attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const DataMethodCallback& callback) OVERRIDE { + const DataMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationGetCertificate); @@ -558,7 +558,7 @@ class CryptohomeClientImpl : public CryptohomeClient { attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const DataMethodCallback& callback) OVERRIDE { + const DataMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationGetPublicKey); @@ -578,7 +578,7 @@ class CryptohomeClientImpl : public CryptohomeClient { attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationRegisterKey); @@ -602,7 +602,7 @@ class CryptohomeClientImpl : public CryptohomeClient { const std::string& device_id, attestation::AttestationChallengeOptions options, const std::string& challenge, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationSignEnterpriseChallenge); @@ -631,7 +631,7 @@ class CryptohomeClientImpl : public CryptohomeClient { const std::string& user_id, const std::string& key_name, const std::string& challenge, - const AsyncMethodCallback& callback) OVERRIDE { + const AsyncMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationSignSimpleChallenge); @@ -653,7 +653,7 @@ class CryptohomeClientImpl : public CryptohomeClient { attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const DataMethodCallback& callback) OVERRIDE { + const DataMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationGetKeyPayload); @@ -674,7 +674,7 @@ class CryptohomeClientImpl : public CryptohomeClient { const std::string& user_id, const std::string& key_name, const std::string& payload, - const BoolDBusMethodCallback& callback) OVERRIDE { + const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationSetKeyPayload); @@ -693,7 +693,7 @@ class CryptohomeClientImpl : public CryptohomeClient { attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_prefix, - const BoolDBusMethodCallback& callback) OVERRIDE { + const BoolDBusMethodCallback& callback) override { dbus::MethodCall method_call( cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeTpmAttestationDeleteKeys); @@ -709,7 +709,7 @@ class CryptohomeClientImpl : public CryptohomeClient { const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::GetKeyDataRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, cryptohome::kCryptohomeGetKeyDataEx); dbus::MessageWriter writer(&method_call); @@ -728,7 +728,7 @@ class CryptohomeClientImpl : public CryptohomeClient { const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::CheckKeyRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { const char* method_name = cryptohome::kCryptohomeCheckKeyEx; dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name); @@ -748,7 +748,7 @@ class CryptohomeClientImpl : public CryptohomeClient { const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::MountRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { const char* method_name = cryptohome::kCryptohomeMountEx; dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name); @@ -768,7 +768,7 @@ class CryptohomeClientImpl : public CryptohomeClient { const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::AddKeyRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { const char* method_name = cryptohome::kCryptohomeAddKeyEx; dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name); @@ -788,7 +788,7 @@ class CryptohomeClientImpl : public CryptohomeClient { const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::UpdateKeyRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { const char* method_name = cryptohome::kCryptohomeUpdateKeyEx; dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name); @@ -808,7 +808,7 @@ class CryptohomeClientImpl : public CryptohomeClient { virtual void RemoveKeyEx(const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::RemoveKeyRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { const char* method_name = cryptohome::kCryptohomeRemoveKeyEx; dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name); @@ -826,7 +826,7 @@ class CryptohomeClientImpl : public CryptohomeClient { virtual void GetBootAttribute( const cryptohome::GetBootAttributeRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { const char* method_name = cryptohome::kCryptohomeGetBootAttribute; dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name); @@ -842,7 +842,7 @@ class CryptohomeClientImpl : public CryptohomeClient { virtual void SetBootAttribute( const cryptohome::SetBootAttributeRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { const char* method_name = cryptohome::kCryptohomeSetBootAttribute; dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name); @@ -858,7 +858,7 @@ class CryptohomeClientImpl : public CryptohomeClient { virtual void FlushAndSignBootAttributes( const cryptohome::FlushAndSignBootAttributesRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE { + const ProtobufMethodCallback& callback) override { const char* method_name = cryptohome::kCryptohomeFlushAndSignBootAttributes; dbus::MethodCall method_call(cryptohome::kCryptohomeInterface, method_name); @@ -873,7 +873,7 @@ class CryptohomeClientImpl : public CryptohomeClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { proxy_ = bus->GetObjectProxy( cryptohome::kCryptohomeServiceName, dbus::ObjectPath(cryptohome::kCryptohomeServicePath)); diff --git a/chromeos/dbus/debug_daemon_client.cc b/chromeos/dbus/debug_daemon_client.cc index ec6a679..efd96a0 100644 --- a/chromeos/dbus/debug_daemon_client.cc +++ b/chromeos/dbus/debug_daemon_client.cc @@ -48,7 +48,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { virtual void DumpDebugLogs(bool is_compressed, base::File file, scoped_refptr<base::TaskRunner> task_runner, - const GetDebugLogsCallback& callback) OVERRIDE { + const GetDebugLogsCallback& callback) override { dbus::FileDescriptor* file_descriptor = new dbus::FileDescriptor; file_descriptor->PutValue(file.TakePlatformFile()); // Punt descriptor validity check to a worker thread; on return we'll @@ -65,7 +65,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void SetDebugMode(const std::string& subsystem, - const SetDebugModeCallback& callback) OVERRIDE { + const SetDebugModeCallback& callback) override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kSetDebugMode); dbus::MessageWriter writer(&method_call); @@ -79,7 +79,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void GetRoutes(bool numeric, bool ipv6, - const GetRoutesCallback& callback) OVERRIDE { + const GetRoutesCallback& callback) override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetRoutes); dbus::MessageWriter writer(&method_call); @@ -104,7 +104,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void GetNetworkStatus(const GetNetworkStatusCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetNetworkStatus); debugdaemon_proxy_->CallMethod( @@ -116,7 +116,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void GetModemStatus(const GetModemStatusCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetModemStatus); debugdaemon_proxy_->CallMethod( @@ -128,7 +128,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void GetWiMaxStatus(const GetWiMaxStatusCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetWiMaxStatus); debugdaemon_proxy_->CallMethod( @@ -140,7 +140,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void GetNetworkInterfaces( - const GetNetworkInterfacesCallback& callback) OVERRIDE { + const GetNetworkInterfacesCallback& callback) override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetInterfaces); debugdaemon_proxy_->CallMethod( @@ -152,7 +152,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void GetPerfData(uint32_t duration, - const GetPerfDataCallback& callback) OVERRIDE { + const GetPerfDataCallback& callback) override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetRichPerfData); dbus::MessageWriter writer(&method_call); @@ -166,7 +166,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { callback)); } - virtual void GetScrubbedLogs(const GetLogsCallback& callback) OVERRIDE { + virtual void GetScrubbedLogs(const GetLogsCallback& callback) override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetFeedbackLogs); debugdaemon_proxy_->CallMethod( @@ -178,7 +178,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void GetAllLogs(const GetLogsCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetAllLogs); debugdaemon_proxy_->CallMethod( @@ -190,7 +190,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void GetUserLogFiles( - const GetLogsCallback& callback) OVERRIDE { + const GetLogsCallback& callback) override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kGetUserLogFiles); debugdaemon_proxy_->CallMethod( @@ -201,7 +201,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { callback)); } - virtual void StartSystemTracing() OVERRIDE { + virtual void StartSystemTracing() override { dbus::MethodCall method_call( debugd::kDebugdInterface, debugd::kSystraceStart); @@ -218,7 +218,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { virtual bool RequestStopSystemTracing( scoped_refptr<base::TaskRunner> task_runner, - const StopSystemTracingCallback& callback) OVERRIDE { + const StopSystemTracingCallback& callback) override { if (pipe_reader_ != NULL) { LOG(ERROR) << "Busy doing StopSystemTracing"; return false; @@ -246,7 +246,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } virtual void TestICMP(const std::string& ip_address, - const TestICMPCallback& callback) OVERRIDE { + const TestICMPCallback& callback) override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kTestICMP); dbus::MessageWriter writer(&method_call); @@ -262,7 +262,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { virtual void TestICMPWithOptions( const std::string& ip_address, const std::map<std::string, std::string>& options, - const TestICMPCallback& callback) OVERRIDE { + const TestICMPCallback& callback) override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kTestICMPWithOptions); dbus::MessageWriter writer(&method_call); @@ -292,7 +292,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { callback)); } - virtual void UploadCrashes() OVERRIDE { + virtual void UploadCrashes() override { dbus::MethodCall method_call(debugd::kDebugdInterface, debugd::kUploadCrashes); debugdaemon_proxy_->CallMethod( @@ -303,7 +303,7 @@ class DebugDaemonClientImpl : public DebugDaemonClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { debugdaemon_proxy_ = bus->GetObjectProxy(debugd::kDebugdServiceName, dbus::ObjectPath(debugd::kDebugdServicePath)); diff --git a/chromeos/dbus/easy_unlock_client.cc b/chromeos/dbus/easy_unlock_client.cc index 8d171a8..d75a40f 100644 --- a/chromeos/dbus/easy_unlock_client.cc +++ b/chromeos/dbus/easy_unlock_client.cc @@ -46,7 +46,7 @@ class EasyUnlockClientImpl : public EasyUnlockClient { // EasyUnlockClient override. virtual void PerformECDHKeyAgreement(const std::string& private_key, const std::string& public_key, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { dbus::MethodCall method_call( easy_unlock::kEasyUnlockServiceInterface, easy_unlock::kPerformECDHKeyAgreementMethod); @@ -62,7 +62,7 @@ class EasyUnlockClientImpl : public EasyUnlockClient { } // EasyUnlockClient override. - virtual void GenerateEcP256KeyPair(const KeyPairCallback& callback) OVERRIDE { + virtual void GenerateEcP256KeyPair(const KeyPairCallback& callback) override { dbus::MethodCall method_call( easy_unlock::kEasyUnlockServiceInterface, easy_unlock::kGenerateEcP256KeyPairMethod); @@ -75,7 +75,7 @@ class EasyUnlockClientImpl : public EasyUnlockClient { // EasyUnlockClient override. virtual void CreateSecureMessage(const std::string& payload, const CreateSecureMessageOptions& options, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { dbus::MethodCall method_call( easy_unlock::kEasyUnlockServiceInterface, easy_unlock::kCreateSecureMessageMethod); @@ -99,7 +99,7 @@ class EasyUnlockClientImpl : public EasyUnlockClient { // EasyUnlockClient override. virtual void UnwrapSecureMessage(const std::string& message, const UnwrapSecureMessageOptions& options, - const DataCallback& callback) OVERRIDE { + const DataCallback& callback) override { dbus::MethodCall method_call( easy_unlock::kEasyUnlockServiceInterface, easy_unlock::kUnwrapSecureMessageMethod); @@ -118,7 +118,7 @@ class EasyUnlockClientImpl : public EasyUnlockClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { proxy_ = bus->GetObjectProxy( easy_unlock::kEasyUnlockServiceName, diff --git a/chromeos/dbus/fake_bluetooth_adapter_client.h b/chromeos/dbus/fake_bluetooth_adapter_client.h index ce25735..2f63863 100644 --- a/chromeos/dbus/fake_bluetooth_adapter_client.h +++ b/chromeos/dbus/fake_bluetooth_adapter_client.h @@ -29,32 +29,32 @@ class CHROMEOS_EXPORT FakeBluetoothAdapterClient // dbus::PropertySet override virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeBluetoothAdapterClient(); virtual ~FakeBluetoothAdapterClient(); // BluetoothAdapterClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual std::vector<dbus::ObjectPath> GetAdapters() OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual std::vector<dbus::ObjectPath> GetAdapters() override; virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE; + override; virtual void StartDiscovery(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StopDiscovery(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void RemoveDevice(const dbus::ObjectPath& object_path, const dbus::ObjectPath& device_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Sets the current simulation timeout interval. void SetSimulationIntervalMs(int interval_ms); diff --git a/chromeos/dbus/fake_bluetooth_agent_manager_client.h b/chromeos/dbus/fake_bluetooth_agent_manager_client.h index fb0fe45..be9a8d9 100644 --- a/chromeos/dbus/fake_bluetooth_agent_manager_client.h +++ b/chromeos/dbus/fake_bluetooth_agent_manager_client.h @@ -27,18 +27,18 @@ class CHROMEOS_EXPORT FakeBluetoothAgentManagerClient virtual ~FakeBluetoothAgentManagerClient(); // BluetoothAgentManagerClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void RegisterAgent(const dbus::ObjectPath& agent_path, const std::string& capability, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void UnregisterAgent(const dbus::ObjectPath& agent_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void RequestDefaultAgent(const dbus::ObjectPath& agent_path, const base::Closure& callback, const ErrorCallback& error_callback) - OVERRIDE; + override; // Register, unregister and retrieve pointers to agent service providers. void RegisterAgentServiceProvider( diff --git a/chromeos/dbus/fake_bluetooth_device_client.h b/chromeos/dbus/fake_bluetooth_device_client.h index af3a7dc..8d476cf 100644 --- a/chromeos/dbus/fake_bluetooth_device_client.h +++ b/chromeos/dbus/fake_bluetooth_device_client.h @@ -32,51 +32,51 @@ class CHROMEOS_EXPORT FakeBluetoothDeviceClient // dbus::PropertySet override virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeBluetoothDeviceClient(); virtual ~FakeBluetoothDeviceClient(); // BluetoothDeviceClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter( - const dbus::ObjectPath& adapter_path) OVERRIDE; + const dbus::ObjectPath& adapter_path) override; virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE; + override; virtual void Connect(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void Disconnect(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ConnectProfile(const dbus::ObjectPath& object_path, const std::string& uuid, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void DisconnectProfile(const dbus::ObjectPath& object_path, const std::string& uuid, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void Pair(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void CancelPairing(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StartConnectionMonitor( const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StopConnectionMonitor( const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; void SetSimulationIntervalMs(int interval_ms); diff --git a/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h b/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h index fc17614..cba953b 100644 --- a/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h +++ b/chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h @@ -31,37 +31,37 @@ class CHROMEOS_EXPORT FakeBluetoothGattCharacteristicClient // dbus::PropertySet override virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeBluetoothGattCharacteristicClient(); virtual ~FakeBluetoothGattCharacteristicClient(); // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; // BluetoothGattCharacteristicClient overrides. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual std::vector<dbus::ObjectPath> GetCharacteristics() OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual std::vector<dbus::ObjectPath> GetCharacteristics() override; virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE; + override; virtual void ReadValue(const dbus::ObjectPath& object_path, const ValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void WriteValue(const dbus::ObjectPath& object_path, const std::vector<uint8>& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StartNotify(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void StopNotify(const dbus::ObjectPath& object_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Makes the group of characteristics belonging to a particular GATT based // profile available under the GATT service with object path |service_path|. diff --git a/chromeos/dbus/fake_bluetooth_gatt_characteristic_service_provider.h b/chromeos/dbus/fake_bluetooth_gatt_characteristic_service_provider.h index 6cea0ee..7e99dec 100644 --- a/chromeos/dbus/fake_bluetooth_gatt_characteristic_service_provider.h +++ b/chromeos/dbus/fake_bluetooth_gatt_characteristic_service_provider.h @@ -30,7 +30,7 @@ class CHROMEOS_EXPORT FakeBluetoothGattCharacteristicServiceProvider virtual ~FakeBluetoothGattCharacteristicServiceProvider(); // BluetoothGattCharacteristicServiceProvider override. - virtual void SendValueChanged(const std::vector<uint8>& value) OVERRIDE; + virtual void SendValueChanged(const std::vector<uint8>& value) override; // Methods to simulate value get/set requests issued from a remote device. The // methods do nothing, if the associated service was not registered with the diff --git a/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h b/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h index ce3f2d4..0fee9ae 100644 --- a/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h +++ b/chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h @@ -28,31 +28,31 @@ class CHROMEOS_EXPORT FakeBluetoothGattDescriptorClient // dbus::PropertySet override virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeBluetoothGattDescriptorClient(); virtual ~FakeBluetoothGattDescriptorClient(); // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; // BluetoothGattDescriptorClient overrides. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual std::vector<dbus::ObjectPath> GetDescriptors() OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual std::vector<dbus::ObjectPath> GetDescriptors() override; virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE; + override; virtual void ReadValue(const dbus::ObjectPath& object_path, const ValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void WriteValue(const dbus::ObjectPath& object_path, const std::vector<uint8>& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Makes the descriptor with the UUID |uuid| visible under the characteristic // with object path |characteristic_path|. Descriptor object paths are diff --git a/chromeos/dbus/fake_bluetooth_gatt_descriptor_service_provider.h b/chromeos/dbus/fake_bluetooth_gatt_descriptor_service_provider.h index 26f5a55..6e8dbbe 100644 --- a/chromeos/dbus/fake_bluetooth_gatt_descriptor_service_provider.h +++ b/chromeos/dbus/fake_bluetooth_gatt_descriptor_service_provider.h @@ -29,7 +29,7 @@ class CHROMEOS_EXPORT FakeBluetoothGattDescriptorServiceProvider virtual ~FakeBluetoothGattDescriptorServiceProvider(); // BluetoothGattDescriptorServiceProvider override. - virtual void SendValueChanged(const std::vector<uint8>& value) OVERRIDE; + virtual void SendValueChanged(const std::vector<uint8>& value) override; // Methods to simulate value get/set requests issued from a remote device. The // methods do nothing, if the associated service was not registered with the diff --git a/chromeos/dbus/fake_bluetooth_gatt_manager_client.h b/chromeos/dbus/fake_bluetooth_gatt_manager_client.h index 6930fbd2..0c2948c 100644 --- a/chromeos/dbus/fake_bluetooth_gatt_manager_client.h +++ b/chromeos/dbus/fake_bluetooth_gatt_manager_client.h @@ -30,16 +30,16 @@ class CHROMEOS_EXPORT FakeBluetoothGattManagerClient virtual ~FakeBluetoothGattManagerClient(); // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; // BluetoothGattManagerClient overrides. virtual void RegisterService(const dbus::ObjectPath& service_path, const Options& options, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void UnregisterService(const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Register, unregister, and retrieve pointers to service, characteristic, and // descriptor service providers. Automatically called from the service diff --git a/chromeos/dbus/fake_bluetooth_gatt_service_client.h b/chromeos/dbus/fake_bluetooth_gatt_service_client.h index 59bcdb5..535b8c7 100644 --- a/chromeos/dbus/fake_bluetooth_gatt_service_client.h +++ b/chromeos/dbus/fake_bluetooth_gatt_service_client.h @@ -30,24 +30,24 @@ class CHROMEOS_EXPORT FakeBluetoothGattServiceClient // dbus::PropertySet override virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeBluetoothGattServiceClient(); virtual ~FakeBluetoothGattServiceClient(); // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; // BluetoothGattServiceClient overrides. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual std::vector<dbus::ObjectPath> GetServices() OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual std::vector<dbus::ObjectPath> GetServices() override; virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE; + override; // Makes a service visible for device with object path |device_path|. Note // that only one instance of a specific service is simulated at a time. Hence, diff --git a/chromeos/dbus/fake_bluetooth_input_client.h b/chromeos/dbus/fake_bluetooth_input_client.h index a2aa620..b823d6a 100644 --- a/chromeos/dbus/fake_bluetooth_input_client.h +++ b/chromeos/dbus/fake_bluetooth_input_client.h @@ -26,21 +26,21 @@ class CHROMEOS_EXPORT FakeBluetoothInputClient // dbus::PropertySet override virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeBluetoothInputClient(); virtual ~FakeBluetoothInputClient(); // BluetoothInputClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE; + override; // Simulate device addition/removal void AddInputDevice(const dbus::ObjectPath& object_path); diff --git a/chromeos/dbus/fake_bluetooth_profile_manager_client.h b/chromeos/dbus/fake_bluetooth_profile_manager_client.h index 3a93d40..add10df 100644 --- a/chromeos/dbus/fake_bluetooth_profile_manager_client.h +++ b/chromeos/dbus/fake_bluetooth_profile_manager_client.h @@ -30,15 +30,15 @@ class CHROMEOS_EXPORT FakeBluetoothProfileManagerClient virtual ~FakeBluetoothProfileManagerClient(); // BluetoothProfileManagerClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void RegisterProfile(const dbus::ObjectPath& profile_path, const std::string& uuid, const Options& options, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void UnregisterProfile(const dbus::ObjectPath& profile_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; // Register, unregister and retrieve pointers to profile server providers. void RegisterProfileServiceProvider( diff --git a/chromeos/dbus/fake_cros_disks_client.h b/chromeos/dbus/fake_cros_disks_client.h index f10d9c0..500aa07 100644 --- a/chromeos/dbus/fake_cros_disks_client.h +++ b/chromeos/dbus/fake_cros_disks_client.h @@ -20,36 +20,36 @@ class FakeCrosDisksClient : public CrosDisksClient { virtual ~FakeCrosDisksClient(); // CrosDisksClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void Mount(const std::string& source_path, const std::string& source_format, const std::string& mount_label, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE; + const base::Closure& error_callback) override; virtual void Unmount(const std::string& device_path, UnmountOptions options, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE; + const base::Closure& error_callback) override; virtual void EnumerateAutoMountableDevices( const EnumerateAutoMountableDevicesCallback& callback, - const base::Closure& error_callback) OVERRIDE; + const base::Closure& error_callback) override; virtual void EnumerateMountEntries( const EnumerateMountEntriesCallback& callback, - const base::Closure& error_callback) OVERRIDE; + const base::Closure& error_callback) override; virtual void Format(const std::string& device_path, const std::string& filesystem, const base::Closure& callback, - const base::Closure& error_callback) OVERRIDE; + const base::Closure& error_callback) override; virtual void GetDeviceProperties( const std::string& device_path, const GetDevicePropertiesCallback& callback, - const base::Closure& error_callback) OVERRIDE; + const base::Closure& error_callback) override; virtual void SetMountEventHandler( - const MountEventHandler& mount_event_handler) OVERRIDE; + const MountEventHandler& mount_event_handler) override; virtual void SetMountCompletedHandler( - const MountCompletedHandler& mount_completed_handler) OVERRIDE; + const MountCompletedHandler& mount_completed_handler) override; virtual void SetFormatCompletedHandler( - const FormatCompletedHandler& format_completed_handler) OVERRIDE; + const FormatCompletedHandler& format_completed_handler) override; // Used in tests to simulate signals sent by cros disks layer. // Invokes handlers set in |SetMountEventHandler|, |SetMountCompletedHandler|, diff --git a/chromeos/dbus/fake_cryptohome_client.h b/chromeos/dbus/fake_cryptohome_client.h index 68f1e86..2bcfb03b 100644 --- a/chromeos/dbus/fake_cryptohome_client.h +++ b/chromeos/dbus/fake_cryptohome_client.h @@ -18,117 +18,117 @@ class CHROMEOS_EXPORT FakeCryptohomeClient : public CryptohomeClient { FakeCryptohomeClient(); virtual ~FakeCryptohomeClient(); - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void SetAsyncCallStatusHandlers( const AsyncCallStatusHandler& handler, - const AsyncCallStatusWithDataHandler& data_handler) OVERRIDE; - virtual void ResetAsyncCallStatusHandlers() OVERRIDE; + const AsyncCallStatusWithDataHandler& data_handler) override; + virtual void ResetAsyncCallStatusHandlers() override; virtual void WaitForServiceToBeAvailable( - const WaitForServiceToBeAvailableCallback& callback) OVERRIDE; - virtual void IsMounted(const BoolDBusMethodCallback& callback) OVERRIDE; - virtual bool Unmount(bool* success) OVERRIDE; + const WaitForServiceToBeAvailableCallback& callback) override; + virtual void IsMounted(const BoolDBusMethodCallback& callback) override; + virtual bool Unmount(bool* success) override; virtual void AsyncCheckKey(const std::string& username, const std::string& key, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void AsyncMigrateKey(const std::string& username, const std::string& from_key, const std::string& to_key, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void AsyncRemove(const std::string& username, - const AsyncMethodCallback& callback) OVERRIDE; - virtual void GetSystemSalt(const GetSystemSaltCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; + virtual void GetSystemSalt(const GetSystemSaltCallback& callback) override; virtual void GetSanitizedUsername( const std::string& username, - const StringDBusMethodCallback& callback) OVERRIDE; + const StringDBusMethodCallback& callback) override; virtual std::string BlockingGetSanitizedUsername( - const std::string& username) OVERRIDE; + const std::string& username) override; virtual void AsyncMount(const std::string& username, const std::string& key, int flags, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void AsyncAddKey(const std::string& username, const std::string& key, const std::string& new_key, - const AsyncMethodCallback& callback) OVERRIDE; - virtual void AsyncMountGuest(const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; + virtual void AsyncMountGuest(const AsyncMethodCallback& callback) override; virtual void AsyncMountPublic(const std::string& public_mount_id, int flags, - const AsyncMethodCallback& callback) OVERRIDE; - virtual void TpmIsReady(const BoolDBusMethodCallback& callback) OVERRIDE; - virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) OVERRIDE; - virtual bool CallTpmIsEnabledAndBlock(bool* enabled) OVERRIDE; + const AsyncMethodCallback& callback) override; + virtual void TpmIsReady(const BoolDBusMethodCallback& callback) override; + virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) override; + virtual bool CallTpmIsEnabledAndBlock(bool* enabled) override; virtual void TpmGetPassword( - const StringDBusMethodCallback& callback) OVERRIDE; - virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) OVERRIDE; - virtual bool CallTpmIsOwnedAndBlock(bool* owned) OVERRIDE; - virtual void TpmIsBeingOwned(const BoolDBusMethodCallback& callback) OVERRIDE; - virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) OVERRIDE; + const StringDBusMethodCallback& callback) override; + virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) override; + virtual bool CallTpmIsOwnedAndBlock(bool* owned) override; + virtual void TpmIsBeingOwned(const BoolDBusMethodCallback& callback) override; + virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) override; virtual void TpmCanAttemptOwnership( - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void TpmClearStoredPassword( - const VoidDBusMethodCallback& callback) OVERRIDE; - virtual bool CallTpmClearStoredPasswordAndBlock() OVERRIDE; + const VoidDBusMethodCallback& callback) override; + virtual bool CallTpmClearStoredPasswordAndBlock() override; virtual void Pkcs11IsTpmTokenReady( - const BoolDBusMethodCallback& callback) OVERRIDE; + const BoolDBusMethodCallback& callback) override; virtual void Pkcs11GetTpmTokenInfo( - const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE; + const Pkcs11GetTpmTokenInfoCallback& callback) override; virtual void Pkcs11GetTpmTokenInfoForUser( const std::string& username, - const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE; + const Pkcs11GetTpmTokenInfoCallback& callback) override; virtual bool InstallAttributesGet(const std::string& name, std::vector<uint8>* value, - bool* successful) OVERRIDE; + bool* successful) override; virtual bool InstallAttributesSet(const std::string& name, const std::vector<uint8>& value, - bool* successful) OVERRIDE; - virtual bool InstallAttributesFinalize(bool* successful) OVERRIDE; + bool* successful) override; + virtual bool InstallAttributesFinalize(bool* successful) override; virtual void InstallAttributesIsReady( - const BoolDBusMethodCallback& callback) OVERRIDE; - virtual bool InstallAttributesIsInvalid(bool* is_invalid) OVERRIDE; - virtual bool InstallAttributesIsFirstInstall(bool* is_first_install) OVERRIDE; + const BoolDBusMethodCallback& callback) override; + virtual bool InstallAttributesIsInvalid(bool* is_invalid) override; + virtual bool InstallAttributesIsFirstInstall(bool* is_first_install) override; virtual void TpmAttestationIsPrepared( - const BoolDBusMethodCallback& callback) OVERRIDE; + const BoolDBusMethodCallback& callback) override; virtual void TpmAttestationIsEnrolled( - const BoolDBusMethodCallback& callback) OVERRIDE; + const BoolDBusMethodCallback& callback) override; virtual void AsyncTpmAttestationCreateEnrollRequest( chromeos::attestation::PrivacyCAType pca_type, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void AsyncTpmAttestationEnroll( chromeos::attestation::PrivacyCAType pca_type, const std::string& pca_response, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void AsyncTpmAttestationCreateCertRequest( chromeos::attestation::PrivacyCAType pca_type, attestation::AttestationCertificateProfile certificate_profile, const std::string& user_id, const std::string& request_origin, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void AsyncTpmAttestationFinishCertRequest( const std::string& pca_response, attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void TpmAttestationDoesKeyExist( attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const BoolDBusMethodCallback& callback) OVERRIDE; + const BoolDBusMethodCallback& callback) override; virtual void TpmAttestationGetCertificate( attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const DataMethodCallback& callback) OVERRIDE; + const DataMethodCallback& callback) override; virtual void TpmAttestationGetPublicKey( attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const DataMethodCallback& callback) OVERRIDE; + const DataMethodCallback& callback) override; virtual void TpmAttestationRegisterKey( attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void TpmAttestationSignEnterpriseChallenge( attestation::AttestationKeyType key_type, const std::string& user_id, @@ -137,67 +137,67 @@ class CHROMEOS_EXPORT FakeCryptohomeClient : public CryptohomeClient { const std::string& device_id, attestation::AttestationChallengeOptions options, const std::string& challenge, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void TpmAttestationSignSimpleChallenge( attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, const std::string& challenge, - const AsyncMethodCallback& callback) OVERRIDE; + const AsyncMethodCallback& callback) override; virtual void TpmAttestationGetKeyPayload( attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, - const DataMethodCallback& callback) OVERRIDE; + const DataMethodCallback& callback) override; virtual void TpmAttestationSetKeyPayload( attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_name, const std::string& payload, - const BoolDBusMethodCallback& callback) OVERRIDE; + const BoolDBusMethodCallback& callback) override; virtual void TpmAttestationDeleteKeys( attestation::AttestationKeyType key_type, const std::string& user_id, const std::string& key_prefix, - const BoolDBusMethodCallback& callback) OVERRIDE; + const BoolDBusMethodCallback& callback) override; virtual void GetKeyDataEx( const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::GetKeyDataRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; virtual void CheckKeyEx( const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::CheckKeyRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; virtual void MountEx( const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::MountRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; virtual void AddKeyEx( const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::AddKeyRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; virtual void UpdateKeyEx( const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::UpdateKeyRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; virtual void RemoveKeyEx(const cryptohome::AccountIdentifier& id, const cryptohome::AuthorizationRequest& auth, const cryptohome::RemoveKeyRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; virtual void GetBootAttribute( const cryptohome::GetBootAttributeRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; virtual void SetBootAttribute( const cryptohome::SetBootAttributeRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; virtual void FlushAndSignBootAttributes( const cryptohome::FlushAndSignBootAttributesRequest& request, - const ProtobufMethodCallback& callback) OVERRIDE; + const ProtobufMethodCallback& callback) override; // Changes the behavior of WaitForServiceToBeAvailable(). This method runs // pending callbacks if is_available is true. diff --git a/chromeos/dbus/fake_debug_daemon_client.h b/chromeos/dbus/fake_debug_daemon_client.h index b405410..c8b5256 100644 --- a/chromeos/dbus/fake_debug_daemon_client.h +++ b/chromeos/dbus/fake_debug_daemon_client.h @@ -18,38 +18,38 @@ class CHROMEOS_EXPORT FakeDebugDaemonClient : public DebugDaemonClient { FakeDebugDaemonClient(); virtual ~FakeDebugDaemonClient(); - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void DumpDebugLogs(bool is_compressed, base::File file, scoped_refptr<base::TaskRunner> task_runner, - const GetDebugLogsCallback& callback) OVERRIDE; + const GetDebugLogsCallback& callback) override; virtual void SetDebugMode(const std::string& subsystem, - const SetDebugModeCallback& callback) OVERRIDE; - virtual void StartSystemTracing() OVERRIDE; + const SetDebugModeCallback& callback) override; + virtual void StartSystemTracing() override; virtual bool RequestStopSystemTracing( scoped_refptr<base::TaskRunner> task_runner, - const StopSystemTracingCallback& callback) OVERRIDE; + const StopSystemTracingCallback& callback) override; virtual void GetRoutes(bool numeric, bool ipv6, - const GetRoutesCallback& callback) OVERRIDE; + const GetRoutesCallback& callback) override; virtual void GetNetworkStatus(const GetNetworkStatusCallback& callback) - OVERRIDE; - virtual void GetModemStatus(const GetModemStatusCallback& callback) OVERRIDE; - virtual void GetWiMaxStatus(const GetWiMaxStatusCallback& callback) OVERRIDE; + override; + virtual void GetModemStatus(const GetModemStatusCallback& callback) override; + virtual void GetWiMaxStatus(const GetWiMaxStatusCallback& callback) override; virtual void GetNetworkInterfaces( - const GetNetworkInterfacesCallback& callback) OVERRIDE; + const GetNetworkInterfacesCallback& callback) override; virtual void GetPerfData(uint32_t duration, - const GetPerfDataCallback& callback) OVERRIDE; - virtual void GetScrubbedLogs(const GetLogsCallback& callback) OVERRIDE; - virtual void GetAllLogs(const GetLogsCallback& callback) OVERRIDE; - virtual void GetUserLogFiles(const GetLogsCallback& callback) OVERRIDE; + const GetPerfDataCallback& callback) override; + virtual void GetScrubbedLogs(const GetLogsCallback& callback) override; + virtual void GetAllLogs(const GetLogsCallback& callback) override; + virtual void GetUserLogFiles(const GetLogsCallback& callback) override; virtual void TestICMP(const std::string& ip_address, - const TestICMPCallback& callback) OVERRIDE; + const TestICMPCallback& callback) override; virtual void TestICMPWithOptions( const std::string& ip_address, const std::map<std::string, std::string>& options, - const TestICMPCallback& callback) OVERRIDE; - virtual void UploadCrashes() OVERRIDE; + const TestICMPCallback& callback) override; + virtual void UploadCrashes() override; private: DISALLOW_COPY_AND_ASSIGN(FakeDebugDaemonClient); diff --git a/chromeos/dbus/fake_easy_unlock_client.h b/chromeos/dbus/fake_easy_unlock_client.h index 046689d..4980b74 100644 --- a/chromeos/dbus/fake_easy_unlock_client.h +++ b/chromeos/dbus/fake_easy_unlock_client.h @@ -23,17 +23,17 @@ class CHROMEOS_EXPORT FakeEasyUnlockClient : public EasyUnlockClient { virtual ~FakeEasyUnlockClient(); // EasyUnlockClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void GenerateEcP256KeyPair(const KeyPairCallback& callback) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void GenerateEcP256KeyPair(const KeyPairCallback& callback) override; virtual void PerformECDHKeyAgreement(const std::string& private_key, const std::string& public_key, - const DataCallback& callback) OVERRIDE; + const DataCallback& callback) override; virtual void CreateSecureMessage(const std::string& payload, const CreateSecureMessageOptions& options, - const DataCallback& callback) OVERRIDE; + const DataCallback& callback) override; virtual void UnwrapSecureMessage(const std::string& message, const UnwrapSecureMessageOptions& options, - const DataCallback& callback) OVERRIDE; + const DataCallback& callback) override; private: int generated_keys_count_; diff --git a/chromeos/dbus/fake_gsm_sms_client.h b/chromeos/dbus/fake_gsm_sms_client.h index 2e26dd1..379db4e 100644 --- a/chromeos/dbus/fake_gsm_sms_client.h +++ b/chromeos/dbus/fake_gsm_sms_client.h @@ -21,27 +21,27 @@ class CHROMEOS_EXPORT FakeGsmSMSClient : public GsmSMSClient { virtual ~FakeGsmSMSClient(); // GsmSMSClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void SetSmsReceivedHandler(const std::string& service_name, const dbus::ObjectPath& object_path, const SmsReceivedHandler& handler) - OVERRIDE; + override; virtual void ResetSmsReceivedHandler(const std::string& service_name, const dbus::ObjectPath& object_path) - OVERRIDE; + override; virtual void Delete(const std::string& service_name, const dbus::ObjectPath& object_path, uint32 index, - const DeleteCallback& callback) OVERRIDE; + const DeleteCallback& callback) override; virtual void Get(const std::string& service_name, const dbus::ObjectPath& object_path, uint32 index, - const GetCallback& callback) OVERRIDE; + const GetCallback& callback) override; virtual void List(const std::string& service_name, const dbus::ObjectPath& object_path, - const ListCallback& callback) OVERRIDE; + const ListCallback& callback) override; virtual void RequestUpdate(const std::string& service_name, - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; // Sets if the command line switch for test is present. RequestUpdate() // changes its behavior depending on the switch. diff --git a/chromeos/dbus/fake_image_burner_client.h b/chromeos/dbus/fake_image_burner_client.h index bed5228..eaa68df 100644 --- a/chromeos/dbus/fake_image_burner_client.h +++ b/chromeos/dbus/fake_image_burner_client.h @@ -18,14 +18,14 @@ class CHROMEOS_EXPORT FakeImageBurnerClient : public ImageBurnerClient { virtual ~FakeImageBurnerClient(); // ImageBurnerClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void BurnImage(const std::string& from_path, const std::string& to_path, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void SetEventHandlers( const BurnFinishedHandler& burn_finished_handler, - const BurnProgressUpdateHandler& burn_progress_update_handler) OVERRIDE; - virtual void ResetEventHandlers() OVERRIDE; + const BurnProgressUpdateHandler& burn_progress_update_handler) override; + virtual void ResetEventHandlers() override; private: DISALLOW_COPY_AND_ASSIGN(FakeImageBurnerClient); diff --git a/chromeos/dbus/fake_introspectable_client.h b/chromeos/dbus/fake_introspectable_client.h index 76aebb1..6a26a89 100644 --- a/chromeos/dbus/fake_introspectable_client.h +++ b/chromeos/dbus/fake_introspectable_client.h @@ -18,10 +18,10 @@ class FakeIntrospectableClient: public IntrospectableClient { FakeIntrospectableClient(); virtual ~FakeIntrospectableClient(); - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void Introspect(const std::string& service_name, const dbus::ObjectPath& object_path, - const IntrospectCallback& callback) OVERRIDE; + const IntrospectCallback& callback) override; }; } // namespace chromeos diff --git a/chromeos/dbus/fake_lorgnette_manager_client.h b/chromeos/dbus/fake_lorgnette_manager_client.h index 7f514f5..84ab1a1 100644 --- a/chromeos/dbus/fake_lorgnette_manager_client.h +++ b/chromeos/dbus/fake_lorgnette_manager_client.h @@ -19,13 +19,13 @@ class CHROMEOS_EXPORT FakeLorgnetteManagerClient FakeLorgnetteManagerClient(); virtual ~FakeLorgnetteManagerClient(); - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; - virtual void ListScanners(const ListScannersCallback& callback) OVERRIDE; + virtual void ListScanners(const ListScannersCallback& callback) override; virtual void ScanImage(std::string device_name, base::PlatformFile file, const ScanProperties& properties, - const ScanImageCallback& callback) OVERRIDE; + const ScanImageCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(FakeLorgnetteManagerClient); diff --git a/chromeos/dbus/fake_modem_messaging_client.h b/chromeos/dbus/fake_modem_messaging_client.h index 16dc4bf..73fe975 100644 --- a/chromeos/dbus/fake_modem_messaging_client.h +++ b/chromeos/dbus/fake_modem_messaging_client.h @@ -17,21 +17,21 @@ class CHROMEOS_EXPORT FakeModemMessagingClient : public ModemMessagingClient { FakeModemMessagingClient(); virtual ~FakeModemMessagingClient(); - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void SetSmsReceivedHandler(const std::string& service_name, const dbus::ObjectPath& object_path, const SmsReceivedHandler& handler) - OVERRIDE; + override; virtual void ResetSmsReceivedHandler(const std::string& service_name, const dbus::ObjectPath& object_path) - OVERRIDE; + override; virtual void Delete(const std::string& service_name, const dbus::ObjectPath& object_path, const dbus::ObjectPath& sms_path, - const DeleteCallback& callback) OVERRIDE; + const DeleteCallback& callback) override; virtual void List(const std::string& service_name, const dbus::ObjectPath& object_path, - const ListCallback& callback) OVERRIDE; + const ListCallback& callback) override; private: SmsReceivedHandler sms_received_handler_; diff --git a/chromeos/dbus/fake_nfc_adapter_client.h b/chromeos/dbus/fake_nfc_adapter_client.h index 0bd353a..2e4ff99 100644 --- a/chromeos/dbus/fake_nfc_adapter_client.h +++ b/chromeos/dbus/fake_nfc_adapter_client.h @@ -30,31 +30,31 @@ class CHROMEOS_EXPORT FakeNfcAdapterClient : public NfcAdapterClient { // dbus::PropertySet overrides. virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeNfcAdapterClient(); virtual ~FakeNfcAdapterClient(); // NfcAdapterClient overrides. - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual std::vector<dbus::ObjectPath> GetAdapters() OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual std::vector<dbus::ObjectPath> GetAdapters() override; virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; virtual void StartPollLoop( const dbus::ObjectPath& object_path, const std::string& mode, const base::Closure& callback, - const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE; + const nfc_client_helpers::ErrorCallback& error_callback) override; virtual void StopPollLoop( const dbus::ObjectPath& object_path, const base::Closure& callback, - const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE; + const nfc_client_helpers::ErrorCallback& error_callback) override; // Sets the adapter as |present|. Used for testing. void SetAdapterPresent(bool present); diff --git a/chromeos/dbus/fake_nfc_device_client.h b/chromeos/dbus/fake_nfc_device_client.h index ab89c08..ae47d9d 100644 --- a/chromeos/dbus/fake_nfc_device_client.h +++ b/chromeos/dbus/fake_nfc_device_client.h @@ -30,28 +30,28 @@ class CHROMEOS_EXPORT FakeNfcDeviceClient : public NfcDeviceClient { // dbus::PropertySet overrides. virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeNfcDeviceClient(); virtual ~FakeNfcDeviceClient(); // NfcDeviceClient overrides. - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter( - const dbus::ObjectPath& adapter_path) OVERRIDE; + const dbus::ObjectPath& adapter_path) override; virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; virtual void Push( const dbus::ObjectPath& object_path, const base::DictionaryValue& attributes, const base::Closure& callback, - const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE; + const nfc_client_helpers::ErrorCallback& error_callback) override; // Simulates the appearance of a device. The fake device will show up after // exactly |visibility_delay| milliseconds, and will simulate pushing a single diff --git a/chromeos/dbus/fake_nfc_manager_client.h b/chromeos/dbus/fake_nfc_manager_client.h index 2393fa2..98dc8b5 100644 --- a/chromeos/dbus/fake_nfc_manager_client.h +++ b/chromeos/dbus/fake_nfc_manager_client.h @@ -25,20 +25,20 @@ class CHROMEOS_EXPORT FakeNfcManagerClient : public NfcManagerClient { // dbus::PropertySet overrides. virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeNfcManagerClient(); virtual ~FakeNfcManagerClient(); // NfcManagerClient overrides. - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual Properties* GetProperties() OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual Properties* GetProperties() override; // Methods to simulate adapters getting added and removed. void AddAdapter(const std::string& adapter_path); diff --git a/chromeos/dbus/fake_nfc_record_client.h b/chromeos/dbus/fake_nfc_record_client.h index 9af1bcc..0935aef 100644 --- a/chromeos/dbus/fake_nfc_record_client.h +++ b/chromeos/dbus/fake_nfc_record_client.h @@ -31,25 +31,25 @@ class CHROMEOS_EXPORT FakeNfcRecordClient : public NfcRecordClient { // dbus::PropertySet overrides. virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeNfcRecordClient(); virtual ~FakeNfcRecordClient(); // NfcTagClient overrides. - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual std::vector<dbus::ObjectPath> GetRecordsForDevice( - const dbus::ObjectPath& device_path) OVERRIDE; + const dbus::ObjectPath& device_path) override; virtual std::vector<dbus::ObjectPath> GetRecordsForTag( - const dbus::ObjectPath& tag_path) OVERRIDE; + const dbus::ObjectPath& tag_path) override; virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; // Adds or removes the fake record objects and notifies the observers. void SetDeviceRecordsVisible(bool visible); diff --git a/chromeos/dbus/fake_nfc_tag_client.h b/chromeos/dbus/fake_nfc_tag_client.h index 244d373..ec50c0b 100644 --- a/chromeos/dbus/fake_nfc_tag_client.h +++ b/chromeos/dbus/fake_nfc_tag_client.h @@ -28,28 +28,28 @@ class CHROMEOS_EXPORT FakeNfcTagClient : public NfcTagClient { // dbus::PropertySet overrides. virtual void Get(dbus::PropertyBase* property, - dbus::PropertySet::GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; + dbus::PropertySet::GetCallback callback) override; + virtual void GetAll() override; virtual void Set(dbus::PropertyBase* property, - dbus::PropertySet::SetCallback callback) OVERRIDE; + dbus::PropertySet::SetCallback callback) override; }; FakeNfcTagClient(); virtual ~FakeNfcTagClient(); // NfcTagClient overrides. - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual std::vector<dbus::ObjectPath> GetTagsForAdapter( - const dbus::ObjectPath& adapter_path) OVERRIDE; + const dbus::ObjectPath& adapter_path) override; virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE; + const dbus::ObjectPath& object_path) override; virtual void Write( const dbus::ObjectPath& object_path, const base::DictionaryValue& attributes, const base::Closure& callback, - const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE; + const nfc_client_helpers::ErrorCallback& error_callback) override; // Simulates the appearance of a tag. The fake tag will show up after // exactly |visibility_delay| milliseconds. |visibility_delay| must have a diff --git a/chromeos/dbus/fake_permission_broker_client.h b/chromeos/dbus/fake_permission_broker_client.h index a2b8978..dbfabe32 100644 --- a/chromeos/dbus/fake_permission_broker_client.h +++ b/chromeos/dbus/fake_permission_broker_client.h @@ -16,14 +16,14 @@ class FakePermissionBrokerClient : public PermissionBrokerClient { FakePermissionBrokerClient(); virtual ~FakePermissionBrokerClient(); - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void RequestPathAccess(const std::string& path, int interface_id, - const ResultCallback& callback) OVERRIDE; + const ResultCallback& callback) override; virtual void RequestUsbAccess(const uint16_t vendor_id, const uint16_t product_id, int interface_id, - const ResultCallback& callback) OVERRIDE; + const ResultCallback& callback) override; private: DISALLOW_COPY_AND_ASSIGN(FakePermissionBrokerClient); }; diff --git a/chromeos/dbus/fake_power_manager_client.h b/chromeos/dbus/fake_power_manager_client.h index f50059b..c81ec85 100644 --- a/chromeos/dbus/fake_power_manager_client.h +++ b/chromeos/dbus/fake_power_manager_client.h @@ -34,30 +34,30 @@ class FakePowerManagerClient : public PowerManagerClient { bool is_projecting() const { return is_projecting_; } // PowerManagerClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual bool HasObserver(Observer* observer) OVERRIDE; - virtual void DecreaseScreenBrightness(bool allow_off) OVERRIDE; - virtual void IncreaseScreenBrightness() OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObserver(Observer* observer) override; + virtual void DecreaseScreenBrightness(bool allow_off) override; + virtual void IncreaseScreenBrightness() override; virtual void SetScreenBrightnessPercent( - double percent, bool gradual) OVERRIDE; + double percent, bool gradual) override; virtual void GetScreenBrightnessPercent( - const GetScreenBrightnessPercentCallback& callback) OVERRIDE; - virtual void DecreaseKeyboardBrightness() OVERRIDE; - virtual void IncreaseKeyboardBrightness() OVERRIDE; - virtual void RequestStatusUpdate() OVERRIDE; - virtual void RequestSuspend() OVERRIDE; - virtual void RequestRestart() OVERRIDE; - virtual void RequestShutdown() OVERRIDE; + const GetScreenBrightnessPercentCallback& callback) override; + virtual void DecreaseKeyboardBrightness() override; + virtual void IncreaseKeyboardBrightness() override; + virtual void RequestStatusUpdate() override; + virtual void RequestSuspend() override; + virtual void RequestRestart() override; + virtual void RequestShutdown() override; virtual void NotifyUserActivity( - power_manager::UserActivityType type) OVERRIDE; - virtual void NotifyVideoActivity(bool is_fullscreen) OVERRIDE; + power_manager::UserActivityType type) override; + virtual void NotifyVideoActivity(bool is_fullscreen) override; virtual void SetPolicy( - const power_manager::PowerManagementPolicy& policy) OVERRIDE; - virtual void SetIsProjecting(bool is_projecting) OVERRIDE; - virtual base::Closure GetSuspendReadinessCallback() OVERRIDE; - virtual int GetNumPendingSuspendReadinessCallbacks() OVERRIDE; + const power_manager::PowerManagementPolicy& policy) override; + virtual void SetIsProjecting(bool is_projecting) override; + virtual base::Closure GetSuspendReadinessCallback() override; + virtual int GetNumPendingSuspendReadinessCallbacks() override; // Emulates the power manager announcing that the system is starting or // completing a suspend attempt. diff --git a/chromeos/dbus/fake_session_manager_client.h b/chromeos/dbus/fake_session_manager_client.h index f408b51..d0effc6 100644 --- a/chromeos/dbus/fake_session_manager_client.h +++ b/chromeos/dbus/fake_session_manager_client.h @@ -24,44 +24,44 @@ class FakeSessionManagerClient : public SessionManagerClient { virtual ~FakeSessionManagerClient(); // SessionManagerClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void SetStubDelegate(StubDelegate* delegate) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual bool HasObserver(Observer* observer) OVERRIDE; - virtual void EmitLoginPromptVisible() OVERRIDE; - virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE; - virtual void StartSession(const std::string& user_email) OVERRIDE; - virtual void StopSession() OVERRIDE; - virtual void StartDeviceWipe() OVERRIDE; - virtual void RequestLockScreen() OVERRIDE; - virtual void NotifyLockScreenShown() OVERRIDE; - virtual void NotifyLockScreenDismissed() OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void SetStubDelegate(StubDelegate* delegate) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObserver(Observer* observer) override; + virtual void EmitLoginPromptVisible() override; + virtual void RestartJob(int pid, const std::string& command_line) override; + virtual void StartSession(const std::string& user_email) override; + virtual void StopSession() override; + virtual void StartDeviceWipe() override; + virtual void RequestLockScreen() override; + virtual void NotifyLockScreenShown() override; + virtual void NotifyLockScreenDismissed() override; virtual void RetrieveActiveSessions( - const ActiveSessionsCallback& callback) OVERRIDE; + const ActiveSessionsCallback& callback) override; virtual void RetrieveDevicePolicy( - const RetrievePolicyCallback& callback) OVERRIDE; + const RetrievePolicyCallback& callback) override; virtual void RetrievePolicyForUser( const std::string& username, - const RetrievePolicyCallback& callback) OVERRIDE; + const RetrievePolicyCallback& callback) override; virtual std::string BlockingRetrievePolicyForUser( - const std::string& username) OVERRIDE; + const std::string& username) override; virtual void RetrieveDeviceLocalAccountPolicy( const std::string& account_id, - const RetrievePolicyCallback& callback) OVERRIDE; + const RetrievePolicyCallback& callback) override; virtual void StoreDevicePolicy(const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE; + const StorePolicyCallback& callback) override; virtual void StorePolicyForUser(const std::string& username, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE; + const StorePolicyCallback& callback) override; virtual void StoreDeviceLocalAccountPolicy( const std::string& account_id, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE; + const StorePolicyCallback& callback) override; virtual void SetFlagsForUser(const std::string& username, - const std::vector<std::string>& flags) OVERRIDE; + const std::vector<std::string>& flags) override; virtual void GetServerBackedStateKeys(const StateKeysCallback& callback) - OVERRIDE; + override; const std::string& device_policy() const; void set_device_policy(const std::string& policy_blob); diff --git a/chromeos/dbus/fake_shill_device_client.h b/chromeos/dbus/fake_shill_device_client.h index a168edd..a4a0fd3 100644 --- a/chromeos/dbus/fake_shill_device_client.h +++ b/chromeos/dbus/fake_shill_device_client.h @@ -23,78 +23,78 @@ class CHROMEOS_EXPORT FakeShillDeviceClient virtual ~FakeShillDeviceClient(); // ShillDeviceClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void AddPropertyChangedObserver( const dbus::ObjectPath& device_path, - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void RemovePropertyChangedObserver( const dbus::ObjectPath& device_path, - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void GetProperties(const dbus::ObjectPath& device_path, - const DictionaryValueCallback& callback) OVERRIDE; + const DictionaryValueCallback& callback) override; virtual void ProposeScan(const dbus::ObjectPath& device_path, - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void SetProperty(const dbus::ObjectPath& device_path, const std::string& name, const base::Value& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ClearProperty(const dbus::ObjectPath& device_path, const std::string& name, - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void AddIPConfig( const dbus::ObjectPath& device_path, const std::string& method, - const ObjectPathDBusMethodCallback& callback) OVERRIDE; + const ObjectPathDBusMethodCallback& callback) override; virtual void RequirePin(const dbus::ObjectPath& device_path, const std::string& pin, bool require, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void EnterPin(const dbus::ObjectPath& device_path, const std::string& pin, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void UnblockPin(const dbus::ObjectPath& device_path, const std::string& puk, const std::string& pin, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ChangePin(const dbus::ObjectPath& device_path, const std::string& old_pin, const std::string& new_pin, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void Register(const dbus::ObjectPath& device_path, const std::string& network_id, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void SetCarrier(const dbus::ObjectPath& device_path, const std::string& carrier, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void Reset(const dbus::ObjectPath& device_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void PerformTDLSOperation( const dbus::ObjectPath& device_path, const std::string& operation, const std::string& peer, const StringCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; - virtual ShillDeviceClient::TestInterface* GetTestInterface() OVERRIDE; + virtual ShillDeviceClient::TestInterface* GetTestInterface() override; // ShillDeviceClient::TestInterface overrides. virtual void AddDevice(const std::string& device_path, const std::string& type, - const std::string& name) OVERRIDE; - virtual void RemoveDevice(const std::string& device_path) OVERRIDE; - virtual void ClearDevices() OVERRIDE; + const std::string& name) override; + virtual void RemoveDevice(const std::string& device_path) override; + virtual void ClearDevices() override; virtual void SetDeviceProperty(const std::string& device_path, const std::string& name, - const base::Value& value) OVERRIDE; - virtual std::string GetDevicePathForType(const std::string& type) OVERRIDE; + const base::Value& value) override; + virtual std::string GetDevicePathForType(const std::string& type) override; void set_tdls_busy_count(int count) { tdls_busy_count_ = count; } diff --git a/chromeos/dbus/fake_shill_ipconfig_client.h b/chromeos/dbus/fake_shill_ipconfig_client.h index ff25246..9a2e3ef 100644 --- a/chromeos/dbus/fake_shill_ipconfig_client.h +++ b/chromeos/dbus/fake_shill_ipconfig_client.h @@ -22,31 +22,31 @@ class CHROMEOS_EXPORT FakeShillIPConfigClient virtual ~FakeShillIPConfigClient(); // ShillIPConfigClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void AddPropertyChangedObserver( const dbus::ObjectPath& ipconfig_path, - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void RemovePropertyChangedObserver( const dbus::ObjectPath& ipconfig_path, - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void Refresh(const dbus::ObjectPath& ipconfig_path, - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void GetProperties(const dbus::ObjectPath& ipconfig_path, - const DictionaryValueCallback& callback) OVERRIDE; + const DictionaryValueCallback& callback) override; virtual void SetProperty(const dbus::ObjectPath& ipconfig_path, const std::string& name, const base::Value& value, - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void ClearProperty(const dbus::ObjectPath& ipconfig_path, const std::string& name, - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void Remove(const dbus::ObjectPath& ipconfig_path, - const VoidDBusMethodCallback& callback) OVERRIDE; - virtual ShillIPConfigClient::TestInterface* GetTestInterface() OVERRIDE; + const VoidDBusMethodCallback& callback) override; + virtual ShillIPConfigClient::TestInterface* GetTestInterface() override; // ShillIPConfigClient::TestInterface overrides. virtual void AddIPConfig(const std::string& ip_config_path, - const base::DictionaryValue& properties) OVERRIDE; + const base::DictionaryValue& properties) override; private: // Runs callback with |values|. diff --git a/chromeos/dbus/fake_shill_manager_client.h b/chromeos/dbus/fake_shill_manager_client.h index 7f24ca2..5a0591e 100644 --- a/chromeos/dbus/fake_shill_manager_client.h +++ b/chromeos/dbus/fake_shill_manager_client.h @@ -29,97 +29,97 @@ class CHROMEOS_EXPORT FakeShillManagerClient virtual ~FakeShillManagerClient(); // ShillManagerClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void AddPropertyChangedObserver( - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void RemovePropertyChangedObserver( - ShillPropertyChangedObserver* observer) OVERRIDE; - virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE; + ShillPropertyChangedObserver* observer) override; + virtual void GetProperties(const DictionaryValueCallback& callback) override; virtual void GetNetworksForGeolocation( - const DictionaryValueCallback& callback) OVERRIDE; + const DictionaryValueCallback& callback) override; virtual void SetProperty(const std::string& name, const base::Value& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void RequestScan(const std::string& type, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void EnableTechnology( const std::string& type, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void DisableTechnology( const std::string& type, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ConfigureService( const base::DictionaryValue& properties, const ObjectPathCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ConfigureServiceForProfile( const dbus::ObjectPath& profile_path, const base::DictionaryValue& properties, const ObjectPathCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void GetService( const base::DictionaryValue& properties, const ObjectPathCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void VerifyDestination(const VerificationProperties& properties, const BooleanCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void VerifyAndEncryptCredentials( const VerificationProperties& properties, const std::string& service_path, const StringCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void VerifyAndEncryptData( const VerificationProperties& properties, const std::string& data, const StringCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ConnectToBestServices( const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void AddWakeOnPacketConnection( const net::IPEndPoint& ip_connection, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void RemoveWakeOnPacketConnection( const net::IPEndPoint& ip_endpoint, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void RemoveAllWakeOnPacketConnections( const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; - virtual ShillManagerClient::TestInterface* GetTestInterface() OVERRIDE; + virtual ShillManagerClient::TestInterface* GetTestInterface() override; // ShillManagerClient::TestInterface overrides. - virtual void AddDevice(const std::string& device_path) OVERRIDE; - virtual void RemoveDevice(const std::string& device_path) OVERRIDE; - virtual void ClearDevices() OVERRIDE; - virtual void AddTechnology(const std::string& type, bool enabled) OVERRIDE; - virtual void RemoveTechnology(const std::string& type) OVERRIDE; + virtual void AddDevice(const std::string& device_path) override; + virtual void RemoveDevice(const std::string& device_path) override; + virtual void ClearDevices() override; + virtual void AddTechnology(const std::string& type, bool enabled) override; + virtual void RemoveTechnology(const std::string& type) override; virtual void SetTechnologyInitializing(const std::string& type, - bool initializing) OVERRIDE; + bool initializing) override; virtual void AddGeoNetwork(const std::string& technology, - const base::DictionaryValue& network) OVERRIDE; - virtual void AddProfile(const std::string& profile_path) OVERRIDE; - virtual void ClearProperties() OVERRIDE; + const base::DictionaryValue& network) override; + virtual void AddProfile(const std::string& profile_path) override; + virtual void ClearProperties() override; virtual void SetManagerProperty(const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual void AddManagerService(const std::string& service_path, - bool notify_observers) OVERRIDE; - virtual void RemoveManagerService(const std::string& service_path) OVERRIDE; - virtual void ClearManagerServices() OVERRIDE; + bool notify_observers) override; + virtual void RemoveManagerService(const std::string& service_path) override; + virtual void ClearManagerServices() override; virtual void ServiceStateChanged(const std::string& service_path, - const std::string& state) OVERRIDE; - virtual void SortManagerServices(bool notify) OVERRIDE; - virtual void SetupDefaultEnvironment() OVERRIDE; - virtual int GetInteractiveDelay() const OVERRIDE; + const std::string& state) override; + virtual void SortManagerServices(bool notify) override; + virtual void SetupDefaultEnvironment() override; + virtual int GetInteractiveDelay() const override; virtual void SetBestServiceToConnect( - const std::string& service_path) OVERRIDE; + const std::string& service_path) override; // Constants used for testing. static const char kFakeEthernetNetworkGuid[]; diff --git a/chromeos/dbus/fake_shill_profile_client.h b/chromeos/dbus/fake_shill_profile_client.h index 65c8417..904fa3f 100644 --- a/chromeos/dbus/fake_shill_profile_client.h +++ b/chromeos/dbus/fake_shill_profile_client.h @@ -24,42 +24,42 @@ class CHROMEOS_EXPORT FakeShillProfileClient : virtual ~FakeShillProfileClient(); // ShillProfileClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void AddPropertyChangedObserver( const dbus::ObjectPath& profile_path, - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void RemovePropertyChangedObserver( const dbus::ObjectPath& profile_path, - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void GetProperties( const dbus::ObjectPath& profile_path, const DictionaryValueCallbackWithoutStatus& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void GetEntry(const dbus::ObjectPath& profile_path, const std::string& entry_path, const DictionaryValueCallbackWithoutStatus& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void DeleteEntry(const dbus::ObjectPath& profile_path, const std::string& entry_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; - virtual ShillProfileClient::TestInterface* GetTestInterface() OVERRIDE; + const ErrorCallback& error_callback) override; + virtual ShillProfileClient::TestInterface* GetTestInterface() override; // ShillProfileClient::TestInterface overrides. virtual void AddProfile(const std::string& profile_path, - const std::string& userhash) OVERRIDE; + const std::string& userhash) override; virtual void AddEntry(const std::string& profile_path, const std::string& entry_path, - const base::DictionaryValue& properties) OVERRIDE; + const base::DictionaryValue& properties) override; virtual bool AddService(const std::string& profile_path, - const std::string& service_path) OVERRIDE; + const std::string& service_path) override; virtual bool UpdateService(const std::string& profile_path, - const std::string& service_path) OVERRIDE; - virtual void GetProfilePaths(std::vector<std::string>* profiles) OVERRIDE; + const std::string& service_path) override; + virtual void GetProfilePaths(std::vector<std::string>* profiles) override; virtual bool GetService(const std::string& service_path, std::string* profile_path, - base::DictionaryValue* properties) OVERRIDE; - virtual void ClearProfiles() OVERRIDE; + base::DictionaryValue* properties) override; + virtual void ClearProfiles() override; private: struct ProfileProperties; diff --git a/chromeos/dbus/fake_shill_service_client.h b/chromeos/dbus/fake_shill_service_client.h index b2692a4..51bf55e 100644 --- a/chromeos/dbus/fake_shill_service_client.h +++ b/chromeos/dbus/fake_shill_service_client.h @@ -26,54 +26,54 @@ class CHROMEOS_EXPORT FakeShillServiceClient virtual ~FakeShillServiceClient(); // ShillServiceClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void AddPropertyChangedObserver( const dbus::ObjectPath& service_path, - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void RemovePropertyChangedObserver( const dbus::ObjectPath& service_path, - ShillPropertyChangedObserver* observer) OVERRIDE; + ShillPropertyChangedObserver* observer) override; virtual void GetProperties(const dbus::ObjectPath& service_path, - const DictionaryValueCallback& callback) OVERRIDE; + const DictionaryValueCallback& callback) override; virtual void SetProperty(const dbus::ObjectPath& service_path, const std::string& name, const base::Value& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void SetProperties(const dbus::ObjectPath& service_path, const base::DictionaryValue& properties, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ClearProperty(const dbus::ObjectPath& service_path, const std::string& name, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ClearProperties(const dbus::ObjectPath& service_path, const std::vector<std::string>& names, const ListValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void Connect(const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void Disconnect(const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void Remove(const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void ActivateCellularModem( const dbus::ObjectPath& service_path, const std::string& carrier, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void CompleteCellularActivation( const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void GetLoadableProfileEntries( const dbus::ObjectPath& service_path, - const DictionaryValueCallback& callback) OVERRIDE; - virtual ShillServiceClient::TestInterface* GetTestInterface() OVERRIDE; + const DictionaryValueCallback& callback) override; + virtual ShillServiceClient::TestInterface* GetTestInterface() override; // ShillServiceClient::TestInterface overrides. virtual void AddService(const std::string& service_path, @@ -81,30 +81,30 @@ class CHROMEOS_EXPORT FakeShillServiceClient const std::string& name, const std::string& type, const std::string& state, - bool visible) OVERRIDE; + bool visible) override; virtual void AddServiceWithIPConfig(const std::string& service_path, const std::string& guid, const std::string& name, const std::string& type, const std::string& state, const std::string& ipconfig_path, - bool visible) OVERRIDE; + bool visible) override; virtual base::DictionaryValue* SetServiceProperties( const std::string& service_path, const std::string& guid, const std::string& name, const std::string& type, const std::string& state, - bool visible) OVERRIDE; - virtual void RemoveService(const std::string& service_path) OVERRIDE; + bool visible) override; + virtual void RemoveService(const std::string& service_path) override; virtual bool SetServiceProperty(const std::string& service_path, const std::string& property, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual const base::DictionaryValue* GetServiceProperties( - const std::string& service_path) const OVERRIDE; - virtual void ClearServices() OVERRIDE; + const std::string& service_path) const override; + virtual void ClearServices() override; virtual void SetConnectBehavior(const std::string& service_path, - const base::Closure& behavior) OVERRIDE; + const base::Closure& behavior) override; private: typedef ObserverList<ShillPropertyChangedObserver> PropertyObserverList; diff --git a/chromeos/dbus/fake_sms_client.h b/chromeos/dbus/fake_sms_client.h index 816fca0..54ea629 100644 --- a/chromeos/dbus/fake_sms_client.h +++ b/chromeos/dbus/fake_sms_client.h @@ -17,11 +17,11 @@ class FakeSMSClient : public SMSClient { FakeSMSClient(); virtual ~FakeSMSClient(); - virtual void Init(dbus::Bus* bus) OVERRIDE; + virtual void Init(dbus::Bus* bus) override; virtual void GetAll(const std::string& service_name, const dbus::ObjectPath& object_path, - const GetAllCallback& callback) OVERRIDE; + const GetAllCallback& callback) override; private: void OnGetAll(base::DictionaryValue* sms, const GetAllCallback& callback); diff --git a/chromeos/dbus/fake_system_clock_client.h b/chromeos/dbus/fake_system_clock_client.h index c109611..a53ff87 100644 --- a/chromeos/dbus/fake_system_clock_client.h +++ b/chromeos/dbus/fake_system_clock_client.h @@ -16,12 +16,12 @@ class CHROMEOS_EXPORT FakeSystemClockClient : public SystemClockClient { virtual ~FakeSystemClockClient(); // SystemClockClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual bool HasObserver(Observer* observer) OVERRIDE; - virtual void SetTime(int64 time_in_seconds) OVERRIDE; - virtual bool CanSetTime() OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObserver(Observer* observer) override; + virtual void SetTime(int64 time_in_seconds) override; + virtual bool CanSetTime() override; private: DISALLOW_COPY_AND_ASSIGN(FakeSystemClockClient); diff --git a/chromeos/dbus/fake_update_engine_client.h b/chromeos/dbus/fake_update_engine_client.h index b2ddc94..6475f2c 100644 --- a/chromeos/dbus/fake_update_engine_client.h +++ b/chromeos/dbus/fake_update_engine_client.h @@ -22,20 +22,20 @@ class FakeUpdateEngineClient : public UpdateEngineClient { virtual ~FakeUpdateEngineClient(); // UpdateEngineClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual bool HasObserver(Observer* observer) OVERRIDE; - virtual void RequestUpdateCheck(const UpdateCheckCallback& callback) OVERRIDE; - virtual void RebootAfterUpdate() OVERRIDE; - virtual void Rollback() OVERRIDE; + virtual void Init(dbus::Bus* bus) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual bool HasObserver(Observer* observer) override; + virtual void RequestUpdateCheck(const UpdateCheckCallback& callback) override; + virtual void RebootAfterUpdate() override; + virtual void Rollback() override; virtual void CanRollbackCheck( - const RollbackCheckCallback& callback) OVERRIDE; - virtual Status GetLastStatus() OVERRIDE; + const RollbackCheckCallback& callback) override; + virtual Status GetLastStatus() override; virtual void SetChannel(const std::string& target_channel, - bool is_powerwash_allowed) OVERRIDE; + bool is_powerwash_allowed) override; virtual void GetChannel(bool get_current_channel, - const GetChannelCallback& callback) OVERRIDE; + const GetChannelCallback& callback) override; // Pushes UpdateEngineClient::Status in the queue to test changing status. // GetLastStatus() returns the status set by this method in FIFO order. diff --git a/chromeos/dbus/gsm_sms_client.cc b/chromeos/dbus/gsm_sms_client.cc index 0c730f4..cd9d236 100644 --- a/chromeos/dbus/gsm_sms_client.cc +++ b/chromeos/dbus/gsm_sms_client.cc @@ -168,14 +168,14 @@ class GsmSMSClientImpl : public GsmSMSClient { virtual void SetSmsReceivedHandler( const std::string& service_name, const dbus::ObjectPath& object_path, - const SmsReceivedHandler& handler) OVERRIDE { + const SmsReceivedHandler& handler) override { GetProxy(service_name, object_path)->SetSmsReceivedHandler(handler); } // GsmSMSClient override. virtual void ResetSmsReceivedHandler( const std::string& service_name, - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { GetProxy(service_name, object_path)->ResetSmsReceivedHandler(); } @@ -183,7 +183,7 @@ class GsmSMSClientImpl : public GsmSMSClient { virtual void Delete(const std::string& service_name, const dbus::ObjectPath& object_path, uint32 index, - const DeleteCallback& callback) OVERRIDE { + const DeleteCallback& callback) override { GetProxy(service_name, object_path)->Delete(index, callback); } @@ -191,24 +191,24 @@ class GsmSMSClientImpl : public GsmSMSClient { virtual void Get(const std::string& service_name, const dbus::ObjectPath& object_path, uint32 index, - const GetCallback& callback) OVERRIDE { + const GetCallback& callback) override { GetProxy(service_name, object_path)->Get(index, callback); } // GsmSMSClient override. virtual void List(const std::string& service_name, const dbus::ObjectPath& object_path, - const ListCallback& callback) OVERRIDE { + const ListCallback& callback) override { GetProxy(service_name, object_path)->List(callback); } // GsmSMSClient override. virtual void RequestUpdate(const std::string& service_name, - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { bus_ = bus; } + virtual void Init(dbus::Bus* bus) override { bus_ = bus; } private: typedef std::map<std::pair<std::string, std::string>, SMSProxy*> ProxyMap; diff --git a/chromeos/dbus/gsm_sms_client_unittest.cc b/chromeos/dbus/gsm_sms_client_unittest.cc index 5582e9b..e2e2eae 100644 --- a/chromeos/dbus/gsm_sms_client_unittest.cc +++ b/chromeos/dbus/gsm_sms_client_unittest.cc @@ -69,7 +69,7 @@ class GsmSMSClientTest : public testing::Test { response_(NULL), expected_result_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Create a mock bus. dbus::Bus::Options options; options.bus_type = dbus::Bus::SYSTEM; @@ -103,7 +103,7 @@ class GsmSMSClientTest : public testing::Test { client_->Init(mock_bus_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { mock_bus_->ShutdownAndBlock(); } diff --git a/chromeos/dbus/image_burner_client.cc b/chromeos/dbus/image_burner_client.cc index 013affe..881c6f3 100644 --- a/chromeos/dbus/image_burner_client.cc +++ b/chromeos/dbus/image_burner_client.cc @@ -26,7 +26,7 @@ class ImageBurnerClientImpl : public ImageBurnerClient { // ImageBurnerClient override. virtual void BurnImage(const std::string& from_path, const std::string& to_path, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(imageburn::kImageBurnServiceInterface, imageburn::kBurnImage); dbus::MessageWriter writer(&method_call); @@ -41,19 +41,19 @@ class ImageBurnerClientImpl : public ImageBurnerClient { // ImageBurnerClient override. virtual void SetEventHandlers( const BurnFinishedHandler& burn_finished_handler, - const BurnProgressUpdateHandler& burn_progress_update_handler) OVERRIDE { + const BurnProgressUpdateHandler& burn_progress_update_handler) override { burn_finished_handler_ = burn_finished_handler; burn_progress_update_handler_ = burn_progress_update_handler; } // ImageBurnerClient override. - virtual void ResetEventHandlers() OVERRIDE { + virtual void ResetEventHandlers() override { burn_finished_handler_.Reset(); burn_progress_update_handler_.Reset(); } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { proxy_ = bus->GetObjectProxy(imageburn::kImageBurnServiceName, dbus::ObjectPath(imageburn::kImageBurnServicePath)); diff --git a/chromeos/dbus/introspectable_client.cc b/chromeos/dbus/introspectable_client.cc index ddc5484..4b51755 100644 --- a/chromeos/dbus/introspectable_client.cc +++ b/chromeos/dbus/introspectable_client.cc @@ -40,7 +40,7 @@ class IntrospectableClientImpl : public IntrospectableClient { // IntrospectableClient override. virtual void Introspect(const std::string& service_name, const dbus::ObjectPath& object_path, - const IntrospectCallback& callback) OVERRIDE { + const IntrospectCallback& callback) override { dbus::MethodCall method_call(kIntrospectableInterface, kIntrospect); dbus::ObjectProxy* object_proxy = bus_->GetObjectProxy(service_name, @@ -55,7 +55,7 @@ class IntrospectableClientImpl : public IntrospectableClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { bus_ = bus; } + virtual void Init(dbus::Bus* bus) override { bus_ = bus; } private: // Called by dbus:: when a response for Introspect() is recieved. diff --git a/chromeos/dbus/lorgnette_manager_client.cc b/chromeos/dbus/lorgnette_manager_client.cc index eeebc10..227a298 100644 --- a/chromeos/dbus/lorgnette_manager_client.cc +++ b/chromeos/dbus/lorgnette_manager_client.cc @@ -29,7 +29,7 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient { virtual ~LorgnetteManagerClientImpl() {} - virtual void ListScanners(const ListScannersCallback& callback) OVERRIDE { + virtual void ListScanners(const ListScannersCallback& callback) override { dbus::MethodCall method_call(lorgnette::kManagerServiceInterface, lorgnette::kListScannersMethod); lorgnette_daemon_proxy_->CallMethod( @@ -44,7 +44,7 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient { virtual void ScanImage(std::string device_name, base::PlatformFile file, const ScanProperties& properties, - const ScanImageCallback& callback) OVERRIDE { + const ScanImageCallback& callback) override { dbus::FileDescriptor* file_descriptor = new dbus::FileDescriptor(); file_descriptor->PutValue(file); // Punt descriptor validity check to a worker thread; on return we'll @@ -63,7 +63,7 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { lorgnette_daemon_proxy_ = bus->GetObjectProxy(lorgnette::kManagerServiceName, dbus::ObjectPath(lorgnette::kManagerServicePath)); diff --git a/chromeos/dbus/modem_messaging_client.cc b/chromeos/dbus/modem_messaging_client.cc index 9919eb8..b7a790b 100644 --- a/chromeos/dbus/modem_messaging_client.cc +++ b/chromeos/dbus/modem_messaging_client.cc @@ -143,31 +143,31 @@ class CHROMEOS_EXPORT ModemMessagingClientImpl : public ModemMessagingClient { virtual void SetSmsReceivedHandler( const std::string& service_name, const dbus::ObjectPath& object_path, - const SmsReceivedHandler& handler) OVERRIDE { + const SmsReceivedHandler& handler) override { GetProxy(service_name, object_path)->SetSmsReceivedHandler(handler); } virtual void ResetSmsReceivedHandler( const std::string& service_name, - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { GetProxy(service_name, object_path)->ResetSmsReceivedHandler(); } virtual void Delete(const std::string& service_name, const dbus::ObjectPath& object_path, const dbus::ObjectPath& sms_path, - const DeleteCallback& callback) OVERRIDE { + const DeleteCallback& callback) override { GetProxy(service_name, object_path)->Delete(sms_path, callback); } virtual void List(const std::string& service_name, const dbus::ObjectPath& object_path, - const ListCallback& callback) OVERRIDE { + const ListCallback& callback) override { GetProxy(service_name, object_path)->List(callback); } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { bus_ = bus; }; diff --git a/chromeos/dbus/modem_messaging_client_unittest.cc b/chromeos/dbus/modem_messaging_client_unittest.cc index 4c26bd6..e59fb76 100644 --- a/chromeos/dbus/modem_messaging_client_unittest.cc +++ b/chromeos/dbus/modem_messaging_client_unittest.cc @@ -54,7 +54,7 @@ class ModemMessagingClientTest : public testing::Test { ModemMessagingClientTest() : response_(NULL), expected_result_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Create a mock bus. dbus::Bus::Options options; options.bus_type = dbus::Bus::SYSTEM; @@ -89,7 +89,7 @@ class ModemMessagingClientTest : public testing::Test { client_->Init(mock_bus_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { mock_bus_->ShutdownAndBlock(); } diff --git a/chromeos/dbus/nfc_adapter_client.cc b/chromeos/dbus/nfc_adapter_client.cc index 34fca6a..2c94534 100644 --- a/chromeos/dbus/nfc_adapter_client.cc +++ b/chromeos/dbus/nfc_adapter_client.cc @@ -53,25 +53,25 @@ class NfcAdapterClientImpl } // NfcAdapterClient override. - virtual void AddObserver(NfcAdapterClient::Observer* observer) OVERRIDE { + virtual void AddObserver(NfcAdapterClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // NfcAdapterClient override. - virtual void RemoveObserver(NfcAdapterClient::Observer* observer) OVERRIDE { + virtual void RemoveObserver(NfcAdapterClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // NfcAdapterClient override. - virtual std::vector<dbus::ObjectPath> GetAdapters() OVERRIDE { + virtual std::vector<dbus::ObjectPath> GetAdapters() override { return object_map_->GetObjectPaths(); } // NfcAdapterClient override. virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - OVERRIDE { + override { return static_cast<Properties*>( object_map_->GetObjectProperties(object_path)); } @@ -81,7 +81,7 @@ class NfcAdapterClientImpl const dbus::ObjectPath& object_path, const std::string& mode, const base::Closure& callback, - const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE { + const nfc_client_helpers::ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_map_->GetObjectProxy(object_path); if (!object_proxy) { std::string error_message = @@ -107,7 +107,7 @@ class NfcAdapterClientImpl virtual void StopPollLoop( const dbus::ObjectPath& object_path, const base::Closure& callback, - const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE { + const nfc_client_helpers::ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = object_map_->GetObjectProxy(object_path); if (!object_proxy) { std::string error_message = @@ -129,7 +129,7 @@ class NfcAdapterClientImpl protected: // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { VLOG(1) << "Creating NfcAdapterClientImpl"; DCHECK(bus); bus_ = bus; @@ -142,7 +142,7 @@ class NfcAdapterClientImpl private: // NfcManagerClient::Observer override. virtual void ManagerPropertyChanged( - const std::string& property_name) OVERRIDE { + const std::string& property_name) override { // Update the adapter proxies. DCHECK(manager_client_); NfcManagerClient::Properties* manager_properties = @@ -161,7 +161,7 @@ class NfcAdapterClientImpl // nfc_client_helpers::DBusObjectMap::Delegate override. virtual NfcPropertySet* CreateProperties( - dbus::ObjectProxy* object_proxy) OVERRIDE { + dbus::ObjectProxy* object_proxy) override { return new Properties( object_proxy, base::Bind(&NfcAdapterClientImpl::OnPropertyChanged, @@ -170,13 +170,13 @@ class NfcAdapterClientImpl } // nfc_client_helpers::DBusObjectMap::Delegate override. - virtual void ObjectAdded(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void ObjectAdded(const dbus::ObjectPath& object_path) override { FOR_EACH_OBSERVER(NfcAdapterClient::Observer, observers_, AdapterAdded(object_path)); } // nfc_client_helpers::DBusObjectMap::Delegate override. - virtual void ObjectRemoved(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void ObjectRemoved(const dbus::ObjectPath& object_path) override { FOR_EACH_OBSERVER(NfcAdapterClient::Observer, observers_, AdapterRemoved(object_path)); } diff --git a/chromeos/dbus/nfc_client_unittest.cc b/chromeos/dbus/nfc_client_unittest.cc index fcd58be..7870e48 100644 --- a/chromeos/dbus/nfc_client_unittest.cc +++ b/chromeos/dbus/nfc_client_unittest.cc @@ -90,7 +90,7 @@ class NfcClientTest : public testing::Test { NfcClientTest() : response_(NULL) {} virtual ~NfcClientTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Create the mock bus. dbus::Bus::Options options; options.bus_type = dbus::Bus::SYSTEM; @@ -222,7 +222,7 @@ class NfcClientTest : public testing::Test { message_loop_.RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { tag_client_->RemoveObserver(&mock_tag_observer_); device_client_->RemoveObserver(&mock_device_observer_); adapter_client_->RemoveObserver(&mock_adapter_observer_); diff --git a/chromeos/dbus/nfc_device_client.cc b/chromeos/dbus/nfc_device_client.cc index a1976c8..4b5281b 100644 --- a/chromeos/dbus/nfc_device_client.cc +++ b/chromeos/dbus/nfc_device_client.cc @@ -49,20 +49,20 @@ class NfcDeviceClientImpl : public NfcDeviceClient, } // NfcDeviceClient override. - virtual void AddObserver(NfcDeviceClient::Observer* observer) OVERRIDE { + virtual void AddObserver(NfcDeviceClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // NfcDeviceClient override. - virtual void RemoveObserver(NfcDeviceClient::Observer* observer) OVERRIDE { + virtual void RemoveObserver(NfcDeviceClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // NfcDeviceClient override. virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter( - const dbus::ObjectPath& adapter_path) OVERRIDE { + const dbus::ObjectPath& adapter_path) override { DBusObjectMap* object_map = adapters_to_object_maps_.GetObjectMap(adapter_path); if (!object_map) @@ -72,7 +72,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient, // NfcDeviceClient override. virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { return static_cast<Properties*>( adapters_to_object_maps_.FindObjectProperties(object_path)); } @@ -82,7 +82,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient, const dbus::ObjectPath& object_path, const base::DictionaryValue& attributes, const base::Closure& callback, - const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE { + const nfc_client_helpers::ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = adapters_to_object_maps_.FindObjectProxy(object_path); if (!object_proxy) { @@ -120,7 +120,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient, protected: // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { VLOG(1) << "Creating NfcDeviceClientImpl"; DCHECK(bus); bus_ = bus; @@ -130,7 +130,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient, private: // NfcAdapterClient::Observer override. - virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void AdapterAdded(const dbus::ObjectPath& object_path) override { VLOG(1) << "Adapter added. Creating map for device proxies belonging to " << "adapter: " << object_path.value(); adapters_to_object_maps_.CreateObjectMap( @@ -138,7 +138,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient, } // NfcAdapterClient::Observer override. - virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void AdapterRemoved(const dbus::ObjectPath& object_path) override { // Neard doesn't send out property changed signals for the devices that // are removed when the adapter they belong to is removed. Clean up the // object proxies for devices that are managed by the removed adapter. @@ -152,7 +152,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient, // NfcAdapterClient::Observer override. virtual void AdapterPropertyChanged( const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE { + const std::string& property_name) override { DCHECK(adapter_client_); NfcAdapterClient::Properties *adapter_properties = adapter_client_->GetProperties(object_path); @@ -174,7 +174,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient, // nfc_client_helpers::DBusObjectMap::Delegate override. virtual NfcPropertySet* CreateProperties( - dbus::ObjectProxy* object_proxy) OVERRIDE { + dbus::ObjectProxy* object_proxy) override { return new Properties( object_proxy, base::Bind(&NfcDeviceClientImpl::OnPropertyChanged, @@ -183,12 +183,12 @@ class NfcDeviceClientImpl : public NfcDeviceClient, } // nfc_client_helpers::DBusObjectMap::Delegate override. - virtual void ObjectAdded(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void ObjectAdded(const dbus::ObjectPath& object_path) override { FOR_EACH_OBSERVER(NfcDeviceClient::Observer, observers_, DeviceAdded(object_path)); } - virtual void ObjectRemoved(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void ObjectRemoved(const dbus::ObjectPath& object_path) override { FOR_EACH_OBSERVER(NfcDeviceClient::Observer, observers_, DeviceRemoved(object_path)); } diff --git a/chromeos/dbus/nfc_manager_client.cc b/chromeos/dbus/nfc_manager_client.cc index cf8c3d3a..00a99d9 100644 --- a/chromeos/dbus/nfc_manager_client.cc +++ b/chromeos/dbus/nfc_manager_client.cc @@ -37,25 +37,25 @@ class NfcManagerClientImpl : public NfcManagerClient { } // NfcManagerClient override. - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // NfcManagerClient override. - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // NfcManagerClient override. - virtual Properties* GetProperties() OVERRIDE { + virtual Properties* GetProperties() override { return properties_.get(); } protected: // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { VLOG(1) << "Creating NfcManagerClientImpl"; // Create the object proxy. diff --git a/chromeos/dbus/nfc_property_set.h b/chromeos/dbus/nfc_property_set.h index 203f235..f6b50a2 100644 --- a/chromeos/dbus/nfc_property_set.h +++ b/chromeos/dbus/nfc_property_set.h @@ -33,14 +33,14 @@ class NfcPropertySet : public dbus::PropertySet { void SetAllPropertiesReceivedCallback(const base::Closure& callback); // dbus::PropertySet overrides - virtual void ConnectSignals() OVERRIDE; + virtual void ConnectSignals() override; virtual void Get(dbus::PropertyBase* property, - GetCallback callback) OVERRIDE; - virtual void GetAll() OVERRIDE; - virtual void OnGetAll(dbus::Response* response) OVERRIDE; + GetCallback callback) override; + virtual void GetAll() override; + virtual void OnGetAll(dbus::Response* response) override; virtual void Set(dbus::PropertyBase* property, - SetCallback callback) OVERRIDE; - virtual void ChangedReceived(dbus::Signal* signal) OVERRIDE; + SetCallback callback) override; + virtual void ChangedReceived(dbus::Signal* signal) override; protected: const base::Closure& on_get_all_callback() { return on_get_all_callback_; } diff --git a/chromeos/dbus/nfc_record_client.cc b/chromeos/dbus/nfc_record_client.cc index f0bbd9b..334a174 100644 --- a/chromeos/dbus/nfc_record_client.cc +++ b/chromeos/dbus/nfc_record_client.cc @@ -60,19 +60,19 @@ class NfcRecordClientImpl : public NfcRecordClient, } // NfcRecordClient override. - virtual void AddObserver(NfcRecordClient::Observer* observer) OVERRIDE { + virtual void AddObserver(NfcRecordClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // NfcRecordClient override. - virtual void RemoveObserver(NfcRecordClient::Observer* observer) OVERRIDE { + virtual void RemoveObserver(NfcRecordClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } virtual std::vector<dbus::ObjectPath> GetRecordsForDevice( - const dbus::ObjectPath& device_path) OVERRIDE { + const dbus::ObjectPath& device_path) override { DBusObjectMap* object_map = devices_and_tags_to_object_maps_.GetObjectMap(device_path); if (!object_map) @@ -81,20 +81,20 @@ class NfcRecordClientImpl : public NfcRecordClient, } virtual std::vector<dbus::ObjectPath> GetRecordsForTag( - const dbus::ObjectPath& tag_path) OVERRIDE { + const dbus::ObjectPath& tag_path) override { return GetRecordsForDevice(tag_path); } // NfcRecordClient override. virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { return static_cast<Properties*>( devices_and_tags_to_object_maps_.FindObjectProperties(object_path)); } protected: // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { VLOG(1) << "Creating NfcRecordClient impl"; DCHECK(bus); bus_ = bus; @@ -106,7 +106,7 @@ class NfcRecordClientImpl : public NfcRecordClient, private: // NfcDeviceClient::Observer override. - virtual void DeviceAdded(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void DeviceAdded(const dbus::ObjectPath& object_path) override { VLOG(1) << "Device added. Creating map for record proxies belonging to " << "device: " << object_path.value(); devices_and_tags_to_object_maps_.CreateObjectMap( @@ -114,7 +114,7 @@ class NfcRecordClientImpl : public NfcRecordClient, } // NfcDeviceClient::Observer override. - virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override { // Neard doesn't send out property changed signals for the records that // are removed when the device they belong to is removed. Clean up the // object proxies for records that belong to the removed device. @@ -128,7 +128,7 @@ class NfcRecordClientImpl : public NfcRecordClient, // NfcDeviceClient::Observer override. virtual void DevicePropertyChanged( const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE { + const std::string& property_name) override { // Update the record proxies using records from the device. DCHECK(device_client_); NfcDeviceClient::Properties* device_properties = @@ -149,7 +149,7 @@ class NfcRecordClientImpl : public NfcRecordClient, } // NfcTagClient::Observer override. - virtual void TagAdded(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void TagAdded(const dbus::ObjectPath& object_path) override { VLOG(1) << "Tag added. Creating map for record proxies belonging to " << "tag: " << object_path.value(); devices_and_tags_to_object_maps_.CreateObjectMap( @@ -157,7 +157,7 @@ class NfcRecordClientImpl : public NfcRecordClient, } // NfcTagClient::Observer override. - virtual void TagRemoved(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void TagRemoved(const dbus::ObjectPath& object_path) override { // Neard doesn't send out property changed signals for the records that // are removed when the tag they belong to is removed. Clean up the // object proxies for records that belong to the removed tag. @@ -170,7 +170,7 @@ class NfcRecordClientImpl : public NfcRecordClient, // NfcTagClient::Observer override. virtual void TagPropertyChanged(const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE { + const std::string& property_name) override { // Update the record proxies using records from the tag. DCHECK(device_client_); NfcTagClient::Properties* tag_properties = @@ -199,7 +199,7 @@ class NfcRecordClientImpl : public NfcRecordClient, // nfc_client_helpers::DBusObjectMap::Delegate override. virtual NfcPropertySet* CreateProperties( - dbus::ObjectProxy* object_proxy) OVERRIDE { + dbus::ObjectProxy* object_proxy) override { Properties* properties = new Properties( object_proxy, base::Bind(&NfcRecordClientImpl::OnPropertyChanged, @@ -213,13 +213,13 @@ class NfcRecordClientImpl : public NfcRecordClient, } // nfc_client_helpers::DBusObjectMap::Delegate override. - virtual void ObjectAdded(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void ObjectAdded(const dbus::ObjectPath& object_path) override { FOR_EACH_OBSERVER(NfcRecordClient::Observer, observers_, RecordAdded(object_path)); } // nfc_client_helpers::DBusObjectMap::Delegate override. - virtual void ObjectRemoved(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void ObjectRemoved(const dbus::ObjectPath& object_path) override { FOR_EACH_OBSERVER(NfcRecordClient::Observer, observers_, RecordRemoved(object_path)); } diff --git a/chromeos/dbus/nfc_tag_client.cc b/chromeos/dbus/nfc_tag_client.cc index eae3ef9..cbcb4d1 100644 --- a/chromeos/dbus/nfc_tag_client.cc +++ b/chromeos/dbus/nfc_tag_client.cc @@ -52,20 +52,20 @@ class NfcTagClientImpl : public NfcTagClient, } // NfcTagClient override. - virtual void AddObserver(NfcTagClient::Observer* observer) OVERRIDE { + virtual void AddObserver(NfcTagClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // NfcTagClient override. - virtual void RemoveObserver(NfcTagClient::Observer* observer) OVERRIDE { + virtual void RemoveObserver(NfcTagClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // NfcTagClient override. virtual std::vector<dbus::ObjectPath> GetTagsForAdapter( - const dbus::ObjectPath& adapter_path) OVERRIDE { + const dbus::ObjectPath& adapter_path) override { DBusObjectMap* object_map = adapters_to_object_maps_.GetObjectMap(adapter_path); if (!object_map) @@ -75,7 +75,7 @@ class NfcTagClientImpl : public NfcTagClient, // NfcTagClient override. virtual Properties* GetProperties( - const dbus::ObjectPath& object_path) OVERRIDE { + const dbus::ObjectPath& object_path) override { return static_cast<Properties*>( adapters_to_object_maps_.FindObjectProperties(object_path)); } @@ -85,7 +85,7 @@ class NfcTagClientImpl : public NfcTagClient, const dbus::ObjectPath& object_path, const base::DictionaryValue& attributes, const base::Closure& callback, - const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE { + const nfc_client_helpers::ErrorCallback& error_callback) override { dbus::ObjectProxy* object_proxy = adapters_to_object_maps_.FindObjectProxy(object_path); if (!object_proxy) { @@ -121,7 +121,7 @@ class NfcTagClientImpl : public NfcTagClient, protected: // DBusClient override. - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { VLOG(1) << "Creating NfcTagClientImpl"; DCHECK(bus); bus_ = bus; @@ -131,7 +131,7 @@ class NfcTagClientImpl : public NfcTagClient, private: // NfcAdapterClient::Observer override. - virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void AdapterAdded(const dbus::ObjectPath& object_path) override { VLOG(1) << "Adapter added. Creating map for tag proxies belonging to " << "adapter: " << object_path.value(); adapters_to_object_maps_.CreateObjectMap( @@ -139,7 +139,7 @@ class NfcTagClientImpl : public NfcTagClient, } // NfcAdapterClient::Observer override. - virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void AdapterRemoved(const dbus::ObjectPath& object_path) override { // Neard doesn't send out property changed signals for the tags that // are removed when the adapter they belong to is removed. Clean up the // object proxies for devices that are managed by the removed adapter. @@ -153,7 +153,7 @@ class NfcTagClientImpl : public NfcTagClient, // NfcAdapterClient::Observer override. virtual void AdapterPropertyChanged( const dbus::ObjectPath& object_path, - const std::string& property_name) OVERRIDE { + const std::string& property_name) override { // Update the tag proxies. DCHECK(adapter_client_); NfcAdapterClient::Properties *adapter_properties = @@ -181,7 +181,7 @@ class NfcTagClientImpl : public NfcTagClient, // nfc_client_helpers::DBusObjectMap::Delegate override. virtual NfcPropertySet* CreateProperties( - dbus::ObjectProxy* object_proxy) OVERRIDE { + dbus::ObjectProxy* object_proxy) override { Properties* properties = new Properties( object_proxy, base::Bind(&NfcTagClientImpl::OnPropertyChanged, @@ -195,12 +195,12 @@ class NfcTagClientImpl : public NfcTagClient, } // nfc_client_helpers::DBusObjectMap::Delegate override. - virtual void ObjectAdded(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void ObjectAdded(const dbus::ObjectPath& object_path) override { FOR_EACH_OBSERVER(NfcTagClient::Observer, observers_, TagAdded(object_path)); } - virtual void ObjectRemoved(const dbus::ObjectPath& object_path) OVERRIDE { + virtual void ObjectRemoved(const dbus::ObjectPath& object_path) override { FOR_EACH_OBSERVER(NfcTagClient::Observer, observers_, TagRemoved(object_path)); } diff --git a/chromeos/dbus/permission_broker_client.cc b/chromeos/dbus/permission_broker_client.cc index d576585..7f4804e 100644 --- a/chromeos/dbus/permission_broker_client.cc +++ b/chromeos/dbus/permission_broker_client.cc @@ -26,7 +26,7 @@ class PermissionBrokerClientImpl : public PermissionBrokerClient { virtual void RequestPathAccess(const std::string& path, const int interface_id, - const ResultCallback& callback) OVERRIDE { + const ResultCallback& callback) override { dbus::MethodCall method_call(kPermissionBrokerInterface, kRequestPathAccess); dbus::MessageWriter writer(&method_call); @@ -41,7 +41,7 @@ class PermissionBrokerClientImpl : public PermissionBrokerClient { virtual void RequestUsbAccess(const uint16_t vendor_id, const uint16_t product_id, const int interface_id, - const ResultCallback& callback) OVERRIDE { + const ResultCallback& callback) override { dbus::MethodCall method_call(kPermissionBrokerInterface, kRequestUsbAccess); dbus::MessageWriter writer(&method_call); writer.AppendUint16(vendor_id); @@ -54,7 +54,7 @@ class PermissionBrokerClientImpl : public PermissionBrokerClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { proxy_ = bus->GetObjectProxy(kPermissionBrokerServiceName, dbus::ObjectPath(kPermissionBrokerServicePath)); diff --git a/chromeos/dbus/pipe_reader.h b/chromeos/dbus/pipe_reader.h index 41dcb5e..851eda6 100644 --- a/chromeos/dbus/pipe_reader.h +++ b/chromeos/dbus/pipe_reader.h @@ -74,7 +74,7 @@ class PipeReaderForString : public PipeReader { PipeReaderForString(const scoped_refptr<base::TaskRunner>& task_runner, const IOCompleteCallback& callback); - virtual void AcceptData(const char *data, int length) OVERRIDE; + virtual void AcceptData(const char *data, int length) override; // Destructively returns collected data, by swapping |data_| with |data|. void GetData(std::string* data); diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc index c094d9d..38d6f12 100644 --- a/chromeos/dbus/power_manager_client.cc +++ b/chromeos/dbus/power_manager_client.cc @@ -68,20 +68,20 @@ class PowerManagerClientImpl : public PowerManagerClient { // PowerManagerClient overrides: - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { CHECK(observer); // http://crbug.com/119976 observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } - virtual void DecreaseScreenBrightness(bool allow_off) OVERRIDE { + virtual void DecreaseScreenBrightness(bool allow_off) override { dbus::MethodCall method_call( power_manager::kPowerManagerInterface, power_manager::kDecreaseScreenBrightnessMethod); @@ -93,23 +93,23 @@ class PowerManagerClientImpl : public PowerManagerClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void IncreaseScreenBrightness() OVERRIDE { + virtual void IncreaseScreenBrightness() override { SimpleMethodCallToPowerManager( power_manager::kIncreaseScreenBrightnessMethod); } - virtual void DecreaseKeyboardBrightness() OVERRIDE { + virtual void DecreaseKeyboardBrightness() override { SimpleMethodCallToPowerManager( power_manager::kDecreaseKeyboardBrightnessMethod); } - virtual void IncreaseKeyboardBrightness() OVERRIDE { + virtual void IncreaseKeyboardBrightness() override { SimpleMethodCallToPowerManager( power_manager::kIncreaseKeyboardBrightnessMethod); } virtual void SetScreenBrightnessPercent(double percent, - bool gradual) OVERRIDE { + bool gradual) override { dbus::MethodCall method_call( power_manager::kPowerManagerInterface, power_manager::kSetScreenBrightnessPercentMethod); @@ -126,7 +126,7 @@ class PowerManagerClientImpl : public PowerManagerClient { } virtual void GetScreenBrightnessPercent( - const GetScreenBrightnessPercentCallback& callback) OVERRIDE { + const GetScreenBrightnessPercentCallback& callback) override { dbus::MethodCall method_call( power_manager::kPowerManagerInterface, power_manager::kGetScreenBrightnessPercentMethod); @@ -137,7 +137,7 @@ class PowerManagerClientImpl : public PowerManagerClient { weak_ptr_factory_.GetWeakPtr(), callback)); } - virtual void RequestStatusUpdate() OVERRIDE { + virtual void RequestStatusUpdate() override { dbus::MethodCall method_call( power_manager::kPowerManagerInterface, power_manager::kGetPowerSupplyPropertiesMethod); @@ -148,20 +148,20 @@ class PowerManagerClientImpl : public PowerManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void RequestSuspend() OVERRIDE { + virtual void RequestSuspend() override { SimpleMethodCallToPowerManager(power_manager::kRequestSuspendMethod); } - virtual void RequestRestart() OVERRIDE { + virtual void RequestRestart() override { SimpleMethodCallToPowerManager(power_manager::kRequestRestartMethod); } - virtual void RequestShutdown() OVERRIDE { + virtual void RequestShutdown() override { SimpleMethodCallToPowerManager(power_manager::kRequestShutdownMethod); } virtual void NotifyUserActivity( - power_manager::UserActivityType type) OVERRIDE { + power_manager::UserActivityType type) override { dbus::MethodCall method_call( power_manager::kPowerManagerInterface, power_manager::kHandleUserActivityMethod); @@ -174,7 +174,7 @@ class PowerManagerClientImpl : public PowerManagerClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void NotifyVideoActivity(bool is_fullscreen) OVERRIDE { + virtual void NotifyVideoActivity(bool is_fullscreen) override { dbus::MethodCall method_call( power_manager::kPowerManagerInterface, power_manager::kHandleVideoActivityMethod); @@ -188,7 +188,7 @@ class PowerManagerClientImpl : public PowerManagerClient { } virtual void SetPolicy( - const power_manager::PowerManagementPolicy& policy) OVERRIDE { + const power_manager::PowerManagementPolicy& policy) override { dbus::MethodCall method_call( power_manager::kPowerManagerInterface, power_manager::kSetPolicyMethod); @@ -203,7 +203,7 @@ class PowerManagerClientImpl : public PowerManagerClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual void SetIsProjecting(bool is_projecting) OVERRIDE { + virtual void SetIsProjecting(bool is_projecting) override { dbus::MethodCall method_call( power_manager::kPowerManagerInterface, power_manager::kSetIsProjectingMethod); @@ -216,7 +216,7 @@ class PowerManagerClientImpl : public PowerManagerClient { last_is_projecting_ = is_projecting; } - virtual base::Closure GetSuspendReadinessCallback() OVERRIDE { + virtual base::Closure GetSuspendReadinessCallback() override { DCHECK(OnOriginThread()); DCHECK(suspend_is_pending_); num_pending_suspend_readiness_callbacks_++; @@ -225,12 +225,12 @@ class PowerManagerClientImpl : public PowerManagerClient { suspending_from_dark_resume_); } - virtual int GetNumPendingSuspendReadinessCallbacks() OVERRIDE { + virtual int GetNumPendingSuspendReadinessCallbacks() override { return num_pending_suspend_readiness_callbacks_; } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { power_manager_proxy_ = bus->GetObjectProxy( power_manager::kPowerManagerServiceName, dbus::ObjectPath(power_manager::kPowerManagerServicePath)); @@ -751,7 +751,7 @@ class PowerManagerClientStubImpl : public PowerManagerClient { } // PowerManagerClient overrides: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { ParseCommandLineSwitch(); if (power_cycle_delay_ != base::TimeDelta()) { update_timer_.Start(FROM_HERE, @@ -761,70 +761,70 @@ class PowerManagerClientStubImpl : public PowerManagerClient { } } - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } - virtual void DecreaseScreenBrightness(bool allow_off) OVERRIDE { + virtual void DecreaseScreenBrightness(bool allow_off) override { VLOG(1) << "Requested to descrease screen brightness"; SetBrightness(brightness_ - 5.0, true); } - virtual void IncreaseScreenBrightness() OVERRIDE { + virtual void IncreaseScreenBrightness() override { VLOG(1) << "Requested to increase screen brightness"; SetBrightness(brightness_ + 5.0, true); } virtual void SetScreenBrightnessPercent(double percent, - bool gradual) OVERRIDE { + bool gradual) override { VLOG(1) << "Requested to set screen brightness to " << percent << "% " << (gradual ? "gradually" : "instantaneously"); SetBrightness(percent, false); } virtual void GetScreenBrightnessPercent( - const GetScreenBrightnessPercentCallback& callback) OVERRIDE { + const GetScreenBrightnessPercentCallback& callback) override { callback.Run(brightness_); } - virtual void DecreaseKeyboardBrightness() OVERRIDE { + virtual void DecreaseKeyboardBrightness() override { VLOG(1) << "Requested to descrease keyboard brightness"; } - virtual void IncreaseKeyboardBrightness() OVERRIDE { + virtual void IncreaseKeyboardBrightness() override { VLOG(1) << "Requested to increase keyboard brightness"; } - virtual void RequestStatusUpdate() OVERRIDE { + virtual void RequestStatusUpdate() override { base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&PowerManagerClientStubImpl::UpdateStatus, weak_ptr_factory_.GetWeakPtr())); } - virtual void RequestSuspend() OVERRIDE {} - virtual void RequestRestart() OVERRIDE {} - virtual void RequestShutdown() OVERRIDE {} + virtual void RequestSuspend() override {} + virtual void RequestRestart() override {} + virtual void RequestShutdown() override {} virtual void NotifyUserActivity( - power_manager::UserActivityType type) OVERRIDE {} - virtual void NotifyVideoActivity(bool is_fullscreen) OVERRIDE {} + power_manager::UserActivityType type) override {} + virtual void NotifyVideoActivity(bool is_fullscreen) override {} virtual void SetPolicy( - const power_manager::PowerManagementPolicy& policy) OVERRIDE {} - virtual void SetIsProjecting(bool is_projecting) OVERRIDE {} - virtual base::Closure GetSuspendReadinessCallback() OVERRIDE { + const power_manager::PowerManagementPolicy& policy) override {} + virtual void SetIsProjecting(bool is_projecting) override {} + virtual base::Closure GetSuspendReadinessCallback() override { num_pending_suspend_readiness_callbacks_++; return base::Bind(&PowerManagerClientStubImpl::HandleSuspendReadiness, weak_ptr_factory_.GetWeakPtr()); } - virtual int GetNumPendingSuspendReadinessCallbacks() OVERRIDE { + virtual int GetNumPendingSuspendReadinessCallbacks() override { return num_pending_suspend_readiness_callbacks_; } diff --git a/chromeos/dbus/power_policy_controller.h b/chromeos/dbus/power_policy_controller.h index 4939a00..5ec8a5a 100644 --- a/chromeos/dbus/power_policy_controller.h +++ b/chromeos/dbus/power_policy_controller.h @@ -90,7 +90,7 @@ class CHROMEOS_EXPORT PowerPolicyController void RemoveWakeLock(int id); // PowerManagerClient::Observer implementation: - virtual void PowerManagerRestarted() OVERRIDE; + virtual void PowerManagerRestarted() override; private: friend class PowerPrefsTest; diff --git a/chromeos/dbus/power_policy_controller_unittest.cc b/chromeos/dbus/power_policy_controller_unittest.cc index 755cc53..c9a8901 100644 --- a/chromeos/dbus/power_policy_controller_unittest.cc +++ b/chromeos/dbus/power_policy_controller_unittest.cc @@ -21,7 +21,7 @@ class PowerPolicyControllerTest : public testing::Test { PowerPolicyControllerTest() {} virtual ~PowerPolicyControllerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { scoped_ptr<DBusThreadManagerSetter> dbus_setter = chromeos::DBusThreadManager::GetSetterForTesting(); fake_power_client_ = new FakePowerManagerClient; @@ -32,7 +32,7 @@ class PowerPolicyControllerTest : public testing::Test { policy_controller_->Init(DBusThreadManager::Get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { policy_controller_.reset(); DBusThreadManager::Shutdown(); } diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc index aea5431..c74de10 100644 --- a/chromeos/dbus/session_manager_client.cc +++ b/chromeos/dbus/session_manager_client.cc @@ -72,29 +72,29 @@ class SessionManagerClientImpl : public SessionManagerClient { } // SessionManagerClient overrides: - virtual void SetStubDelegate(StubDelegate* delegate) OVERRIDE { + virtual void SetStubDelegate(StubDelegate* delegate) override { // Do nothing; this isn't a stub implementation. } - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } - virtual void EmitLoginPromptVisible() OVERRIDE { + virtual void EmitLoginPromptVisible() override { SimpleMethodCallToSessionManager( login_manager::kSessionManagerEmitLoginPromptVisible); FOR_EACH_OBSERVER(Observer, observers_, EmitLoginPromptVisibleCalled()); } - virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE { + virtual void RestartJob(int pid, const std::string& command_line) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerRestartJob); dbus::MessageWriter writer(&method_call); @@ -107,7 +107,7 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void StartSession(const std::string& user_email) OVERRIDE { + virtual void StartSession(const std::string& user_email) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerStartSession); dbus::MessageWriter writer(&method_call); @@ -120,7 +120,7 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void StopSession() OVERRIDE { + virtual void StopSession() override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerStopSession); dbus::MessageWriter writer(&method_call); @@ -132,7 +132,7 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void StartDeviceWipe() OVERRIDE { + virtual void StartDeviceWipe() override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerStartDeviceWipe); session_manager_proxy_->CallMethod( @@ -142,22 +142,22 @@ class SessionManagerClientImpl : public SessionManagerClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void RequestLockScreen() OVERRIDE { + virtual void RequestLockScreen() override { SimpleMethodCallToSessionManager(login_manager::kSessionManagerLockScreen); } - virtual void NotifyLockScreenShown() OVERRIDE { + virtual void NotifyLockScreenShown() override { SimpleMethodCallToSessionManager( login_manager::kSessionManagerHandleLockScreenShown); } - virtual void NotifyLockScreenDismissed() OVERRIDE { + virtual void NotifyLockScreenDismissed() override { SimpleMethodCallToSessionManager( login_manager::kSessionManagerHandleLockScreenDismissed); } virtual void RetrieveActiveSessions( - const ActiveSessionsCallback& callback) OVERRIDE { + const ActiveSessionsCallback& callback) override { dbus::MethodCall method_call( login_manager::kSessionManagerInterface, login_manager::kSessionManagerRetrieveActiveSessions); @@ -172,7 +172,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual void RetrieveDevicePolicy( - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerRetrievePolicy); session_manager_proxy_->CallMethod( @@ -186,7 +186,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void RetrievePolicyForUser( const std::string& username, - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { CallRetrievePolicyByUsername( login_manager::kSessionManagerRetrievePolicyForUser, username, @@ -194,7 +194,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual std::string BlockingRetrievePolicyForUser( - const std::string& username) OVERRIDE { + const std::string& username) override { dbus::MethodCall method_call( login_manager::kSessionManagerInterface, login_manager::kSessionManagerRetrievePolicyForUser); @@ -211,7 +211,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void RetrieveDeviceLocalAccountPolicy( const std::string& account_name, - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { CallRetrievePolicyByUsername( login_manager::kSessionManagerRetrieveDeviceLocalAccountPolicy, account_name, @@ -219,7 +219,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual void StoreDevicePolicy(const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerStorePolicy); dbus::MessageWriter writer(&method_call); @@ -238,7 +238,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void StorePolicyForUser( const std::string& username, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { CallStorePolicyByUsername(login_manager::kSessionManagerStorePolicyForUser, username, policy_blob, @@ -248,7 +248,7 @@ class SessionManagerClientImpl : public SessionManagerClient { virtual void StoreDeviceLocalAccountPolicy( const std::string& account_name, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { CallStorePolicyByUsername( login_manager::kSessionManagerStoreDeviceLocalAccountPolicy, account_name, @@ -257,7 +257,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual void SetFlagsForUser(const std::string& username, - const std::vector<std::string>& flags) OVERRIDE { + const std::vector<std::string>& flags) override { dbus::MethodCall method_call(login_manager::kSessionManagerInterface, login_manager::kSessionManagerSetFlagsForUser); dbus::MessageWriter writer(&method_call); @@ -270,7 +270,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } virtual void GetServerBackedStateKeys(const StateKeysCallback& callback) - OVERRIDE { + override { dbus::MethodCall method_call( login_manager::kSessionManagerInterface, login_manager::kSessionManagerGetServerBackedStateKeys); @@ -284,7 +284,7 @@ class SessionManagerClientImpl : public SessionManagerClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { session_manager_proxy_ = bus->GetObjectProxy( login_manager::kSessionManagerServiceName, dbus::ObjectPath(login_manager::kSessionManagerServicePath)); @@ -578,38 +578,38 @@ class SessionManagerClientStubImpl : public SessionManagerClient { virtual ~SessionManagerClientStubImpl() {} // SessionManagerClient overrides - virtual void Init(dbus::Bus* bus) OVERRIDE {} - virtual void SetStubDelegate(StubDelegate* delegate) OVERRIDE { + virtual void Init(dbus::Bus* bus) override {} + virtual void SetStubDelegate(StubDelegate* delegate) override { delegate_ = delegate; } - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } - virtual void EmitLoginPromptVisible() OVERRIDE {} - virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE {} - virtual void StartSession(const std::string& user_email) OVERRIDE {} - virtual void StopSession() OVERRIDE {} - virtual void StartDeviceWipe() OVERRIDE {} - virtual void RequestLockScreen() OVERRIDE { + virtual void EmitLoginPromptVisible() override {} + virtual void RestartJob(int pid, const std::string& command_line) override {} + virtual void StartSession(const std::string& user_email) override {} + virtual void StopSession() override {} + virtual void StartDeviceWipe() override {} + virtual void RequestLockScreen() override { if (delegate_) delegate_->LockScreenForStub(); } - virtual void NotifyLockScreenShown() OVERRIDE { + virtual void NotifyLockScreenShown() override { FOR_EACH_OBSERVER(Observer, observers_, ScreenIsLocked()); } - virtual void NotifyLockScreenDismissed() OVERRIDE { + virtual void NotifyLockScreenDismissed() override { FOR_EACH_OBSERVER(Observer, observers_, ScreenIsUnlocked()); } virtual void RetrieveActiveSessions( - const ActiveSessionsCallback& callback) OVERRIDE {} + const ActiveSessionsCallback& callback) override {} virtual void RetrieveDevicePolicy( - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { base::FilePath owner_key_path; if (!PathService::Get(chromeos::FILE_OWNER_KEY, &owner_key_path)) { callback.Run(""); @@ -625,7 +625,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient { } virtual void RetrievePolicyForUser( const std::string& username, - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { base::PostTaskAndReplyWithResult( base::WorkerPool::GetTaskRunner(false).get(), FROM_HERE, @@ -633,16 +633,16 @@ class SessionManagerClientStubImpl : public SessionManagerClient { callback); } virtual std::string BlockingRetrievePolicyForUser( - const std::string& username) OVERRIDE { + const std::string& username) override { return GetFileContent(GetUserFilePath(username, "stub_policy")); } virtual void RetrieveDeviceLocalAccountPolicy( const std::string& account_name, - const RetrievePolicyCallback& callback) OVERRIDE { + const RetrievePolicyCallback& callback) override { RetrievePolicyForUser(account_name, callback); } virtual void StoreDevicePolicy(const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { enterprise_management::PolicyFetchResponse response; base::FilePath owner_key_path; if (!response.ParseFromString(policy_blob) || @@ -674,7 +674,7 @@ class SessionManagerClientStubImpl : public SessionManagerClient { virtual void StorePolicyForUser( const std::string& username, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { // The session manager writes the user policy key to a well-known // location. Do the same with the stub impl, so that user policy works and // can be tested on desktop builds. @@ -704,15 +704,15 @@ class SessionManagerClientStubImpl : public SessionManagerClient { virtual void StoreDeviceLocalAccountPolicy( const std::string& account_name, const std::string& policy_blob, - const StorePolicyCallback& callback) OVERRIDE { + const StorePolicyCallback& callback) override { StorePolicyForUser(account_name, policy_blob, callback); } virtual void SetFlagsForUser(const std::string& username, - const std::vector<std::string>& flags) OVERRIDE { + const std::vector<std::string>& flags) override { } virtual void GetServerBackedStateKeys(const StateKeysCallback& callback) - OVERRIDE { + override { std::vector<std::string> state_keys; for (int i = 0; i < 5; ++i) state_keys.push_back(crypto::SHA256HashString(base::IntToString(i))); diff --git a/chromeos/dbus/shill_client_unittest_base.h b/chromeos/dbus/shill_client_unittest_base.h index b362e38..8eac510 100644 --- a/chromeos/dbus/shill_client_unittest_base.h +++ b/chromeos/dbus/shill_client_unittest_base.h @@ -45,9 +45,9 @@ class ValueMatcher : public MatcherInterface<const base::Value&> { // MatcherInterface overrides. virtual bool MatchAndExplain(const base::Value& value, - MatchResultListener* listener) const OVERRIDE; - virtual void DescribeTo(::std::ostream* os) const OVERRIDE; - virtual void DescribeNegationTo(::std::ostream* os) const OVERRIDE; + MatchResultListener* listener) const override; + virtual void DescribeTo(::std::ostream* os) const override; + virtual void DescribeNegationTo(::std::ostream* os) const override; private: scoped_ptr<base::Value> expected_value_; @@ -101,8 +101,8 @@ class ShillClientUnittestBase : public testing::Test { const dbus::ObjectPath& object_path); virtual ~ShillClientUnittestBase(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: // A callback to intercept and check the method call arguments. diff --git a/chromeos/dbus/shill_device_client.cc b/chromeos/dbus/shill_device_client.cc index 40946ef..1a523ff 100644 --- a/chromeos/dbus/shill_device_client.cc +++ b/chromeos/dbus/shill_device_client.cc @@ -44,25 +44,25 @@ class ShillDeviceClientImpl : public ShillDeviceClient { // ShillDeviceClient overrides. virtual void AddPropertyChangedObserver( const dbus::ObjectPath& device_path, - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { GetHelper(device_path)->AddPropertyChangedObserver(observer); } virtual void RemovePropertyChangedObserver( const dbus::ObjectPath& device_path, - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { GetHelper(device_path)->RemovePropertyChangedObserver(observer); } virtual void GetProperties(const dbus::ObjectPath& device_path, - const DictionaryValueCallback& callback) OVERRIDE { + const DictionaryValueCallback& callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kGetPropertiesFunction); GetHelper(device_path)->CallDictionaryValueMethod(&method_call, callback); } virtual void ProposeScan(const dbus::ObjectPath& device_path, - const VoidDBusMethodCallback& callback) OVERRIDE { + const VoidDBusMethodCallback& callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kProposeScanFunction); GetHelper(device_path)->CallVoidMethod(&method_call, callback); @@ -72,7 +72,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { const std::string& name, const base::Value& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kSetPropertyFunction); dbus::MessageWriter writer(&method_call); @@ -85,7 +85,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { virtual void ClearProperty(const dbus::ObjectPath& device_path, const std::string& name, - const VoidDBusMethodCallback& callback) OVERRIDE { + const VoidDBusMethodCallback& callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kClearPropertyFunction); dbus::MessageWriter writer(&method_call); @@ -96,7 +96,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { virtual void AddIPConfig( const dbus::ObjectPath& device_path, const std::string& method, - const ObjectPathDBusMethodCallback& callback) OVERRIDE { + const ObjectPathDBusMethodCallback& callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kAddIPConfigFunction); dbus::MessageWriter writer(&method_call); @@ -108,7 +108,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { const std::string& pin, bool require, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kRequirePinFunction); dbus::MessageWriter writer(&method_call); @@ -121,7 +121,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { virtual void EnterPin(const dbus::ObjectPath& device_path, const std::string& pin, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kEnterPinFunction); dbus::MessageWriter writer(&method_call); @@ -134,7 +134,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { const std::string& puk, const std::string& pin, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kUnblockPinFunction); dbus::MessageWriter writer(&method_call); @@ -148,7 +148,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { const std::string& old_pin, const std::string& new_pin, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kChangePinFunction); dbus::MessageWriter writer(&method_call); @@ -161,7 +161,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { virtual void Register(const dbus::ObjectPath& device_path, const std::string& network_id, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kRegisterFunction); dbus::MessageWriter writer(&method_call); @@ -173,7 +173,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { virtual void SetCarrier(const dbus::ObjectPath& device_path, const std::string& carrier, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kSetCarrierFunction); dbus::MessageWriter writer(&method_call); @@ -184,7 +184,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { virtual void Reset(const dbus::ObjectPath& device_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kResetFunction); GetHelper(device_path)->CallVoidMethodWithErrorCallback( @@ -196,7 +196,7 @@ class ShillDeviceClientImpl : public ShillDeviceClient { const std::string& operation, const std::string& peer, const StringCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamDeviceInterface, shill::kPerformTDLSOperationFunction); dbus::MessageWriter writer(&method_call); @@ -206,12 +206,12 @@ class ShillDeviceClientImpl : public ShillDeviceClient { &method_call, callback, error_callback); } - virtual TestInterface* GetTestInterface() OVERRIDE { + virtual TestInterface* GetTestInterface() override { return NULL; } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { bus_ = bus; } diff --git a/chromeos/dbus/shill_ipconfig_client.cc b/chromeos/dbus/shill_ipconfig_client.cc index 48861ed..cd4467f 100644 --- a/chromeos/dbus/shill_ipconfig_client.cc +++ b/chromeos/dbus/shill_ipconfig_client.cc @@ -29,32 +29,32 @@ class ShillIPConfigClientImpl : public ShillIPConfigClient { // ShillIPConfigClient overrides. virtual void AddPropertyChangedObserver( const dbus::ObjectPath& ipconfig_path, - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { GetHelper(ipconfig_path)->AddPropertyChangedObserver(observer); } virtual void RemovePropertyChangedObserver( const dbus::ObjectPath& ipconfig_path, - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { GetHelper(ipconfig_path)->RemovePropertyChangedObserver(observer); } virtual void Refresh(const dbus::ObjectPath& ipconfig_path, - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void GetProperties(const dbus::ObjectPath& ipconfig_path, - const DictionaryValueCallback& callback) OVERRIDE; + const DictionaryValueCallback& callback) override; virtual void SetProperty(const dbus::ObjectPath& ipconfig_path, const std::string& name, const base::Value& value, - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void ClearProperty(const dbus::ObjectPath& ipconfig_path, const std::string& name, - const VoidDBusMethodCallback& callback) OVERRIDE; + const VoidDBusMethodCallback& callback) override; virtual void Remove(const dbus::ObjectPath& ipconfig_path, - const VoidDBusMethodCallback& callback) OVERRIDE; - virtual ShillIPConfigClient::TestInterface* GetTestInterface() OVERRIDE; + const VoidDBusMethodCallback& callback) override; + virtual ShillIPConfigClient::TestInterface* GetTestInterface() override; protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { bus_ = bus; } diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc index a5c6721..52b2ef1 100644 --- a/chromeos/dbus/shill_manager_client.cc +++ b/chromeos/dbus/shill_manager_client.cc @@ -29,23 +29,23 @@ class ShillManagerClientImpl : public ShillManagerClient { //////////////////////////////////// // ShillManagerClient overrides. virtual void AddPropertyChangedObserver( - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { helper_->AddPropertyChangedObserver(observer); } virtual void RemovePropertyChangedObserver( - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { helper_->RemovePropertyChangedObserver(observer); } - virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE { + virtual void GetProperties(const DictionaryValueCallback& callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kGetPropertiesFunction); helper_->CallDictionaryValueMethod(&method_call, callback); } virtual void GetNetworksForGeolocation( - const DictionaryValueCallback& callback) OVERRIDE { + const DictionaryValueCallback& callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kGetNetworksForGeolocation); helper_->CallDictionaryValueMethod(&method_call, callback); @@ -54,7 +54,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void SetProperty(const std::string& name, const base::Value& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kSetPropertyFunction); dbus::MessageWriter writer(&method_call); @@ -67,7 +67,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void RequestScan(const std::string& type, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kRequestScanFunction); dbus::MessageWriter writer(&method_call); @@ -80,7 +80,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void EnableTechnology( const std::string& type, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kEnableTechnologyFunction); dbus::MessageWriter writer(&method_call); @@ -93,7 +93,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void DisableTechnology( const std::string& type, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kDisableTechnologyFunction); dbus::MessageWriter writer(&method_call); @@ -106,7 +106,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void ConfigureService( const base::DictionaryValue& properties, const ObjectPathCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kConfigureServiceFunction); dbus::MessageWriter writer(&method_call); @@ -120,7 +120,7 @@ class ShillManagerClientImpl : public ShillManagerClient { const dbus::ObjectPath& profile_path, const base::DictionaryValue& properties, const ObjectPathCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kConfigureServiceForProfileFunction); dbus::MessageWriter writer(&method_call); @@ -134,7 +134,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void GetService( const base::DictionaryValue& properties, const ObjectPathCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kGetServiceFunction); dbus::MessageWriter writer(&method_call); @@ -146,7 +146,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void VerifyDestination(const VerificationProperties& properties, const BooleanCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kVerifyDestinationFunction); dbus::MessageWriter writer(&method_call); @@ -165,7 +165,7 @@ class ShillManagerClientImpl : public ShillManagerClient { const VerificationProperties& properties, const std::string& service_path, const StringCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kVerifyAndEncryptCredentialsFunction); dbus::MessageWriter writer(&method_call); @@ -185,7 +185,7 @@ class ShillManagerClientImpl : public ShillManagerClient { const VerificationProperties& properties, const std::string& data, const StringCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kVerifyAndEncryptDataFunction); dbus::MessageWriter writer(&method_call); @@ -203,7 +203,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void ConnectToBestServices( const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamManagerInterface, shill::kConnectToBestServicesFunction); helper_->CallVoidMethodWithErrorCallback(&method_call, @@ -214,7 +214,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void AddWakeOnPacketConnection( const net::IPEndPoint& ip_endpoint, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { if (ip_endpoint.address().empty()) { LOG(ERROR) << "AddWakeOnPacketConnection: null address"; return; @@ -231,7 +231,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void RemoveWakeOnPacketConnection( const net::IPEndPoint& ip_endpoint, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { if (ip_endpoint.address().empty()) { LOG(ERROR) << "RemoveWakeOnPacketConnection: null address"; return; @@ -247,7 +247,7 @@ class ShillManagerClientImpl : public ShillManagerClient { virtual void RemoveAllWakeOnPacketConnections( const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call( shill::kFlimflamManagerInterface, shill::kRemoveAllWakeOnPacketConnectionsFunction); @@ -256,12 +256,12 @@ class ShillManagerClientImpl : public ShillManagerClient { error_callback); } - virtual TestInterface* GetTestInterface() OVERRIDE { + virtual TestInterface* GetTestInterface() override { return NULL; } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { proxy_ = bus->GetObjectProxy(shill::kFlimflamServiceName, dbus::ObjectPath(shill::kFlimflamServicePath)); helper_.reset(new ShillClientHelper(proxy_)); diff --git a/chromeos/dbus/shill_profile_client.cc b/chromeos/dbus/shill_profile_client.cc index 25f48b6..f7f3de5 100644 --- a/chromeos/dbus/shill_profile_client.cc +++ b/chromeos/dbus/shill_profile_client.cc @@ -28,35 +28,35 @@ class ShillProfileClientImpl : public ShillProfileClient { virtual void AddPropertyChangedObserver( const dbus::ObjectPath& profile_path, - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { GetHelper(profile_path)->AddPropertyChangedObserver(observer); } virtual void RemovePropertyChangedObserver( const dbus::ObjectPath& profile_path, - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { GetHelper(profile_path)->RemovePropertyChangedObserver(observer); } virtual void GetProperties( const dbus::ObjectPath& profile_path, const DictionaryValueCallbackWithoutStatus& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void GetEntry(const dbus::ObjectPath& profile_path, const std::string& entry_path, const DictionaryValueCallbackWithoutStatus& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; virtual void DeleteEntry(const dbus::ObjectPath& profile_path, const std::string& entry_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE; + const ErrorCallback& error_callback) override; - virtual TestInterface* GetTestInterface() OVERRIDE { + virtual TestInterface* GetTestInterface() override { return NULL; } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { bus_ = bus; } diff --git a/chromeos/dbus/shill_service_client.cc b/chromeos/dbus/shill_service_client.cc index c1cf767..6d81c24 100644 --- a/chromeos/dbus/shill_service_client.cc +++ b/chromeos/dbus/shill_service_client.cc @@ -71,18 +71,18 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void AddPropertyChangedObserver( const dbus::ObjectPath& service_path, - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { GetHelper(service_path)->AddPropertyChangedObserver(observer); } virtual void RemovePropertyChangedObserver( const dbus::ObjectPath& service_path, - ShillPropertyChangedObserver* observer) OVERRIDE { + ShillPropertyChangedObserver* observer) override { GetHelper(service_path)->RemovePropertyChangedObserver(observer); } virtual void GetProperties(const dbus::ObjectPath& service_path, - const DictionaryValueCallback& callback) OVERRIDE { + const DictionaryValueCallback& callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kGetPropertiesFunction); GetHelper(service_path)->CallDictionaryValueMethodWithErrorCallback( @@ -96,7 +96,7 @@ class ShillServiceClientImpl : public ShillServiceClient { const std::string& name, const base::Value& value, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kSetPropertyFunction); dbus::MessageWriter writer(&method_call); @@ -110,7 +110,7 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void SetProperties(const dbus::ObjectPath& service_path, const base::DictionaryValue& properties, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kSetPropertiesFunction); dbus::MessageWriter writer(&method_call); @@ -123,7 +123,7 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void ClearProperty(const dbus::ObjectPath& service_path, const std::string& name, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kClearPropertyFunction); dbus::MessageWriter writer(&method_call); @@ -137,7 +137,7 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void ClearProperties(const dbus::ObjectPath& service_path, const std::vector<std::string>& names, const ListValueCallback& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kClearPropertiesFunction); dbus::MessageWriter writer(&method_call); @@ -150,7 +150,7 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void Connect(const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kConnectFunction); GetHelper(service_path)->CallVoidMethodWithErrorCallback( @@ -159,7 +159,7 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void Disconnect(const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kDisconnectFunction); GetHelper(service_path)->CallVoidMethodWithErrorCallback(&method_call, @@ -169,7 +169,7 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void Remove(const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kRemoveServiceFunction); GetHelper(service_path)->CallVoidMethodWithErrorCallback(&method_call, @@ -181,7 +181,7 @@ class ShillServiceClientImpl : public ShillServiceClient { const dbus::ObjectPath& service_path, const std::string& carrier, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kActivateCellularModemFunction); dbus::MessageWriter writer(&method_call); @@ -194,7 +194,7 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void CompleteCellularActivation( const dbus::ObjectPath& service_path, const base::Closure& callback, - const ErrorCallback& error_callback) OVERRIDE { + const ErrorCallback& error_callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kCompleteCellularActivationFunction); dbus::MessageWriter writer(&method_call); @@ -205,7 +205,7 @@ class ShillServiceClientImpl : public ShillServiceClient { virtual void GetLoadableProfileEntries( const dbus::ObjectPath& service_path, - const DictionaryValueCallback& callback) OVERRIDE { + const DictionaryValueCallback& callback) override { dbus::MethodCall method_call(shill::kFlimflamServiceInterface, shill::kGetLoadableProfileEntriesFunction); GetHelper(service_path)->CallDictionaryValueMethodWithErrorCallback( @@ -215,12 +215,12 @@ class ShillServiceClientImpl : public ShillServiceClient { service_path, callback)); } - virtual ShillServiceClient::TestInterface* GetTestInterface() OVERRIDE { + virtual ShillServiceClient::TestInterface* GetTestInterface() override { return NULL; } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { bus_ = bus; } diff --git a/chromeos/dbus/sms_client.cc b/chromeos/dbus/sms_client.cc index 52f28ea..7c0d218 100644 --- a/chromeos/dbus/sms_client.cc +++ b/chromeos/dbus/sms_client.cc @@ -37,7 +37,7 @@ class SMSClientImpl : public SMSClient { // Calls GetAll method. |callback| is called after the method call succeeds. virtual void GetAll(const std::string& service_name, const dbus::ObjectPath& object_path, - const GetAllCallback& callback) OVERRIDE { + const GetAllCallback& callback) override { dbus::ObjectProxy *proxy = bus_->GetObjectProxy(service_name, object_path); dbus::MethodCall method_call(dbus::kDBusPropertiesInterface, dbus::kDBusPropertiesGetAll); @@ -50,7 +50,7 @@ class SMSClientImpl : public SMSClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { bus_ = bus; } diff --git a/chromeos/dbus/system_clock_client.cc b/chromeos/dbus/system_clock_client.cc index 366e9e4..65afc8a 100644 --- a/chromeos/dbus/system_clock_client.cc +++ b/chromeos/dbus/system_clock_client.cc @@ -27,19 +27,19 @@ class SystemClockClientImpl : public SystemClockClient { virtual ~SystemClockClientImpl() { } - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } - virtual void SetTime(int64 time_in_seconds) OVERRIDE { + virtual void SetTime(int64 time_in_seconds) override { // Always try to set the time, because |can_set_time_| may be stale. dbus::MethodCall method_call(system_clock::kSystemClockInterface, system_clock::kSystemClockSet); @@ -50,10 +50,10 @@ class SystemClockClientImpl : public SystemClockClient { dbus::ObjectProxy::EmptyResponseCallback()); } - virtual bool CanSetTime() OVERRIDE { return can_set_time_; } + virtual bool CanSetTime() override { return can_set_time_; } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { system_clock_proxy_ = bus->GetObjectProxy( system_clock::kSystemClockServiceName, dbus::ObjectPath(system_clock::kSystemClockServicePath)); diff --git a/chromeos/dbus/update_engine_client.cc b/chromeos/dbus/update_engine_client.cc index f1866f5..ad6e7a3 100644 --- a/chromeos/dbus/update_engine_client.cc +++ b/chromeos/dbus/update_engine_client.cc @@ -83,20 +83,20 @@ class UpdateEngineClientImpl : public UpdateEngineClient { } // UpdateEngineClient implementation: - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } virtual void RequestUpdateCheck( - const UpdateCheckCallback& callback) OVERRIDE { + const UpdateCheckCallback& callback) override { dbus::MethodCall method_call( update_engine::kUpdateEngineInterface, update_engine::kAttemptUpdate); @@ -113,7 +113,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient { callback)); } - virtual void RebootAfterUpdate() OVERRIDE { + virtual void RebootAfterUpdate() override { dbus::MethodCall method_call( update_engine::kUpdateEngineInterface, update_engine::kRebootIfNeeded); @@ -126,7 +126,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient { weak_ptr_factory_.GetWeakPtr())); } - virtual void Rollback() OVERRIDE { + virtual void Rollback() override { VLOG(1) << "Requesting a rollback"; dbus::MethodCall method_call( update_engine::kUpdateEngineInterface, @@ -143,7 +143,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient { virtual void CanRollbackCheck( - const RollbackCheckCallback& callback) OVERRIDE { + const RollbackCheckCallback& callback) override { dbus::MethodCall method_call( update_engine::kUpdateEngineInterface, update_engine::kCanRollback); @@ -157,12 +157,12 @@ class UpdateEngineClientImpl : public UpdateEngineClient { callback)); } - virtual Status GetLastStatus() OVERRIDE { + virtual Status GetLastStatus() override { return last_status_; } virtual void SetChannel(const std::string& target_channel, - bool is_powerwash_allowed) OVERRIDE { + bool is_powerwash_allowed) override { if (!IsValidChannel(target_channel)) { LOG(ERROR) << "Invalid channel name: " << target_channel; return; @@ -186,7 +186,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient { } virtual void GetChannel(bool get_current_channel, - const GetChannelCallback& callback) OVERRIDE { + const GetChannelCallback& callback) override { dbus::MethodCall method_call( update_engine::kUpdateEngineInterface, update_engine::kGetChannel); @@ -204,7 +204,7 @@ class UpdateEngineClientImpl : public UpdateEngineClient { } protected: - virtual void Init(dbus::Bus* bus) OVERRIDE { + virtual void Init(dbus::Bus* bus) override { update_engine_proxy_ = bus->GetObjectProxy( update_engine::kUpdateEngineServiceName, dbus::ObjectPath(update_engine::kUpdateEngineServicePath)); @@ -402,31 +402,31 @@ class UpdateEngineClientStubImpl : public UpdateEngineClient { target_channel_(kReleaseChannelBeta) {} // UpdateEngineClient implementation: - virtual void Init(dbus::Bus* bus) OVERRIDE {} - virtual void AddObserver(Observer* observer) OVERRIDE {} - virtual void RemoveObserver(Observer* observer) OVERRIDE {} - virtual bool HasObserver(Observer* observer) OVERRIDE { return false; } + virtual void Init(dbus::Bus* bus) override {} + virtual void AddObserver(Observer* observer) override {} + virtual void RemoveObserver(Observer* observer) override {} + virtual bool HasObserver(Observer* observer) override { return false; } virtual void RequestUpdateCheck( - const UpdateCheckCallback& callback) OVERRIDE { + const UpdateCheckCallback& callback) override { callback.Run(UPDATE_RESULT_NOTIMPLEMENTED); } - virtual void RebootAfterUpdate() OVERRIDE {} - virtual void Rollback() OVERRIDE {} + virtual void RebootAfterUpdate() override {} + virtual void Rollback() override {} virtual void CanRollbackCheck( - const RollbackCheckCallback& callback) OVERRIDE { + const RollbackCheckCallback& callback) override { callback.Run(true); } - virtual Status GetLastStatus() OVERRIDE { return Status(); } + virtual Status GetLastStatus() override { return Status(); } virtual void SetChannel(const std::string& target_channel, - bool is_powerwash_allowed) OVERRIDE { + bool is_powerwash_allowed) override { VLOG(1) << "Requesting to set channel: " << "target_channel=" << target_channel << ", " << "is_powerwash_allowed=" << is_powerwash_allowed; target_channel_ = target_channel; } virtual void GetChannel(bool get_current_channel, - const GetChannelCallback& callback) OVERRIDE { + const GetChannelCallback& callback) override { VLOG(1) << "Requesting to get channel, get_current_channel=" << get_current_channel; if (get_current_channel) @@ -450,22 +450,22 @@ class UpdateEngineClientFakeImpl : public UpdateEngineClientStubImpl { } // UpdateEngineClient implementation: - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { if (observer) observers_.AddObserver(observer); } - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { if (observer) observers_.RemoveObserver(observer); } - virtual bool HasObserver(Observer* observer) OVERRIDE { + virtual bool HasObserver(Observer* observer) override { return observers_.HasObserver(observer); } virtual void RequestUpdateCheck( - const UpdateCheckCallback& callback) OVERRIDE { + const UpdateCheckCallback& callback) override { if (last_status_.status != UPDATE_STATUS_IDLE) { callback.Run(UPDATE_RESULT_FAILED); return; @@ -482,7 +482,7 @@ class UpdateEngineClientFakeImpl : public UpdateEngineClientStubImpl { base::TimeDelta::FromMilliseconds(kStateTransitionDefaultDelayMs)); } - virtual Status GetLastStatus() OVERRIDE { return last_status_; } + virtual Status GetLastStatus() override { return last_status_; } private: void StateTransition() { diff --git a/chromeos/disks/disk_mount_manager.cc b/chromeos/disks/disk_mount_manager.cc index 291263a..4867d51 100644 --- a/chromeos/disks/disk_mount_manager.cc +++ b/chromeos/disks/disk_mount_manager.cc @@ -49,12 +49,12 @@ class DiskMountManagerImpl : public DiskMountManager { } // DiskMountManager override. - virtual void AddObserver(Observer* observer) OVERRIDE { + virtual void AddObserver(Observer* observer) override { observers_.AddObserver(observer); } // DiskMountManager override. - virtual void RemoveObserver(Observer* observer) OVERRIDE { + virtual void RemoveObserver(Observer* observer) override { observers_.RemoveObserver(observer); } @@ -62,7 +62,7 @@ class DiskMountManagerImpl : public DiskMountManager { virtual void MountPath(const std::string& source_path, const std::string& source_format, const std::string& mount_label, - MountType type) OVERRIDE { + MountType type) override { // Hidden and non-existent devices should not be mounted. if (type == MOUNT_TYPE_DEVICE) { DiskMap::const_iterator it = disks_.find(source_path); @@ -87,7 +87,7 @@ class DiskMountManagerImpl : public DiskMountManager { // DiskMountManager override. virtual void UnmountPath(const std::string& mount_path, UnmountOptions options, - const UnmountPathCallback& callback) OVERRIDE { + const UnmountPathCallback& callback) override { UnmountChildMounts(mount_path); cros_disks_client_->Unmount(mount_path, options, base::Bind(&DiskMountManagerImpl::OnUnmountPath, @@ -103,7 +103,7 @@ class DiskMountManagerImpl : public DiskMountManager { } // DiskMountManager override. - virtual void FormatMountedDevice(const std::string& mount_path) OVERRIDE { + virtual void FormatMountedDevice(const std::string& mount_path) override { MountPointMap::const_iterator mount_point = mount_points_.find(mount_path); if (mount_point == mount_points_.end()) { LOG(ERROR) << "Mount point with path \"" << mount_path << "\" not found."; @@ -129,7 +129,7 @@ class DiskMountManagerImpl : public DiskMountManager { // DiskMountManager override. virtual void UnmountDeviceRecursively( const std::string& device_path, - const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE { + const UnmountDeviceRecursivelyCallbackType& callback) override { std::vector<std::string> devices_to_unmount; // Get list of all devices to unmount. @@ -192,7 +192,7 @@ class DiskMountManagerImpl : public DiskMountManager { // DiskMountManager override. virtual void EnsureMountInfoRefreshed( - const EnsureMountInfoRefreshedCallback& callback) OVERRIDE { + const EnsureMountInfoRefreshedCallback& callback) override { if (already_refreshed_) { callback.Run(true); return; @@ -210,22 +210,22 @@ class DiskMountManagerImpl : public DiskMountManager { } // DiskMountManager override. - virtual const DiskMap& disks() const OVERRIDE { return disks_; } + virtual const DiskMap& disks() const override { return disks_; } // DiskMountManager override. virtual const Disk* FindDiskBySourcePath(const std::string& source_path) - const OVERRIDE { + const override { DiskMap::const_iterator disk_it = disks_.find(source_path); return disk_it == disks_.end() ? NULL : disk_it->second; } // DiskMountManager override. - virtual const MountPointMap& mount_points() const OVERRIDE { + virtual const MountPointMap& mount_points() const override { return mount_points_; } // DiskMountManager override. - virtual bool AddDiskForTest(Disk* disk) OVERRIDE { + virtual bool AddDiskForTest(Disk* disk) override { if (disks_.find(disk->device_path()) != disks_.end()) { LOG(ERROR) << "Attempt to add a duplicate disk"; return false; @@ -238,7 +238,7 @@ class DiskMountManagerImpl : public DiskMountManager { // DiskMountManager override. // Corresponding disk should be added to the manager before this is called. virtual bool AddMountPointForTest( - const MountPointInfo& mount_point) OVERRIDE { + const MountPointInfo& mount_point) override { if (mount_points_.find(mount_point.mount_path) != mount_points_.end()) { LOG(ERROR) << "Attempt to add a duplicate mount point"; return false; diff --git a/chromeos/ime/fake_ime_keyboard.h b/chromeos/ime/fake_ime_keyboard.h index 131db0c..7ac938a 100644 --- a/chromeos/ime/fake_ime_keyboard.h +++ b/chromeos/ime/fake_ime_keyboard.h @@ -21,19 +21,19 @@ class CHROMEOS_EXPORT FakeImeKeyboard : public ImeKeyboard { FakeImeKeyboard(); virtual ~FakeImeKeyboard(); - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual bool SetCurrentKeyboardLayoutByName(const std::string& layout_name) - OVERRIDE; - virtual bool ReapplyCurrentKeyboardLayout() OVERRIDE; - virtual void ReapplyCurrentModifierLockStatus() OVERRIDE; - virtual void DisableNumLock() OVERRIDE; - virtual void SetCapsLockEnabled(bool enable_caps_lock) OVERRIDE; - virtual bool CapsLockIsEnabled() OVERRIDE; - virtual bool IsISOLevel5ShiftAvailable() const OVERRIDE; - virtual bool IsAltGrAvailable() const OVERRIDE; - virtual bool SetAutoRepeatEnabled(bool enabled) OVERRIDE; - virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) OVERRIDE; + override; + virtual bool ReapplyCurrentKeyboardLayout() override; + virtual void ReapplyCurrentModifierLockStatus() override; + virtual void DisableNumLock() override; + virtual void SetCapsLockEnabled(bool enable_caps_lock) override; + virtual bool CapsLockIsEnabled() override; + virtual bool IsISOLevel5ShiftAvailable() const override; + virtual bool IsAltGrAvailable() const override; + virtual bool SetAutoRepeatEnabled(bool enabled) override; + virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) override; int set_current_keyboard_layout_by_name_count_; std::string last_layout_; diff --git a/chromeos/ime/fake_input_method_delegate.h b/chromeos/ime/fake_input_method_delegate.h index 0c0b385..02347de 100644 --- a/chromeos/ime/fake_input_method_delegate.h +++ b/chromeos/ime/fake_input_method_delegate.h @@ -27,12 +27,12 @@ class CHROMEOS_EXPORT FakeInputMethodDelegate : public InputMethodDelegate { virtual ~FakeInputMethodDelegate(); // InputMethodDelegate implementation: - virtual std::string GetHardwareKeyboardLayouts() const OVERRIDE; - virtual base::string16 GetLocalizedString(int resource_id) const OVERRIDE; + virtual std::string GetHardwareKeyboardLayouts() const override; + virtual base::string16 GetLocalizedString(int resource_id) const override; virtual void SetHardwareKeyboardLayoutForTesting( - const std::string& layout) OVERRIDE; + const std::string& layout) override; virtual base::string16 GetDisplayLanguageName( - const std::string& language_code) const OVERRIDE; + const std::string& language_code) const override; void set_hardware_keyboard_layout(const std::string& value) { hardware_keyboard_layout_ = value; diff --git a/chromeos/ime/ime_keyboard_x11.cc b/chromeos/ime/ime_keyboard_x11.cc index f2189db..2295707 100644 --- a/chromeos/ime/ime_keyboard_x11.cc +++ b/chromeos/ime/ime_keyboard_x11.cc @@ -115,21 +115,21 @@ class ImeKeyboardX11 : public ImeKeyboard { virtual ~ImeKeyboardX11() {} // Adds/removes observer. - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; // ImeKeyboard: virtual bool SetCurrentKeyboardLayoutByName( - const std::string& layout_name) OVERRIDE; - virtual bool ReapplyCurrentKeyboardLayout() OVERRIDE; - virtual void ReapplyCurrentModifierLockStatus() OVERRIDE; - virtual void DisableNumLock() OVERRIDE; - virtual void SetCapsLockEnabled(bool enable_caps_lock) OVERRIDE; - virtual bool CapsLockIsEnabled() OVERRIDE; - virtual bool IsISOLevel5ShiftAvailable() const OVERRIDE; - virtual bool IsAltGrAvailable() const OVERRIDE; - virtual bool SetAutoRepeatEnabled(bool enabled) OVERRIDE; - virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) OVERRIDE; + const std::string& layout_name) override; + virtual bool ReapplyCurrentKeyboardLayout() override; + virtual void ReapplyCurrentModifierLockStatus() override; + virtual void DisableNumLock() override; + virtual void SetCapsLockEnabled(bool enable_caps_lock) override; + virtual bool CapsLockIsEnabled() override; + virtual bool IsISOLevel5ShiftAvailable() const override; + virtual bool IsAltGrAvailable() const override; + virtual bool SetAutoRepeatEnabled(bool enabled) override; + virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) override; private: // Returns a mask for Num Lock (e.g. 1U << 4). Returns 0 on error. diff --git a/chromeos/ime/ime_keyboard_x11_unittest.cc b/chromeos/ime/ime_keyboard_x11_unittest.cc index 187bd8b..cdf195f 100644 --- a/chromeos/ime/ime_keyboard_x11_unittest.cc +++ b/chromeos/ime/ime_keyboard_x11_unittest.cc @@ -38,7 +38,7 @@ class ImeKeyboardTest : public testing::Test, xkey_.reset(); } - virtual void OnCapsLockChanged(bool enabled) OVERRIDE { + virtual void OnCapsLockChanged(bool enabled) override { caps_changed_ = true; } diff --git a/chromeos/ime/mock_component_extension_ime_manager_delegate.h b/chromeos/ime/mock_component_extension_ime_manager_delegate.h index ee90acd..25dbba4 100644 --- a/chromeos/ime/mock_component_extension_ime_manager_delegate.h +++ b/chromeos/ime/mock_component_extension_ime_manager_delegate.h @@ -17,14 +17,14 @@ class CHROMEOS_EXPORT MockComponentExtIMEManagerDelegate MockComponentExtIMEManagerDelegate(); virtual ~MockComponentExtIMEManagerDelegate(); - virtual std::vector<ComponentExtensionIME> ListIME() OVERRIDE; + virtual std::vector<ComponentExtensionIME> ListIME() override; virtual void Load(Profile*, const std::string& extension_id, const std::string& manifest, - const base::FilePath& path) OVERRIDE; + const base::FilePath& path) override; virtual void Unload(Profile*, const std::string& extension_id, - const base::FilePath& path) OVERRIDE; + const base::FilePath& path) override; int load_call_count() const { return load_call_count_; } int unload_call_count() const { return unload_call_count_; } diff --git a/chromeos/login/auth/cryptohome_authenticator.h b/chromeos/login/auth/cryptohome_authenticator.h index cd01ac4..980dc0f 100644 --- a/chromeos/login/auth/cryptohome_authenticator.h +++ b/chromeos/login/auth/cryptohome_authenticator.h @@ -94,7 +94,7 @@ class CHROMEOS_EXPORT CryptohomeAuthenticator // Authenticator overrides. virtual void CompleteLogin(Profile* profile, - const UserContext& user_context) OVERRIDE; + const UserContext& user_context) override; // Given |user_context|, this method attempts to authenticate to your // Chrome OS device. As soon as we have successfully mounted the encrypted @@ -105,31 +105,31 @@ class CHROMEOS_EXPORT CryptohomeAuthenticator // // Uses |profile| when doing URL fetches. virtual void AuthenticateToLogin(Profile* profile, - const UserContext& user_context) OVERRIDE; + const UserContext& user_context) override; // Given |user_context|, this method attempts to authenticate to the cached // user_context. This will never contact the server even if it's online. // The auth result is sent to AuthStatusConsumer in a same way as // AuthenticateToLogin does. - virtual void AuthenticateToUnlock(const UserContext& user_context) OVERRIDE; + virtual void AuthenticateToUnlock(const UserContext& user_context) override; // Initiates supervised user login. // Creates cryptohome if missing or mounts existing one and // notifies consumer on the success/failure. - virtual void LoginAsSupervisedUser(const UserContext& user_context) OVERRIDE; + virtual void LoginAsSupervisedUser(const UserContext& user_context) override; // Initiates retail mode login. // Mounts tmpfs and notifies consumer on the success/failure. - virtual void LoginRetailMode() OVERRIDE; + virtual void LoginRetailMode() override; // Initiates incognito ("browse without signing in") login. // Mounts tmpfs and notifies consumer on the success/failure. - virtual void LoginOffTheRecord() OVERRIDE; + virtual void LoginOffTheRecord() override; // Initiates login into a public session. // Mounts an ephemeral cryptohome and notifies consumer on the // success/failure. - virtual void LoginAsPublicSession(const UserContext& user_context) OVERRIDE; + virtual void LoginAsPublicSession(const UserContext& user_context) override; // Initiates login into the kiosk mode account identified by |app_user_id|. // Mounts an ephemeral guest cryptohome if |use_guest_mount| is |true|. @@ -137,15 +137,15 @@ class CHROMEOS_EXPORT CryptohomeAuthenticator // |DeviceEphemeralUsersEnabled| policy is enabled and non-ephemeral // otherwise. virtual void LoginAsKioskAccount(const std::string& app_user_id, - bool use_guest_mount) OVERRIDE; + bool use_guest_mount) override; // These methods must be called on the UI thread, as they make DBus calls // and also call back to the login UI. - virtual void OnRetailModeAuthSuccess() OVERRIDE; - virtual void OnAuthSuccess() OVERRIDE; - virtual void OnAuthFailure(const AuthFailure& error) OVERRIDE; - virtual void RecoverEncryptedData(const std::string& old_password) OVERRIDE; - virtual void ResyncEncryptedData() OVERRIDE; + virtual void OnRetailModeAuthSuccess() override; + virtual void OnAuthSuccess() override; + virtual void OnAuthFailure(const AuthFailure& error) override; + virtual void RecoverEncryptedData(const std::string& old_password) override; + virtual void ResyncEncryptedData() override; // AuthAttemptStateResolver overrides. // Attempts to make a decision and call back |consumer_| based on @@ -154,7 +154,7 @@ class CHROMEOS_EXPORT CryptohomeAuthenticator // When a decision is made, will call back to |consumer_| on the UI thread. // // Must be called on the UI thread. - virtual void Resolve() OVERRIDE; + virtual void Resolve() override; void OnOffTheRecordAuthSuccess(); void OnPasswordChangeDetected(); diff --git a/chromeos/login/auth/mock_authenticator.h b/chromeos/login/auth/mock_authenticator.h index 4dfec20..d887e59 100644 --- a/chromeos/login/auth/mock_authenticator.h +++ b/chromeos/login/auth/mock_authenticator.h @@ -26,21 +26,21 @@ class CHROMEOS_EXPORT MockAuthenticator : public Authenticator { // Authenticator: virtual void CompleteLogin(Profile* profile, - const UserContext& user_context) OVERRIDE; + const UserContext& user_context) override; virtual void AuthenticateToLogin(Profile* profile, - const UserContext& user_context) OVERRIDE; - virtual void AuthenticateToUnlock(const UserContext& user_context) OVERRIDE; - virtual void LoginAsSupervisedUser(const UserContext& user_context) OVERRIDE; - virtual void LoginRetailMode() OVERRIDE; - virtual void LoginOffTheRecord() OVERRIDE; - virtual void LoginAsPublicSession(const UserContext& user_context) OVERRIDE; + const UserContext& user_context) override; + virtual void AuthenticateToUnlock(const UserContext& user_context) override; + virtual void LoginAsSupervisedUser(const UserContext& user_context) override; + virtual void LoginRetailMode() override; + virtual void LoginOffTheRecord() override; + virtual void LoginAsPublicSession(const UserContext& user_context) override; virtual void LoginAsKioskAccount(const std::string& app_user_id, - bool use_guest_mount) OVERRIDE; - virtual void OnRetailModeAuthSuccess() OVERRIDE; - virtual void OnAuthSuccess() OVERRIDE; - virtual void OnAuthFailure(const AuthFailure& failure) OVERRIDE; - virtual void RecoverEncryptedData(const std::string& old_password) OVERRIDE; - virtual void ResyncEncryptedData() OVERRIDE; + bool use_guest_mount) override; + virtual void OnRetailModeAuthSuccess() override; + virtual void OnAuthSuccess() override; + virtual void OnAuthFailure(const AuthFailure& failure) override; + virtual void RecoverEncryptedData(const std::string& old_password) override; + virtual void ResyncEncryptedData() override; virtual void SetExpectedCredentials(const UserContext& user_context); diff --git a/chromeos/login/auth/mock_url_fetchers.h b/chromeos/login/auth/mock_url_fetchers.h index 703c466..cb541ee 100644 --- a/chromeos/login/auth/mock_url_fetchers.h +++ b/chromeos/login/auth/mock_url_fetchers.h @@ -32,7 +32,7 @@ class ExpectCanceledFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~ExpectCanceledFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; void CompleteFetch(); @@ -50,7 +50,7 @@ class GotCanceledFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~GotCanceledFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: DISALLOW_COPY_AND_ASSIGN(GotCanceledFetcher); @@ -65,7 +65,7 @@ class SuccessFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~SuccessFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: DISALLOW_COPY_AND_ASSIGN(SuccessFetcher); @@ -80,7 +80,7 @@ class FailFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~FailFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: DISALLOW_COPY_AND_ASSIGN(FailFetcher); @@ -99,7 +99,7 @@ class CaptchaFetcher : public net::TestURLFetcher { static std::string GetCaptchaUrl(); static std::string GetUnlockUrl(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: static const char kCaptchaToken[]; @@ -118,7 +118,7 @@ class HostedFetcher : public net::TestURLFetcher { net::URLFetcherDelegate* d); virtual ~HostedFetcher(); - virtual void Start() OVERRIDE; + virtual void Start() override; private: DISALLOW_COPY_AND_ASSIGN(HostedFetcher); diff --git a/chromeos/login/auth/online_attempt.h b/chromeos/login/auth/online_attempt.h index 251fe0a..e03684b 100644 --- a/chromeos/login/auth/online_attempt.h +++ b/chromeos/login/auth/online_attempt.h @@ -41,9 +41,9 @@ class CHROMEOS_EXPORT OnlineAttempt : public GaiaAuthConsumer { // GaiaAuthConsumer overrides. Callbacks from GaiaAuthFetcher virtual void OnClientLoginFailure( - const GoogleServiceAuthError& error) OVERRIDE; + const GoogleServiceAuthError& error) override; virtual void OnClientLoginSuccess( - const GaiaAuthConsumer::ClientLoginResult& credentials) OVERRIDE; + const GaiaAuthConsumer::ClientLoginResult& credentials) override; private: FRIEND_TEST_ALL_PREFIXES(OnlineAttemptTest, LoginSuccess); diff --git a/chromeos/login/auth/online_attempt_host.h b/chromeos/login/auth/online_attempt_host.h index 8d49a7b..da392450 100644 --- a/chromeos/login/auth/online_attempt_host.h +++ b/chromeos/login/auth/online_attempt_host.h @@ -50,7 +50,7 @@ class CHROMEOS_EXPORT OnlineAttemptHost : public AuthAttemptStateResolver { // AuthAttemptStateResolver overrides. // Executed on IO thread. - virtual void Resolve() OVERRIDE; + virtual void Resolve() override; // Does an actual resolve on UI thread. void ResolveOnUIThread(bool success); diff --git a/chromeos/login/auth/test_attempt_state.h b/chromeos/login/auth/test_attempt_state.h index 43e51ee..cebe9d7 100644 --- a/chromeos/login/auth/test_attempt_state.h +++ b/chromeos/login/auth/test_attempt_state.h @@ -32,13 +32,13 @@ class CHROMEOS_EXPORT TestAttemptState : public AuthAttemptState { cryptohome::MountError cryptohome_code); // To allow state to be queried on the main thread during tests. - virtual bool online_complete() OVERRIDE; - virtual const AuthFailure& online_outcome() OVERRIDE; - virtual bool is_first_time_user() OVERRIDE; - virtual GaiaAuthFetcher::HostedAccountsSetting hosted_policy() OVERRIDE; - virtual bool cryptohome_complete() OVERRIDE; - virtual bool cryptohome_outcome() OVERRIDE; - virtual cryptohome::MountError cryptohome_code() OVERRIDE; + virtual bool online_complete() override; + virtual const AuthFailure& online_outcome() override; + virtual bool is_first_time_user() override; + virtual GaiaAuthFetcher::HostedAccountsSetting hosted_policy() override; + virtual bool cryptohome_complete() override; + virtual bool cryptohome_outcome() override; + virtual cryptohome::MountError cryptohome_code() override; private: DISALLOW_COPY_AND_ASSIGN(TestAttemptState); diff --git a/chromeos/login/login_state_unittest.cc b/chromeos/login/login_state_unittest.cc index 50dfdb6..dbe448e 100644 --- a/chromeos/login/login_state_unittest.cc +++ b/chromeos/login/login_state_unittest.cc @@ -25,19 +25,19 @@ class LoginStateTest : public testing::Test, } // testing::Test - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { LoginState::Initialize(); LoginState::Get()->set_always_logged_in(false); LoginState::Get()->AddObserver(this); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { LoginState::Get()->RemoveObserver(this); LoginState::Shutdown(); } // LoginState::Observer - virtual void LoggedInStateChanged() OVERRIDE { + virtual void LoggedInStateChanged() override { ++login_state_changes_count_; logged_in_user_type_ = LoginState::Get()->GetLoggedInUserType(); } diff --git a/chromeos/network/client_cert_resolver.h b/chromeos/network/client_cert_resolver.h index b8ded78..fc22d9b 100644 --- a/chromeos/network/client_cert_resolver.h +++ b/chromeos/network/client_cert_resolver.h @@ -59,14 +59,14 @@ class CHROMEOS_EXPORT ClientCertResolver : public NetworkStateHandlerObserver, private: // NetworkStateHandlerObserver overrides - virtual void NetworkListChanged() OVERRIDE; + virtual void NetworkListChanged() override; // CertLoader::Observer overrides virtual void OnCertificatesLoaded(const net::CertificateList& cert_list, - bool initial_load) OVERRIDE; + bool initial_load) override; // NetworkPolicyObserver overrides - virtual void PolicyApplied(const std::string& service_path) OVERRIDE; + virtual void PolicyApplied(const std::string& service_path) override; // Check which networks of |networks| are configured with a client certificate // pattern. Search for certificates, on the worker thread, and configure the diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc index 12f927d..f637ae3 100644 --- a/chromeos/network/client_cert_resolver_unittest.cc +++ b/chromeos/network/client_cert_resolver_unittest.cc @@ -57,7 +57,7 @@ class ClientCertResolverTest : public testing::Test { } virtual ~ClientCertResolverTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Initialize NSS db for the user. ASSERT_TRUE(user_.constructed_successfully()); user_.FinishInit(); @@ -88,7 +88,7 @@ class ClientCertResolverTest : public testing::Test { cert_loader_->force_hardware_backed_for_test(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { client_cert_resolver_.reset(); managed_config_handler_.reset(); network_config_handler_.reset(); diff --git a/chromeos/network/device_state.h b/chromeos/network/device_state.h index 3e8195b..db6830f 100644 --- a/chromeos/network/device_state.h +++ b/chromeos/network/device_state.h @@ -22,9 +22,9 @@ class CHROMEOS_EXPORT DeviceState : public ManagedState { // ManagedState overrides virtual bool PropertyChanged(const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual bool InitialPropertiesReceived( - const base::DictionaryValue& properties) OVERRIDE; + const base::DictionaryValue& properties) override; void IPConfigPropertiesChanged(const std::string& ip_config_path, const base::DictionaryValue& properties); diff --git a/chromeos/network/dhcp_proxy_script_fetcher_chromeos.h b/chromeos/network/dhcp_proxy_script_fetcher_chromeos.h index eb8ec4f..0597ca6 100644 --- a/chromeos/network/dhcp_proxy_script_fetcher_chromeos.h +++ b/chromeos/network/dhcp_proxy_script_fetcher_chromeos.h @@ -27,14 +27,14 @@ class CHROMEOS_EXPORT DhcpProxyScriptFetcherChromeos public: explicit DhcpProxyScriptFetcherChromeos( net::URLRequestContext* url_request_context); - virtual ~DhcpProxyScriptFetcherChromeos() OVERRIDE; + virtual ~DhcpProxyScriptFetcherChromeos() override; // net::DhcpProxyScriptFetcher virtual int Fetch(base::string16* utf16_text, - const net::CompletionCallback& callback) OVERRIDE; - virtual void Cancel() OVERRIDE; - virtual const GURL& GetPacURL() const OVERRIDE; - virtual std::string GetFetcherName() const OVERRIDE; + const net::CompletionCallback& callback) override; + virtual void Cancel() override; + virtual const GURL& GetPacURL() const override; + virtual std::string GetFetcherName() const override; private: void ContinueFetch(base::string16* utf16_text, diff --git a/chromeos/network/fake_network_device_handler.h b/chromeos/network/fake_network_device_handler.h index ea0d143..556a104 100644 --- a/chromeos/network/fake_network_device_handler.h +++ b/chromeos/network/fake_network_device_handler.h @@ -23,76 +23,76 @@ class CHROMEOS_EXPORT FakeNetworkDeviceHandler : public NetworkDeviceHandler { 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; private: DISALLOW_COPY_AND_ASSIGN(FakeNetworkDeviceHandler); diff --git a/chromeos/network/geolocation_handler.h b/chromeos/network/geolocation_handler.h index 5c35e18..b867326 100644 --- a/chromeos/network/geolocation_handler.h +++ b/chromeos/network/geolocation_handler.h @@ -43,7 +43,7 @@ class CHROMEOS_EXPORT GeolocationHandler : public ShillPropertyChangedObserver { // ShillPropertyChangedObserver overrides virtual void OnPropertyChanged(const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; private: friend class NetworkHandler; diff --git a/chromeos/network/geolocation_handler_unittest.cc b/chromeos/network/geolocation_handler_unittest.cc index af5dc19..084987e 100644 --- a/chromeos/network/geolocation_handler_unittest.cc +++ b/chromeos/network/geolocation_handler_unittest.cc @@ -22,7 +22,7 @@ class GeolocationHandlerTest : public testing::Test { virtual ~GeolocationHandlerTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Initialize DBusThreadManager with a stub implementation. DBusThreadManager::Initialize(); // Get the test interface for manager / device. @@ -34,7 +34,7 @@ class GeolocationHandlerTest : public testing::Test { message_loop_.RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { geolocation_handler_.reset(); DBusThreadManager::Shutdown(); } diff --git a/chromeos/network/host_resolver_impl_chromeos.cc b/chromeos/network/host_resolver_impl_chromeos.cc index 57e0c44..4c237f5 100644 --- a/chromeos/network/host_resolver_impl_chromeos.cc +++ b/chromeos/network/host_resolver_impl_chromeos.cc @@ -52,7 +52,7 @@ class HostResolverImplChromeOS::NetworkObserver } // NetworkStateHandlerObserver - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE { + virtual void DefaultNetworkChanged(const NetworkState* network) override { if (!network) { DVLOG(2) << "DefaultNetworkChanged: No Network."; CallResolverSetIpAddress("", ""); @@ -92,7 +92,7 @@ class HostResolverImplChromeOS::NetworkObserver CallResolverSetIpAddress(ipv4_address, ipv6_address); } - virtual void IsShuttingDown() OVERRIDE { + virtual void IsShuttingDown() override { delete this; } diff --git a/chromeos/network/host_resolver_impl_chromeos.h b/chromeos/network/host_resolver_impl_chromeos.h index 94f7712..ce72fe0 100644 --- a/chromeos/network/host_resolver_impl_chromeos.h +++ b/chromeos/network/host_resolver_impl_chromeos.h @@ -48,7 +48,7 @@ class CHROMEOS_EXPORT HostResolverImplChromeOS : public net::HostResolverImpl { net::AddressList* addresses, const net::CompletionCallback& callback, RequestHandle* out_req, - const net::BoundNetLog& source_net_log) OVERRIDE; + const net::BoundNetLog& source_net_log) override; private: friend class net::HostResolver; diff --git a/chromeos/network/host_resolver_impl_chromeos_unittest.cc b/chromeos/network/host_resolver_impl_chromeos_unittest.cc index 9567b8b..2a05570 100644 --- a/chromeos/network/host_resolver_impl_chromeos_unittest.cc +++ b/chromeos/network/host_resolver_impl_chromeos_unittest.cc @@ -40,7 +40,7 @@ class HostResolverImplChromeOSTest : public testing::Test { virtual ~HostResolverImplChromeOSTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { chromeos::DBusThreadManager::Initialize(); network_state_handler_.reset( @@ -67,7 +67,7 @@ class HostResolverImplChromeOSTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_state_handler_.reset(); chromeos::DBusThreadManager::Shutdown(); } diff --git a/chromeos/network/managed_network_configuration_handler_impl.h b/chromeos/network/managed_network_configuration_handler_impl.h index 9cccc4d..aaa8635 100644 --- a/chromeos/network/managed_network_configuration_handler_impl.h +++ b/chromeos/network/managed_network_configuration_handler_impl.h @@ -37,68 +37,68 @@ class CHROMEOS_EXPORT ManagedNetworkConfigurationHandlerImpl virtual ~ManagedNetworkConfigurationHandlerImpl(); // ManagedNetworkConfigurationHandler overrides - virtual void AddObserver(NetworkPolicyObserver* observer) OVERRIDE; - virtual void RemoveObserver(NetworkPolicyObserver* observer) OVERRIDE; + virtual void AddObserver(NetworkPolicyObserver* observer) override; + virtual void RemoveObserver(NetworkPolicyObserver* observer) override; virtual void GetProperties( const std::string& service_path, const network_handler::DictionaryResultCallback& callback, - const network_handler::ErrorCallback& error_callback) OVERRIDE; + const network_handler::ErrorCallback& error_callback) override; virtual void GetManagedProperties( const std::string& userhash, const std::string& service_path, const network_handler::DictionaryResultCallback& callback, - const network_handler::ErrorCallback& error_callback) OVERRIDE; + const network_handler::ErrorCallback& error_callback) override; virtual void SetProperties( const std::string& service_path, const base::DictionaryValue& user_settings, const base::Closure& callback, - const network_handler::ErrorCallback& error_callback) const OVERRIDE; + const network_handler::ErrorCallback& error_callback) const override; virtual void CreateConfiguration( const std::string& userhash, const base::DictionaryValue& properties, const network_handler::StringResultCallback& callback, - const network_handler::ErrorCallback& error_callback) const OVERRIDE; + const network_handler::ErrorCallback& error_callback) const override; virtual void RemoveConfiguration( const std::string& service_path, const base::Closure& callback, - const network_handler::ErrorCallback& error_callback) const OVERRIDE; + const network_handler::ErrorCallback& error_callback) const override; virtual void SetPolicy( onc::ONCSource onc_source, const std::string& userhash, const base::ListValue& network_configs_onc, - const base::DictionaryValue& global_network_config) OVERRIDE; + const base::DictionaryValue& global_network_config) override; virtual const base::DictionaryValue* FindPolicyByGUID( const std::string userhash, const std::string& guid, - onc::ONCSource* onc_source) const OVERRIDE; + onc::ONCSource* onc_source) const override; virtual const base::DictionaryValue* GetGlobalConfigFromPolicy( - const std::string userhash) const OVERRIDE; + const std::string userhash) const override; virtual const base::DictionaryValue* FindPolicyByGuidAndProfile( const std::string& guid, - const std::string& profile_path) const OVERRIDE; + const std::string& profile_path) const override; // NetworkProfileObserver overrides - virtual void OnProfileAdded(const NetworkProfile& profile) OVERRIDE; - virtual void OnProfileRemoved(const NetworkProfile& profile) OVERRIDE; + virtual void OnProfileAdded(const NetworkProfile& profile) override; + virtual void OnProfileRemoved(const NetworkProfile& profile) override; // PolicyApplicator::ConfigurationHandler overrides virtual void CreateConfigurationFromPolicy( - const base::DictionaryValue& shill_properties) OVERRIDE; + const base::DictionaryValue& shill_properties) override; virtual void UpdateExistingConfigurationWithPropertiesFromPolicy( const base::DictionaryValue& existing_properties, - const base::DictionaryValue& new_properties) OVERRIDE; + const base::DictionaryValue& new_properties) override; - virtual void OnPoliciesApplied() OVERRIDE; + virtual void OnPoliciesApplied() override; private: friend class ClientCertResolverTest; diff --git a/chromeos/network/managed_network_configuration_handler_unittest.cc b/chromeos/network/managed_network_configuration_handler_unittest.cc index 7a32886..b72fb86 100644 --- a/chromeos/network/managed_network_configuration_handler_unittest.cc +++ b/chromeos/network/managed_network_configuration_handler_unittest.cc @@ -180,7 +180,7 @@ class ManagedNetworkConfigurationHandlerTest : public testing::Test { virtual ~ManagedNetworkConfigurationHandlerTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { scoped_ptr<DBusThreadManagerSetter> dbus_setter = DBusThreadManager::GetSetterForTesting(); mock_manager_client_ = new StrictMock<MockShillManagerClient>(); @@ -222,7 +222,7 @@ class ManagedNetworkConfigurationHandlerTest : public testing::Test { message_loop_.RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { managed_network_configuration_handler_.reset(); network_configuration_handler_.reset(); network_profile_handler_.reset(); @@ -809,7 +809,7 @@ TEST_F(ManagedNetworkConfigurationHandlerTest, LateProfileLoading) { class ManagedNetworkConfigurationHandlerShutdownTest : public ManagedNetworkConfigurationHandlerTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ManagedNetworkConfigurationHandlerTest::SetUp(); ON_CALL(*mock_profile_client_, GetProperties(_, _, _)).WillByDefault( Invoke(&ManagedNetworkConfigurationHandlerShutdownTest::GetProperties)); diff --git a/chromeos/network/network_cert_migrator.h b/chromeos/network/network_cert_migrator.h index 1acc816..6e43bdc 100644 --- a/chromeos/network/network_cert_migrator.h +++ b/chromeos/network/network_cert_migrator.h @@ -31,11 +31,11 @@ class CHROMEOS_EXPORT NetworkCertMigrator : public NetworkStateHandlerObserver, void Init(NetworkStateHandler* network_state_handler); // NetworkStateHandlerObserver overrides - virtual void NetworkListChanged() OVERRIDE; + virtual void NetworkListChanged() override; // CertLoader::Observer overrides virtual void OnCertificatesLoaded(const net::CertificateList& cert_list, - bool initial_load) OVERRIDE; + bool initial_load) override; // Unowned associated NetworkStateHandler* (global or test instance). NetworkStateHandler* network_state_handler_; diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc index 38103e6..a8c2342 100644 --- a/chromeos/network/network_cert_migrator_unittest.cc +++ b/chromeos/network/network_cert_migrator_unittest.cc @@ -50,7 +50,7 @@ class NetworkCertMigratorTest : public testing::Test { } virtual ~NetworkCertMigratorTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Initialize NSS db for the user. ASSERT_TRUE(user_.constructed_successfully()); user_.FinishInit(); @@ -77,7 +77,7 @@ class NetworkCertMigratorTest : public testing::Test { cert_loader_->StartWithNSSDB(test_nssdb_.get()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_cert_migrator_.reset(); network_state_handler_.reset(); CertLoader::Shutdown(); diff --git a/chromeos/network/network_change_notifier_chromeos.cc b/chromeos/network/network_change_notifier_chromeos.cc index 84ed856..bde8997 100644 --- a/chromeos/network/network_change_notifier_chromeos.cc +++ b/chromeos/network/network_change_notifier_chromeos.cc @@ -28,7 +28,7 @@ class NetworkChangeNotifierChromeos::DnsConfigService virtual ~DnsConfigService(); // net::internal::DnsConfigService() overrides. - virtual bool StartWatching() OVERRIDE; + virtual bool StartWatching() override; virtual void OnNetworkChange(); }; diff --git a/chromeos/network/network_change_notifier_chromeos.h b/chromeos/network/network_change_notifier_chromeos.h index d70386e..8d07a97 100644 --- a/chromeos/network/network_change_notifier_chromeos.h +++ b/chromeos/network/network_change_notifier_chromeos.h @@ -33,14 +33,14 @@ class CHROMEOS_EXPORT NetworkChangeNotifierChromeos // NetworkChangeNotifier overrides. virtual net::NetworkChangeNotifier::ConnectionType - GetCurrentConnectionType() const OVERRIDE; + GetCurrentConnectionType() const override; // PowerManagerClient::Observer overrides. - virtual void SuspendDone(const base::TimeDelta& sleep_duration) OVERRIDE; + virtual void SuspendDone(const base::TimeDelta& sleep_duration) override; // NetworkStateHandlerObserver overrides. virtual void DefaultNetworkChanged( - const chromeos::NetworkState* default_network) OVERRIDE; + const chromeos::NetworkState* default_network) override; private: FRIEND_TEST_ALL_PREFIXES(NetworkChangeNotifierChromeosTest, diff --git a/chromeos/network/network_change_notifier_factory_chromeos.h b/chromeos/network/network_change_notifier_factory_chromeos.h index 51366da..6be9f50 100644 --- a/chromeos/network/network_change_notifier_factory_chromeos.h +++ b/chromeos/network/network_change_notifier_factory_chromeos.h @@ -20,7 +20,7 @@ class CHROMEOS_EXPORT NetworkChangeNotifierFactoryChromeos NetworkChangeNotifierFactoryChromeos() {} // net::NetworkChangeNotifierFactory overrides. - virtual net::NetworkChangeNotifier* CreateInstance() OVERRIDE; + virtual net::NetworkChangeNotifier* CreateInstance() override; static NetworkChangeNotifierChromeos* GetInstance(); }; diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc index 3609b11..da754f6 100644 --- a/chromeos/network/network_configuration_handler_unittest.cc +++ b/chromeos/network/network_configuration_handler_unittest.cc @@ -97,7 +97,7 @@ class NetworkConfigurationHandlerTest : public testing::Test { dictionary_value_result_(NULL) {} virtual ~NetworkConfigurationHandlerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { scoped_ptr<DBusThreadManagerSetter> dbus_setter = DBusThreadManager::GetSetterForTesting(); mock_manager_client_ = new MockShillManagerClient(); @@ -125,7 +125,7 @@ class NetworkConfigurationHandlerTest : public testing::Test { message_loop_.RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_configuration_handler_.reset(); network_state_handler_.reset(); DBusThreadManager::Shutdown(); @@ -398,11 +398,11 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver { TestObserver() : network_list_changed_count_(0) {} virtual ~TestObserver() {} - virtual void NetworkListChanged() OVERRIDE { + virtual void NetworkListChanged() override { ++network_list_changed_count_; } - virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE { + virtual void NetworkPropertiesUpdated(const NetworkState* network) override { property_updates_[network->path()]++; } @@ -433,7 +433,7 @@ class NetworkConfigurationHandlerStubTest : public testing::Test { virtual ~NetworkConfigurationHandlerStubTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { DBusThreadManager::Initialize(); network_state_handler_.reset(NetworkStateHandler::InitializeForTest()); @@ -447,7 +447,7 @@ class NetworkConfigurationHandlerStubTest : public testing::Test { test_observer_->ClearPropertyUpdates(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_configuration_handler_.reset(); network_state_handler_->RemoveObserver(test_observer_.get(), FROM_HERE); network_state_handler_.reset(); diff --git a/chromeos/network/network_connection_handler.h b/chromeos/network/network_connection_handler.h index 80e0376..cc85a2f 100644 --- a/chromeos/network/network_connection_handler.h +++ b/chromeos/network/network_connection_handler.h @@ -127,18 +127,18 @@ class CHROMEOS_EXPORT NetworkConnectionHandler bool HasPendingConnectRequest(); // NetworkStateHandlerObserver - virtual void NetworkListChanged() OVERRIDE; - virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE; + virtual void NetworkListChanged() override; + virtual void NetworkPropertiesUpdated(const NetworkState* network) override; // LoginState::Observer - virtual void LoggedInStateChanged() OVERRIDE; + virtual void LoggedInStateChanged() override; // CertLoader::Observer virtual void OnCertificatesLoaded(const net::CertificateList& cert_list, - bool initial_load) OVERRIDE; + bool initial_load) override; // NetworkPolicyObserver - virtual void PolicyChanged(const std::string& userhash) OVERRIDE; + virtual void PolicyChanged(const std::string& userhash) override; private: friend class NetworkHandler; diff --git a/chromeos/network/network_connection_handler_unittest.cc b/chromeos/network/network_connection_handler_unittest.cc index 9a5cded..e25a267 100644 --- a/chromeos/network/network_connection_handler_unittest.cc +++ b/chromeos/network/network_connection_handler_unittest.cc @@ -63,7 +63,7 @@ class NetworkConnectionHandlerTest : public testing::Test { virtual ~NetworkConnectionHandlerTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(user_.constructed_successfully()); user_.FinishInit(); @@ -121,7 +121,7 @@ class NetworkConnectionHandlerTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { managed_config_handler_.reset(); network_profile_handler_.reset(); network_connection_handler_.reset(); diff --git a/chromeos/network/network_device_handler_impl.h b/chromeos/network/network_device_handler_impl.h index 3db410b..fb10f3c 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; diff --git a/chromeos/network/network_device_handler_unittest.cc b/chromeos/network/network_device_handler_unittest.cc index 644ac57..865c671 100644 --- a/chromeos/network/network_device_handler_unittest.cc +++ b/chromeos/network/network_device_handler_unittest.cc @@ -31,7 +31,7 @@ class NetworkDeviceHandlerTest : public testing::Test { NetworkDeviceHandlerTest() : fake_device_client_(NULL) {} virtual ~NetworkDeviceHandlerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { fake_device_client_ = new FakeShillDeviceClient; DBusThreadManager::GetSetterForTesting()->SetShillDeviceClient( scoped_ptr<ShillDeviceClient>(fake_device_client_)); @@ -67,7 +67,7 @@ class NetworkDeviceHandlerTest : public testing::Test { message_loop_.RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_device_handler_.reset(); network_state_handler_.reset(); DBusThreadManager::Shutdown(); diff --git a/chromeos/network/network_event_log_unittest.cc b/chromeos/network/network_event_log_unittest.cc index e98b32c..8a06488 100644 --- a/chromeos/network/network_event_log_unittest.cc +++ b/chromeos/network/network_event_log_unittest.cc @@ -27,11 +27,11 @@ class NetworkEventLogTest : public testing::Test { NetworkEventLogTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { network_event_log::Initialize(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_event_log::Shutdown(); } diff --git a/chromeos/network/network_profile_handler.h b/chromeos/network/network_profile_handler.h index dcbbea92..e71186c 100644 --- a/chromeos/network/network_profile_handler.h +++ b/chromeos/network/network_profile_handler.h @@ -42,7 +42,7 @@ class CHROMEOS_EXPORT NetworkProfileHandler // ShillPropertyChangedObserver overrides virtual void OnPropertyChanged(const std::string& name, - const base::Value& value) OVERRIDE; + const base::Value& value) override; void GetProfilePropertiesCallback(const std::string& profile_path, const base::DictionaryValue& properties); diff --git a/chromeos/network/network_sms_handler.cc b/chromeos/network/network_sms_handler.cc index 9968d60..b7d7243 100644 --- a/chromeos/network/network_sms_handler.cc +++ b/chromeos/network/network_sms_handler.cc @@ -57,7 +57,7 @@ class NetworkSmsHandler::ModemManagerNetworkSmsDeviceHandler const std::string& service_name, const dbus::ObjectPath& object_path); - virtual void RequestUpdate() OVERRIDE; + virtual void RequestUpdate() override; private: void ListCallback(const base::ListValue& message_list); @@ -179,7 +179,7 @@ class NetworkSmsHandler::ModemManager1NetworkSmsDeviceHandler const std::string& service_name, const dbus::ObjectPath& object_path); - virtual void RequestUpdate() OVERRIDE; + virtual void RequestUpdate() override; private: void ListCallback(const std::vector<dbus::ObjectPath>& paths); diff --git a/chromeos/network/network_sms_handler.h b/chromeos/network/network_sms_handler.h index da4a10e..bef9f2f 100644 --- a/chromeos/network/network_sms_handler.h +++ b/chromeos/network/network_sms_handler.h @@ -49,7 +49,7 @@ class CHROMEOS_EXPORT NetworkSmsHandler : public ShillPropertyChangedObserver { // ShillPropertyChangedObserver virtual void OnPropertyChanged(const std::string& name, - const base::Value& value) OVERRIDE; + const base::Value& value) override; private: friend class NetworkHandler; diff --git a/chromeos/network/network_sms_handler_unittest.cc b/chromeos/network/network_sms_handler_unittest.cc index a050d2b..199e70f 100644 --- a/chromeos/network/network_sms_handler_unittest.cc +++ b/chromeos/network/network_sms_handler_unittest.cc @@ -25,7 +25,7 @@ class TestObserver : public NetworkSmsHandler::Observer { TestObserver() {} virtual ~TestObserver() {} - virtual void MessageReceived(const base::DictionaryValue& message) OVERRIDE { + virtual void MessageReceived(const base::DictionaryValue& message) override { std::string text; if (message.GetStringWithoutPathExpansion( NetworkSmsHandler::kTextKey, &text)) { @@ -53,7 +53,7 @@ class NetworkSmsHandlerTest : public testing::Test { NetworkSmsHandlerTest() {} virtual ~NetworkSmsHandlerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Append '--sms-test-messages' to the command line to tell // SMSClientStubImpl to generate a series of test SMS messages. CommandLine* command_line = CommandLine::ForCurrentProcess(); @@ -80,7 +80,7 @@ class NetworkSmsHandlerTest : public testing::Test { message_loop_.RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_sms_handler_.reset(); DBusThreadManager::Shutdown(); } diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h index 5098389..91247b4 100644 --- a/chromeos/network/network_state.h +++ b/chromeos/network/network_state.h @@ -38,11 +38,11 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState { // ManagedState overrides // If you change this method, update GetProperties too. virtual bool PropertyChanged(const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual bool InitialPropertiesReceived( - const base::DictionaryValue& properties) OVERRIDE; + const base::DictionaryValue& properties) override; virtual void GetStateProperties( - base::DictionaryValue* dictionary) const OVERRIDE; + base::DictionaryValue* dictionary) const override; void IPConfigPropertiesChanged(const base::DictionaryValue& properties); diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h index 20f0577..6fd92a3 100644 --- a/chromeos/network/network_state_handler.h +++ b/chromeos/network/network_state_handler.h @@ -244,30 +244,30 @@ class CHROMEOS_EXPORT NetworkStateHandler // This adds new entries to |network_list_| or |device_list_| and deletes any // entries that are no longer in the list. virtual void UpdateManagedList(ManagedState::ManagedType type, - const base::ListValue& entries) OVERRIDE; + const base::ListValue& entries) override; // The list of profiles changed (i.e. a user has logged in). Re-request // properties for all services since they may have changed. - virtual void ProfileListChanged() OVERRIDE; + virtual void ProfileListChanged() override; // Parses the properties for the network service or device. Mostly calls // managed->PropertyChanged(key, value) for each dictionary entry. virtual void UpdateManagedStateProperties( ManagedState::ManagedType type, const std::string& path, - const base::DictionaryValue& properties) OVERRIDE; + const base::DictionaryValue& properties) override; // Called by ShillPropertyHandler when a watched service property changes. virtual void UpdateNetworkServiceProperty( const std::string& service_path, const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; // Called by ShillPropertyHandler when a watched device property changes. virtual void UpdateDeviceProperty( const std::string& device_path, const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; // Called by ShillPropertyHandler when a watched network or device // IPConfig property changes. @@ -275,26 +275,26 @@ class CHROMEOS_EXPORT NetworkStateHandler ManagedState::ManagedType type, const std::string& path, const std::string& ip_config_path, - const base::DictionaryValue& properties) OVERRIDE; + const base::DictionaryValue& properties) override; // Called by ShillPropertyHandler when the portal check list manager property // changes. virtual void CheckPortalListChanged( - const std::string& check_portal_list) OVERRIDE; + const std::string& check_portal_list) override; // Called by ShillPropertyHandler when a technology list changes. - virtual void TechnologyListChanged() OVERRIDE; + virtual void TechnologyListChanged() override; // Called by |shill_property_handler_| when the service or device list has // changed and all entries have been updated. This updates the list and // notifies observers. virtual void ManagedStateListChanged( - ManagedState::ManagedType type) OVERRIDE; + ManagedState::ManagedType type) override; // Called when the default network service changes. Sets default_network_path_ // and notifies listeners. virtual void DefaultNetworkServiceChanged( - const std::string& service_path) OVERRIDE; + const std::string& service_path) override; // Called after construction. Called explicitly by tests after adding // test observers. diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc index 6b41251..c118e19 100644 --- a/chromeos/network/network_state_handler_unittest.cc +++ b/chromeos/network/network_state_handler_unittest.cc @@ -60,14 +60,14 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver { virtual ~TestObserver() { } - virtual void DeviceListChanged() OVERRIDE { + virtual void DeviceListChanged() override { NetworkStateHandler::DeviceStateList devices; handler_->GetDeviceList(&devices); device_count_ = devices.size(); ++device_list_changed_count_; } - virtual void NetworkListChanged() OVERRIDE { + virtual void NetworkListChanged() override { NetworkStateHandler::NetworkStateList networks; handler_->GetNetworkListByType(chromeos::NetworkTypePattern::Default(), false /* configured_only */, @@ -82,7 +82,7 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver { ++network_list_changed_count_; } - virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE { + virtual void DefaultNetworkChanged(const NetworkState* network) override { ++default_network_change_count_; default_network_ = network ? network->path() : ""; default_network_connection_state_ = @@ -92,17 +92,17 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver { } virtual void NetworkConnectionStateChanged( - const NetworkState* network) OVERRIDE { + const NetworkState* network) override { network_connection_state_[network->path()] = network->connection_state(); connection_state_changes_[network->path()]++; } - virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE { + virtual void NetworkPropertiesUpdated(const NetworkState* network) override { DCHECK(network); property_updates_[network->path()]++; } - virtual void DevicePropertiesUpdated(const DeviceState* device) OVERRIDE { + virtual void DevicePropertiesUpdated(const DeviceState* device) override { DCHECK(device); device_property_updates_[device->path()]++; } @@ -177,7 +177,7 @@ class NetworkStateHandlerTest : public testing::Test { service_test_(NULL) {} virtual ~NetworkStateHandlerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Initialize DBusThreadManager with a stub implementation. DBusThreadManager::Initialize(); SetupDefaultShillState(); @@ -189,7 +189,7 @@ class NetworkStateHandlerTest : public testing::Test { test_observer_->reset_change_counts(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { network_state_handler_->RemoveObserver(test_observer_.get(), FROM_HERE); test_observer_.reset(); network_state_handler_.reset(); diff --git a/chromeos/network/network_state_unittest.cc b/chromeos/network/network_state_unittest.cc index a36c66d..76a1ec1 100644 --- a/chromeos/network/network_state_unittest.cc +++ b/chromeos/network/network_state_unittest.cc @@ -27,17 +27,17 @@ class TestStringValue : public base::Value { } // Overridden from Value: - virtual bool GetAsString(std::string* out_value) const OVERRIDE { + virtual bool GetAsString(std::string* out_value) const override { if (out_value) *out_value = value_; return true; } - virtual TestStringValue* DeepCopy() const OVERRIDE { + virtual TestStringValue* DeepCopy() const override { return new TestStringValue(value_); } - virtual bool Equals(const base::Value* other) const OVERRIDE { + virtual bool Equals(const base::Value* other) const override { if (other->GetType() != GetType()) return false; std::string lhs, rhs; diff --git a/chromeos/network/onc/onc_certificate_importer_impl.h b/chromeos/network/onc/onc_certificate_importer_impl.h index 079cd88..899ab58 100644 --- a/chromeos/network/onc/onc_certificate_importer_impl.h +++ b/chromeos/network/onc/onc_certificate_importer_impl.h @@ -50,7 +50,7 @@ class CHROMEOS_EXPORT CertificateImporterImpl : public CertificateImporter { // CertificateImporter overrides virtual void ImportCertificates(const base::ListValue& certificates, ::onc::ONCSource source, - const DoneCallback& done_callback) OVERRIDE; + const DoneCallback& done_callback) override; private: void RunDoneCallback(const CertificateImporter::DoneCallback& callback, diff --git a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc index bbe8a86..362676b 100644 --- a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc +++ b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc @@ -67,7 +67,7 @@ class ONCCertificateImporterImplTest : public testing::Test { ONCCertificateImporterImplTest() {} virtual ~ONCCertificateImporterImplTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(public_nssdb_.is_open()); ASSERT_TRUE(private_nssdb_.is_open()); @@ -84,7 +84,7 @@ class ONCCertificateImporterImplTest : public testing::Test { EXPECT_TRUE(ListCertsInPrivateSlot().empty()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { thread_task_runner_handle_.reset(); task_runner_ = NULL; } diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc index 4dcaae9..915f549 100644 --- a/chromeos/network/onc/onc_merger.cc +++ b/chromeos/network/onc/onc_merger.cc @@ -217,7 +217,7 @@ class MergeSettingsAndPolicies : public MergeListOfDictionaries { // MergeListOfDictionaries override. virtual scoped_ptr<base::Value> MergeListOfValues( const std::string& key, - const std::vector<const base::Value*>& values) OVERRIDE { + const std::vector<const base::Value*>& values) override { bool user_editable = !HasUserPolicy(); if (values[kUserEditableIndex]) values[kUserEditableIndex]->GetAsBoolean(&user_editable); @@ -305,7 +305,7 @@ class MergeToEffective : public MergeSettingsAndPolicies { // MergeSettingsAndPolicies override. virtual scoped_ptr<base::Value> MergeValues( const std::string& key, - const ValueParams& values) OVERRIDE { + const ValueParams& values) override { std::string which; return MergeValues(key, values, &which); } @@ -360,7 +360,7 @@ class MergeToAugmented : public MergeToEffective { // MergeSettingsAndPolicies override. virtual scoped_ptr<base::Value> MergeValues( const std::string& key, - const ValueParams& values) OVERRIDE { + const ValueParams& values) override { const OncFieldSignature* field = NULL; if (signature_) field = GetFieldSignature(*signature_, key); @@ -445,7 +445,7 @@ class MergeToAugmented : public MergeToEffective { // MergeListOfDictionaries override. virtual DictionaryPtr MergeNestedDictionaries( const std::string& key, - const DictPtrs &dicts) OVERRIDE { + const DictPtrs &dicts) override { DictionaryPtr result; if (signature_) { const OncValueSignature* enclosing_signature = signature_; diff --git a/chromeos/network/onc/onc_normalizer.h b/chromeos/network/onc/onc_normalizer.h index 4537650..7268879 100644 --- a/chromeos/network/onc/onc_normalizer.h +++ b/chromeos/network/onc/onc_normalizer.h @@ -34,7 +34,7 @@ class CHROMEOS_EXPORT Normalizer : public Mapper { virtual scoped_ptr<base::DictionaryValue> MapObject( const OncValueSignature& signature, const base::DictionaryValue& onc_object, - bool* error) OVERRIDE; + bool* error) override; void NormalizeCertificate(base::DictionaryValue* cert); void NormalizeEAP(base::DictionaryValue* eap); diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc index 9eb4e50..fdff42d 100644 --- a/chromeos/network/onc/onc_utils.cc +++ b/chromeos/network/onc/onc_utils.cc @@ -263,7 +263,7 @@ class OncMaskValues : public Mapper { const OncValueSignature& object_signature, const base::Value& onc_value, bool* found_unknown_field, - bool* error) OVERRIDE { + bool* error) override { if (FieldIsCredential(object_signature, field_name)) { return scoped_ptr<base::Value>(new base::StringValue(mask_)); } else { diff --git a/chromeos/network/onc/onc_utils_unittest.cc b/chromeos/network/onc/onc_utils_unittest.cc index b29398b..90ce28a 100644 --- a/chromeos/network/onc/onc_utils_unittest.cc +++ b/chromeos/network/onc/onc_utils_unittest.cc @@ -59,7 +59,7 @@ class StringSubstitutionStub : public StringSubstitution { public: StringSubstitutionStub() {} virtual bool GetSubstitute(const std::string& placeholder, - std::string* substitute) const OVERRIDE { + std::string* substitute) const override { if (placeholder == ::onc::substitutes::kLoginIDField) *substitute = kLoginId; else if (placeholder ==::onc::substitutes::kEmailField) diff --git a/chromeos/network/onc/onc_validator.h b/chromeos/network/onc/onc_validator.h index 05c95d5..1108b55 100644 --- a/chromeos/network/onc/onc_validator.h +++ b/chromeos/network/onc/onc_validator.h @@ -102,7 +102,7 @@ class CHROMEOS_EXPORT Validator : public Mapper { // |signature|. On error returns NULL. virtual scoped_ptr<base::Value> MapValue(const OncValueSignature& signature, const base::Value& onc_value, - bool* error) OVERRIDE; + bool* error) override; // Dispatch to the right validation function according to // |signature|. Iterates over all fields and recursively validates/repairs @@ -111,7 +111,7 @@ class CHROMEOS_EXPORT Validator : public Mapper { virtual scoped_ptr<base::DictionaryValue> MapObject( const OncValueSignature& signature, const base::DictionaryValue& onc_object, - bool* error) OVERRIDE; + bool* error) override; // Pushes/pops the |field_name| to |path_|, otherwise like |Mapper::MapField|. virtual scoped_ptr<base::Value> MapField( @@ -119,20 +119,20 @@ class CHROMEOS_EXPORT Validator : public Mapper { const OncValueSignature& object_signature, const base::Value& onc_value, bool* found_unknown_field, - bool* error) OVERRIDE; + bool* error) override; // Ignores nested errors in NetworkConfigurations and Certificates, otherwise // like |Mapper::MapArray|. virtual scoped_ptr<base::ListValue> MapArray( const OncValueSignature& array_signature, const base::ListValue& onc_array, - bool* nested_error) OVERRIDE; + bool* nested_error) override; // Pushes/pops the index to |path_|, otherwise like |Mapper::MapEntry|. virtual scoped_ptr<base::Value> MapEntry(int index, const OncValueSignature& signature, const base::Value& onc_value, - bool* error) OVERRIDE; + bool* error) override; // This is the default validation of objects/dictionaries. Validates // |onc_object| according to |object_signature|. |result| must point to a diff --git a/chromeos/network/portal_detector/network_portal_detector.h b/chromeos/network/portal_detector/network_portal_detector.h index a42de07..640c41b 100644 --- a/chromeos/network/portal_detector/network_portal_detector.h +++ b/chromeos/network/portal_detector/network_portal_detector.h @@ -150,15 +150,15 @@ class CHROMEOS_EXPORT NetworkPortalDetectorStubImpl protected: // NetworkPortalDetector - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void AddAndFireObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; + virtual void AddObserver(Observer* observer) override; + virtual void AddAndFireObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; virtual CaptivePortalState GetCaptivePortalState( - const std::string& service_path) OVERRIDE; - virtual bool IsEnabled() OVERRIDE; - virtual void Enable(bool start_detection) OVERRIDE; - virtual bool StartDetectionIfIdle() OVERRIDE; - virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) OVERRIDE; + const std::string& service_path) override; + virtual bool IsEnabled() override; + virtual void Enable(bool start_detection) override; + virtual bool StartDetectionIfIdle() override; + virtual void SetStrategy(PortalDetectorStrategy::StrategyId id) override; private: DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorStubImpl); diff --git a/chromeos/network/portal_detector/network_portal_detector_strategy.cc b/chromeos/network/portal_detector/network_portal_detector_strategy.cc index dc9942b..5dd4590 100644 --- a/chromeos/network/portal_detector/network_portal_detector_strategy.cc +++ b/chromeos/network/portal_detector/network_portal_detector_strategy.cc @@ -28,8 +28,8 @@ class LoginScreenStrategy : public PortalDetectorStrategy { protected: // PortalDetectorStrategy overrides: - virtual StrategyId Id() const OVERRIDE { return STRATEGY_ID_LOGIN_SCREEN; } - virtual base::TimeDelta GetNextAttemptTimeoutImpl() OVERRIDE { + virtual StrategyId Id() const override { return STRATEGY_ID_LOGIN_SCREEN; } + virtual base::TimeDelta GetNextAttemptTimeoutImpl() override { if (DefaultNetwork() && delegate_->NoResponseResultCount() != 0) { int timeout = kMaxAttemptTimeoutSec; if (kMaxAttemptTimeoutSec / (delegate_->NoResponseResultCount() + 1) > @@ -56,8 +56,8 @@ class ErrorScreenStrategy : public PortalDetectorStrategy { protected: // PortalDetectorStrategy overrides: - virtual StrategyId Id() const OVERRIDE { return STRATEGY_ID_ERROR_SCREEN; } - virtual base::TimeDelta GetNextAttemptTimeoutImpl() OVERRIDE { + virtual StrategyId Id() const override { return STRATEGY_ID_ERROR_SCREEN; } + virtual base::TimeDelta GetNextAttemptTimeoutImpl() override { return base::TimeDelta::FromSeconds(kAttemptTimeoutSec); } @@ -76,8 +76,8 @@ class SessionStrategy : public PortalDetectorStrategy { virtual ~SessionStrategy() {} protected: - virtual StrategyId Id() const OVERRIDE { return STRATEGY_ID_SESSION; } - virtual base::TimeDelta GetNextAttemptTimeoutImpl() OVERRIDE { + virtual StrategyId Id() const override { return STRATEGY_ID_SESSION; } + virtual base::TimeDelta GetNextAttemptTimeoutImpl() override { int timeout; if (delegate_->NoResponseResultCount() < kMaxFastAttempts) timeout = kFastAttemptTimeoutSec; @@ -102,7 +102,7 @@ class PortalDetectorStrategy::BackoffEntryImpl : public net::BackoffEntry { virtual ~BackoffEntryImpl() {} // net::BackoffEntry overrides: - virtual base::TimeTicks ImplGetTimeNow() const OVERRIDE { + virtual base::TimeTicks ImplGetTimeNow() const override { return delegate_->GetCurrentTimeTicks(); } diff --git a/chromeos/network/shill_property_handler.cc b/chromeos/network/shill_property_handler.cc index 1f789ab..f603f52 100644 --- a/chromeos/network/shill_property_handler.cc +++ b/chromeos/network/shill_property_handler.cc @@ -87,7 +87,7 @@ class ShillPropertyObserver : public ShillPropertyChangedObserver { // ShillPropertyChangedObserver overrides. virtual void OnPropertyChanged(const std::string& key, - const base::Value& value) OVERRIDE { + const base::Value& value) override { handler_.Run(type_, path_, key, value); } diff --git a/chromeos/network/shill_property_handler.h b/chromeos/network/shill_property_handler.h index 6e92e46..e687904 100644 --- a/chromeos/network/shill_property_handler.h +++ b/chromeos/network/shill_property_handler.h @@ -137,7 +137,7 @@ class CHROMEOS_EXPORT ShillPropertyHandler // ShillPropertyChangedObserver overrides virtual void OnPropertyChanged(const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; private: typedef std::map<ManagedState::ManagedType, std::set<std::string> > diff --git a/chromeos/network/shill_property_handler_unittest.cc b/chromeos/network/shill_property_handler_unittest.cc index 6c311ea..16b607d 100644 --- a/chromeos/network/shill_property_handler_unittest.cc +++ b/chromeos/network/shill_property_handler_unittest.cc @@ -41,7 +41,7 @@ class TestListener : public internal::ShillPropertyHandler::Listener { } virtual void UpdateManagedList(ManagedState::ManagedType type, - const base::ListValue& entries) OVERRIDE { + const base::ListValue& entries) override { VLOG(1) << "UpdateManagedList[" << ManagedState::TypeToString(type) << "]: " << entries.GetSize(); UpdateEntries(GetTypeString(type), entries); @@ -50,25 +50,25 @@ class TestListener : public internal::ShillPropertyHandler::Listener { virtual void UpdateManagedStateProperties( ManagedState::ManagedType type, const std::string& path, - const base::DictionaryValue& properties) OVERRIDE { + const base::DictionaryValue& properties) override { VLOG(2) << "UpdateManagedStateProperties: " << GetTypeString(type); initial_property_updates(GetTypeString(type))[path] += 1; } - virtual void ProfileListChanged() OVERRIDE { + virtual void ProfileListChanged() override { } virtual void UpdateNetworkServiceProperty( const std::string& service_path, const std::string& key, - const base::Value& value) OVERRIDE { + const base::Value& value) override { AddPropertyUpdate(shill::kServiceCompleteListProperty, service_path); } virtual void UpdateDeviceProperty( const std::string& device_path, const std::string& key, - const base::Value& value) OVERRIDE { + const base::Value& value) override { AddPropertyUpdate(shill::kDevicesProperty, device_path); } @@ -76,27 +76,27 @@ class TestListener : public internal::ShillPropertyHandler::Listener { ManagedState::ManagedType type, const std::string& path, const std::string& ip_config_path, - const base::DictionaryValue& properties) OVERRIDE { + const base::DictionaryValue& properties) override { AddPropertyUpdate(shill::kIPConfigsProperty, ip_config_path); } - virtual void TechnologyListChanged() OVERRIDE { + virtual void TechnologyListChanged() override { VLOG(1) << "TechnologyListChanged."; ++technology_list_updates_; } virtual void CheckPortalListChanged( - const std::string& check_portal_list) OVERRIDE { + const std::string& check_portal_list) override { } virtual void ManagedStateListChanged( - ManagedState::ManagedType type) OVERRIDE { + ManagedState::ManagedType type) override { VLOG(1) << "ManagedStateListChanged: " << GetTypeString(type); AddStateListUpdate(GetTypeString(type)); } virtual void DefaultNetworkServiceChanged( - const std::string& service_path) OVERRIDE { + const std::string& service_path) override { } std::vector<std::string>& entries(const std::string& type) { @@ -175,7 +175,7 @@ class ShillPropertyHandlerTest : public testing::Test { virtual ~ShillPropertyHandlerTest() { } - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { // Initialize DBusThreadManager with a stub implementation. DBusThreadManager::Initialize(); // Get the test interface for manager / device / service and clear the @@ -196,7 +196,7 @@ class ShillPropertyHandlerTest : public testing::Test { message_loop_.RunUntilIdle(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { shill_property_handler_.reset(); listener_.reset(); DBusThreadManager::Shutdown(); diff --git a/chromeos/process_proxy/process_output_watcher_unittest.cc b/chromeos/process_proxy/process_output_watcher_unittest.cc index a3bdddf..0984ee2 100644 --- a/chromeos/process_proxy/process_output_watcher_unittest.cc +++ b/chromeos/process_proxy/process_output_watcher_unittest.cc @@ -90,7 +90,7 @@ class ProcessOutputWatcherTest : public testing::Test { virtual ~ProcessOutputWatcherTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (output_watch_thread_started_) output_watch_thread_->Stop(); } diff --git a/chromeos/process_proxy/process_proxy_unittest.cc b/chromeos/process_proxy/process_proxy_unittest.cc index 35d9cf2..cb41359 100644 --- a/chromeos/process_proxy/process_proxy_unittest.cc +++ b/chromeos/process_proxy/process_proxy_unittest.cc @@ -41,7 +41,7 @@ class RegistryTestRunner : public TestRunner { public: virtual ~RegistryTestRunner() {} - virtual void SetupExpectations(pid_t pid) OVERRIDE { + virtual void SetupExpectations(pid_t pid) override { pid_ = pid; left_to_check_index_[0] = 0; left_to_check_index_[1] = 0; @@ -60,7 +60,7 @@ class RegistryTestRunner : public TestRunner { // against two lines. The lines MUST NOT have two same characters for this // algorithm to work. virtual void OnSomeRead(pid_t pid, const std::string& type, - const std::string& output) OVERRIDE { + const std::string& output) override { EXPECT_EQ(type, kStdoutType); EXPECT_EQ(pid_, pid); @@ -79,7 +79,7 @@ class RegistryTestRunner : public TestRunner { } } - virtual void StartRegistryTest(ProcessProxyRegistry* registry) OVERRIDE { + virtual void StartRegistryTest(ProcessProxyRegistry* registry) override { for (int i = 0; i < kTestLineNum; i++) { EXPECT_TRUE(registry->SendInput(pid_, kTestLineToSend)); } @@ -118,13 +118,13 @@ class RegistryNotifiedOnProcessExitTestRunner : public TestRunner { public: virtual ~RegistryNotifiedOnProcessExitTestRunner() {} - virtual void SetupExpectations(pid_t pid) OVERRIDE { + virtual void SetupExpectations(pid_t pid) override { output_received_ = false; pid_ = pid; } virtual void OnSomeRead(pid_t pid, const std::string& type, - const std::string& output) OVERRIDE { + const std::string& output) override { EXPECT_EQ(pid_, pid); if (!output_received_) { output_received_ = true; @@ -138,7 +138,7 @@ class RegistryNotifiedOnProcessExitTestRunner : public TestRunner { base::MessageLoop::QuitClosure()); } - virtual void StartRegistryTest(ProcessProxyRegistry* registry) OVERRIDE { + virtual void StartRegistryTest(ProcessProxyRegistry* registry) override { EXPECT_TRUE(registry->SendInput(pid_, "p")); } @@ -150,12 +150,12 @@ class SigIntTestRunner : public TestRunner { public: virtual ~SigIntTestRunner() {} - virtual void SetupExpectations(pid_t pid) OVERRIDE { + virtual void SetupExpectations(pid_t pid) override { pid_ = pid; } virtual void OnSomeRead(pid_t pid, const std::string& type, - const std::string& output) OVERRIDE { + const std::string& output) override { EXPECT_EQ(pid_, pid); // We may receive ^C on stdout, but we don't care about that, as long as we // eventually received exit event. @@ -165,7 +165,7 @@ class SigIntTestRunner : public TestRunner { } } - virtual void StartRegistryTest(ProcessProxyRegistry* registry) OVERRIDE { + virtual void StartRegistryTest(ProcessProxyRegistry* registry) override { // Send SingInt and verify the process exited. EXPECT_TRUE(registry->SendInput(pid_, "\003")); } diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc index 8a2d6a8..1c8f894 100644 --- a/chromeos/settings/timezone_settings.cc +++ b/chromeos/settings/timezone_settings.cc @@ -258,12 +258,12 @@ class TimezoneSettingsBaseImpl : public chromeos::system::TimezoneSettings { virtual ~TimezoneSettingsBaseImpl(); // TimezoneSettings implementation: - virtual const icu::TimeZone& GetTimezone() OVERRIDE; - virtual base::string16 GetCurrentTimezoneID() OVERRIDE; - virtual void SetTimezoneFromID(const base::string16& timezone_id) OVERRIDE; - virtual void AddObserver(Observer* observer) OVERRIDE; - virtual void RemoveObserver(Observer* observer) OVERRIDE; - virtual const std::vector<icu::TimeZone*>& GetTimezoneList() const OVERRIDE; + virtual const icu::TimeZone& GetTimezone() override; + virtual base::string16 GetCurrentTimezoneID() override; + virtual void SetTimezoneFromID(const base::string16& timezone_id) override; + virtual void AddObserver(Observer* observer) override; + virtual void RemoveObserver(Observer* observer) override; + virtual const std::vector<icu::TimeZone*>& GetTimezoneList() const override; protected: TimezoneSettingsBaseImpl(); @@ -290,7 +290,7 @@ class TimezoneSettingsBaseImpl : public chromeos::system::TimezoneSettings { class TimezoneSettingsImpl : public TimezoneSettingsBaseImpl { public: // TimezoneSettings implementation: - virtual void SetTimezone(const icu::TimeZone& timezone) OVERRIDE; + virtual void SetTimezone(const icu::TimeZone& timezone) override; static TimezoneSettingsImpl* GetInstance(); @@ -306,7 +306,7 @@ class TimezoneSettingsImpl : public TimezoneSettingsBaseImpl { class TimezoneSettingsStubImpl : public TimezoneSettingsBaseImpl { public: // TimezoneSettings implementation: - virtual void SetTimezone(const icu::TimeZone& timezone) OVERRIDE; + virtual void SetTimezone(const icu::TimeZone& timezone) override; static TimezoneSettingsStubImpl* GetInstance(); diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc index 60b3c4b..48ff3d7 100644 --- a/chromeos/system/statistics_provider.cc +++ b/chromeos/system/statistics_provider.cc @@ -91,11 +91,11 @@ class StatisticsProviderImpl : public StatisticsProvider { // StatisticsProvider implementation: virtual void StartLoadingMachineStatistics( const scoped_refptr<base::TaskRunner>& file_task_runner, - bool load_oem_manifest) OVERRIDE; + bool load_oem_manifest) override; virtual bool GetMachineStatistic(const std::string& name, - std::string* result) OVERRIDE; - virtual bool GetMachineFlag(const std::string& name, bool* result) OVERRIDE; - virtual void Shutdown() OVERRIDE; + std::string* result) override; + virtual bool GetMachineFlag(const std::string& name, bool* result) override; + virtual void Shutdown() override; static StatisticsProviderImpl* GetInstance(); diff --git a/chromeos/tpm_token_loader.h b/chromeos/tpm_token_loader.h index 33fffa2..71eaf95 100644 --- a/chromeos/tpm_token_loader.h +++ b/chromeos/tpm_token_loader.h @@ -101,7 +101,7 @@ class CHROMEOS_EXPORT TPMTokenLoader : public LoginState::Observer { void NotifyTPMTokenReady(); // LoginState::Observer - virtual void LoggedInStateChanged() OVERRIDE; + virtual void LoggedInStateChanged() override; bool initialized_for_test_; |