diff options
Diffstat (limited to 'chromeos/dbus/bluetooth_input_client.cc')
-rw-r--r-- | chromeos/dbus/bluetooth_input_client.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/chromeos/dbus/bluetooth_input_client.cc b/chromeos/dbus/bluetooth_input_client.cc index a433538..376e1de 100644 --- a/chromeos/dbus/bluetooth_input_client.cc +++ b/chromeos/dbus/bluetooth_input_client.cc @@ -36,27 +36,25 @@ class BluetoothInputClientImpl public: BluetoothInputClientImpl() : object_manager_(NULL), weak_ptr_factory_(this) {} - virtual ~BluetoothInputClientImpl() { + ~BluetoothInputClientImpl() override { object_manager_->UnregisterInterface( bluetooth_input::kBluetoothInputInterface); } // BluetoothInputClient override. - virtual void AddObserver(BluetoothInputClient::Observer* observer) - override { + void AddObserver(BluetoothInputClient::Observer* observer) override { DCHECK(observer); observers_.AddObserver(observer); } // BluetoothInputClient override. - virtual void RemoveObserver(BluetoothInputClient::Observer* observer) - override { + void RemoveObserver(BluetoothInputClient::Observer* observer) override { DCHECK(observer); observers_.RemoveObserver(observer); } // dbus::ObjectManager::Interface override. - virtual dbus::PropertySet* CreateProperties( + dbus::PropertySet* CreateProperties( dbus::ObjectProxy* object_proxy, const dbus::ObjectPath& object_path, const std::string& interface_name) override { @@ -70,8 +68,7 @@ class BluetoothInputClientImpl } // BluetoothInputClient override. - virtual Properties* GetProperties(const dbus::ObjectPath& object_path) - override { + Properties* GetProperties(const dbus::ObjectPath& object_path) override { return static_cast<Properties*>( object_manager_->GetProperties( object_path, @@ -79,7 +76,7 @@ class BluetoothInputClientImpl } protected: - virtual void Init(dbus::Bus* bus) override { + void Init(dbus::Bus* bus) override { object_manager_ = bus->GetObjectManager( bluetooth_object_manager::kBluetoothObjectManagerServiceName, dbus::ObjectPath( @@ -91,16 +88,16 @@ class BluetoothInputClientImpl private: // 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 { + void ObjectAdded(const dbus::ObjectPath& object_path, + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_, InputAdded(object_path)); } // 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 { + void ObjectRemoved(const dbus::ObjectPath& object_path, + const std::string& interface_name) override { FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_, InputRemoved(object_path)); } |