device/bluetooth/bluetooth_profile_mac.mm - Issue 220323004: device/bluetooth: Rename device::bluetooth_utils::UUID to device::BluetoothUUID

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_profile_mac.mm

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

Index: device/bluetooth/bluetooth_profile_mac.mm

diff --git a/device/bluetooth/bluetooth_profile_mac.mm b/device/bluetooth/bluetooth_profile_mac.mm

index 4956651eac6cd0fdae94863caed6478482fed589..54781e4e6e263cb5c483a5cf5b9fee9786fb8376 100644

--- a/device/bluetooth/bluetooth_profile_mac.mm

+++ b/device/bluetooth/bluetooth_profile_mac.mm

@@ -46,7 +46,7 @@ IOBluetoothSDPUUID* GetIOBluetoothSDPUUID(const std::string& uuid) {

namespace device {

-BluetoothProfileMac::BluetoothProfileMac(const std::string& uuid,

+BluetoothProfileMac::BluetoothProfileMac(const BluetoothUUID& uuid,

const std::string& name)

: BluetoothProfile(), uuid_(uuid), name_(name) {

}

@@ -68,7 +68,8 @@ bool BluetoothProfileMac::Connect(IOBluetoothDevice* device) {

return false;

IOBluetoothSDPServiceRecord* record =

- [device getServiceRecordForUUID:GetIOBluetoothSDPUUID(uuid_)];

+ [device getServiceRecordForUUID:GetIOBluetoothSDPUUID(

+ uuid_.canonical_value())];

if (record != nil) {

scoped_refptr<BluetoothSocket> socket(

BluetoothSocketMac::CreateBluetoothSocket(record));

« no previous file with comments | « device/bluetooth/bluetooth_profile_mac.h ('k') | device/bluetooth/bluetooth_profile_win.h » ('j') | no next file with comments »