| Index: trunk/src/device/bluetooth/bluetooth_profile_chromeos.h
|
| ===================================================================
|
| --- trunk/src/device/bluetooth/bluetooth_profile_chromeos.h (revision 261569)
|
| +++ trunk/src/device/bluetooth/bluetooth_profile_chromeos.h (working copy)
|
| @@ -17,7 +17,6 @@
|
| #include "dbus/object_path.h"
|
| #include "device/bluetooth/bluetooth_adapter.h"
|
| #include "device/bluetooth/bluetooth_profile.h"
|
| -#include "device/bluetooth/bluetooth_uuid.h"
|
|
|
| namespace dbus {
|
|
|
| @@ -40,7 +39,7 @@
|
| const ConnectionCallback& callback) OVERRIDE;
|
|
|
| // Return the UUID of the profile.
|
| - const device::BluetoothUUID& uuid() const { return uuid_; }
|
| + const std::string& uuid() const { return uuid_; }
|
|
|
| private:
|
| friend class BluetoothProfile;
|
| @@ -51,7 +50,7 @@
|
| // Called by BluetoothProfile::Register to initialize the profile object
|
| // asynchronously. |uuid|, |options| and |callback| are the arguments to
|
| // BluetoothProfile::Register.
|
| - void Init(const device::BluetoothUUID& uuid,
|
| + void Init(const std::string& uuid,
|
| const device::BluetoothProfile::Options& options,
|
| const ProfileCallback& callback);
|
|
|
| @@ -106,7 +105,7 @@
|
| scoped_ptr<dbus::FileDescriptor> fd);
|
|
|
| // UUID of the profile passed during initialization.
|
| - device::BluetoothUUID uuid_;
|
| + std::string uuid_;
|
|
|
| // Copy of the profile options passed during initialization.
|
| BluetoothProfileManagerClient::Options options_;
|
|
|