summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_device_mac.h
diff options
context:
space:
mode:
authorarmansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-04 04:10:38 +0000
committerarmansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-04 04:10:38 +0000
commit8148ad4c315725f995e52f91113203f0135add1b (patch)
treec60f826a8201e49537874e8f9ba399af1f3dbcaa /device/bluetooth/bluetooth_device_mac.h
parentb250f01e51eae5377a3419048b0fed2a17d4dea9 (diff)
downloadchromium_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_mac.h')
-rw-r--r--device/bluetooth/bluetooth_device_mac.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/device/bluetooth/bluetooth_device_mac.h b/device/bluetooth/bluetooth_device_mac.h
index a953749..f610f24 100644
--- a/device/bluetooth/bluetooth_device_mac.h
+++ b/device/bluetooth/bluetooth_device_mac.h
@@ -52,7 +52,7 @@ class BluetoothDeviceMac : 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,