device/bluetooth/bluetooth_service_record_win.cc - 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_service_record_win.cc

Issue 220323004: device/bluetooth: Rename device::bluetooth_utils::UUID to device::BluetoothUUID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased on top of recent change by tengs@. 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

« chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc ('K') | « device/bluetooth/bluetooth_service_record_mac.mm ('k') | device/bluetooth/bluetooth_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_service_record_win.cc

diff --git a/device/bluetooth/bluetooth_service_record_win.cc b/device/bluetooth/bluetooth_service_record_win.cc

index e0ba750f2972e5e347611a5df0d1e6009842d2e1..430978f0e35f54f49b8ee8e3b8b29e8437b9a7b8 100644

--- a/device/bluetooth/bluetooth_service_record_win.cc

+++ b/device/bluetooth/bluetooth_service_record_win.cc

@@ -143,8 +143,10 @@ BluetoothServiceRecordWin::BluetoothServiceRecordWin(

blob_size,

kUuidId,

&uuid_data)) {

- ExtractUuid(uuid_data, &uuid_);

+ std::string uuid_str;

+ ExtractUuid(uuid_data, &uuid_str);

+ uuid_ = BluetoothUUID(uuid_str);

}

-} // namespace device

+} // namespace device