| Index: chrome/browser/chromeos/dbus/bluetooth_adapter_client.h
|
| diff --git a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h b/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h
|
| index e7401007e942e7e8b88df59462099f4c581c3fc0..2e7e0f0ccab1d3673e912fdc626d061586f88131 100644
|
| --- a/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h
|
| +++ b/chrome/browser/chromeos/dbus/bluetooth_adapter_client.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/callback.h"
|
| #include "base/observer_list.h"
|
| #include "base/values.h"
|
| +#include "dbus/object_path.h"
|
|
|
| namespace dbus {
|
| class Bus;
|
| @@ -30,25 +31,25 @@ class BluetoothAdapterClient {
|
| virtual ~Observer() {}
|
|
|
| // Called when a new known device has been created.
|
| - virtual void DeviceCreated(const std::string& object_path,
|
| - const std::string& device_path) {}
|
| + virtual void DeviceCreated(const dbus::ObjectPath& object_path,
|
| + const dbus::ObjectPath& device_path) {}
|
|
|
| // Called when a previously known device is removed.
|
| - virtual void DeviceRemoved(const std::string& object_path,
|
| - const std::string& device_path) {}
|
| + virtual void DeviceRemoved(const dbus::ObjectPath& object_path,
|
| + const dbus::ObjectPath& device_path) {}
|
|
|
| // Called when the adapter's Discovering property changes.
|
| - virtual void DiscoveringPropertyChanged(const std::string& object_path,
|
| + virtual void DiscoveringPropertyChanged(const dbus::ObjectPath& object_path,
|
| bool discovering) {}
|
|
|
| // Called when a new remote device has been discovered.
|
| // |device_properties| should be copied if needed.
|
| - virtual void DeviceFound(const std::string& object_path,
|
| + virtual void DeviceFound(const dbus::ObjectPath& object_path,
|
| const std::string& address,
|
| const DictionaryValue& device_properties) {}
|
|
|
| // Called when a previously discovered device is no longer visible.
|
| - virtual void DeviceDisappeared(const std::string& object_path,
|
| + virtual void DeviceDisappeared(const dbus::ObjectPath& object_path,
|
| const std::string& address) {}
|
| };
|
|
|
| @@ -60,11 +61,11 @@ class BluetoothAdapterClient {
|
| virtual void RemoveObserver(Observer* observer) = 0;
|
|
|
| // Starts a device discovery on the adapter with object path |object_path|.
|
| - virtual void StartDiscovery(const std::string& object_path) = 0;
|
| + virtual void StartDiscovery(const dbus::ObjectPath& object_path) = 0;
|
|
|
| // Cancels any previous device discovery on the adapter with object path
|
| // |object_path|.
|
| - virtual void StopDiscovery(const std::string& object_path) = 0;
|
| + virtual void StopDiscovery(const dbus::ObjectPath& object_path) = 0;
|
|
|
| // Creates the instance.
|
| static BluetoothAdapterClient* Create(dbus::Bus* bus,
|
|
|