Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(683)

Unified Diff: device/bluetooth/bluetooth_profile_chromeos.h

Issue 220323004: device/bluetooth: Rename device::bluetooth_utils::UUID to device::BluetoothUUID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Initialized |empty_device_| in BluetoothDeviceWinTest. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_profile.cc ('k') | device/bluetooth/bluetooth_profile_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_profile_chromeos.h
diff --git a/device/bluetooth/bluetooth_profile_chromeos.h b/device/bluetooth/bluetooth_profile_chromeos.h
index 84b70433101fc635962d4920d4e5d37d42e32511..f7974f2e9ff93326520a705a5aa4e329f2538d52 100644
--- a/device/bluetooth/bluetooth_profile_chromeos.h
+++ b/device/bluetooth/bluetooth_profile_chromeos.h
@@ -17,6 +17,7 @@
#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 {
@@ -39,7 +40,7 @@ class CHROMEOS_EXPORT BluetoothProfileChromeOS
const ConnectionCallback& callback) OVERRIDE;
// Return the UUID of the profile.
- const std::string& uuid() const { return uuid_; }
+ const device::BluetoothUUID& uuid() const { return uuid_; }
private:
friend class BluetoothProfile;
@@ -50,7 +51,7 @@ class CHROMEOS_EXPORT BluetoothProfileChromeOS
// Called by BluetoothProfile::Register to initialize the profile object
// asynchronously. |uuid|, |options| and |callback| are the arguments to
// BluetoothProfile::Register.
- void Init(const std::string& uuid,
+ void Init(const device::BluetoothUUID& uuid,
const device::BluetoothProfile::Options& options,
const ProfileCallback& callback);
@@ -105,7 +106,7 @@ class CHROMEOS_EXPORT BluetoothProfileChromeOS
scoped_ptr<dbus::FileDescriptor> fd);
// UUID of the profile passed during initialization.
- std::string uuid_;
+ device::BluetoothUUID uuid_;
// Copy of the profile options passed during initialization.
BluetoothProfileManagerClient::Options options_;
« no previous file with comments | « device/bluetooth/bluetooth_profile.cc ('k') | device/bluetooth/bluetooth_profile_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698