| Index: chrome/browser/chromeos/dbus/bluetooth_manager_client.h
|
| diff --git a/chrome/browser/chromeos/dbus/bluetooth_manager_client.h b/chrome/browser/chromeos/dbus/bluetooth_manager_client.h
|
| index 394f9c9e6acdcd95279f59301f038d3a1c63294b..a74f925a1edf6835bc977de516aea2c18bae8ad1 100644
|
| --- a/chrome/browser/chromeos/dbus/bluetooth_manager_client.h
|
| +++ b/chrome/browser/chromeos/dbus/bluetooth_manager_client.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "base/callback.h"
|
| #include "base/observer_list.h"
|
| +#include "dbus/object_path.h"
|
|
|
| namespace dbus {
|
| class Bus;
|
| @@ -28,16 +29,16 @@ class BluetoothManagerClient {
|
|
|
| // Called when a local bluetooth adapter is added.
|
| // |object_path| is the dbus object path of the adapter.
|
| - virtual void AdapterAdded(const std::string& object_path) {}
|
| + virtual void AdapterAdded(const dbus::ObjectPath& object_path) {}
|
|
|
| // Called when a local bluetooth adapter is removed.
|
| // |object_path| is the dbus object path of the adapter.
|
| - virtual void AdapterRemoved(const std::string& object_path) {}
|
| + virtual void AdapterRemoved(const dbus::ObjectPath& object_path) {}
|
|
|
| // Called when the default local bluetooth adapter changes.
|
| - // |adapter| is the dbus object path of the new default adapter.
|
| + // |object_path| is the dbus object path of the new default adapter.
|
| // Not called if all adapters are removed.
|
| - virtual void DefaultAdapterChanged(const std::string& adapter) {}
|
| + virtual void DefaultAdapterChanged(const dbus::ObjectPath& object_path) {}
|
| };
|
|
|
| virtual ~BluetoothManagerClient();
|
| @@ -47,9 +48,9 @@ class BluetoothManagerClient {
|
| virtual void RemoveObserver(Observer* observer) = 0;
|
|
|
| // The DefaultAdapterCallback receives two arguments:
|
| - // std::string adapter - the unique identifier of the default adapter
|
| + // dbus::ObjectPath object_path - the path of the new default adapter
|
| // bool success - whether or not the request succeeded
|
| - typedef base::Callback<void(const std::string&, bool)>
|
| + typedef base::Callback<void(const dbus::ObjectPath&, bool)>
|
| DefaultAdapterCallback;
|
|
|
| // Retrieves the dbus object path for the default adapter.
|
|
|