diff options
| author | armansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 04:10:38 +0000 |
|---|---|---|
| committer | armansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 04:10:38 +0000 |
| commit | 8148ad4c315725f995e52f91113203f0135add1b (patch) | |
| tree | c60f826a8201e49537874e8f9ba399af1f3dbcaa /device/bluetooth/bluetooth_device_win.h | |
| parent | b250f01e51eae5377a3419048b0fed2a17d4dea9 (diff) | |
| download | chromium_src-8148ad4c315725f995e52f91113203f0135add1b.zip chromium_src-8148ad4c315725f995e52f91113203f0135add1b.tar.gz chromium_src-8148ad4c315725f995e52f91113203f0135add1b.tar.bz2 | |
device/bluetooth: Rename device::bluetooth_utils::UUID to device::BluetoothUUID
Moved bluetooth_utils::UUID into its own file called bluetooth_uuid.h/cc as
class BluetoothUUID. This effectively removes the usage of
bluetooth_utils::CanonicalUuid.
This is a post-revert reupload of https://codereview.chromium.org/220323004/.
The CQ didn't run any Mac bots that build and run device_unittests.
BUG=358874
TEST=device_unittests, browser_tests
Review URL: https://codereview.chromium.org/224893002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth/bluetooth_device_win.h')
| -rw-r--r-- | device/bluetooth/bluetooth_device_win.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/device/bluetooth/bluetooth_device_win.h b/device/bluetooth/bluetooth_device_win.h index 80c8206..0ba0796 100644 --- a/device/bluetooth/bluetooth_device_win.h +++ b/device/bluetooth/bluetooth_device_win.h @@ -52,7 +52,7 @@ class BluetoothDeviceWin : public BluetoothDevice { const ErrorCallback& error_callback) OVERRIDE; virtual void Forget(const ErrorCallback& error_callback) OVERRIDE; virtual void ConnectToService( - const std::string& service_uuid, + const device::BluetoothUUID& service_uuid, const SocketCallback& callback) OVERRIDE; virtual void ConnectToProfile( device::BluetoothProfile* profile, @@ -69,7 +69,7 @@ class BluetoothDeviceWin : public BluetoothDevice { // Used by BluetoothProfileWin to retrieve the service record for the given // |uuid|. const BluetoothServiceRecord* GetServiceRecord( - const std::string& uuid) const; + const device::BluetoothUUID& uuid) const; protected: // BluetoothDevice override |