chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.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: chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.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: 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 | « chrome/browser/extensions/api/bluetooth/bluetooth_api.cc ('k') | chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc

diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc

index 931dbcad48ff69bc33445e4185ebf333d7214ef1..bd7bec3e5f5ac6eb83f1079d719e8f44b3020fd8 100644

--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc

+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc

@@ -112,7 +112,12 @@ void BluetoothDeviceToApiDevice(const device::BluetoothDevice& device,

out->paired.reset(new bool(device.IsPaired()));

out->connected.reset(new bool(device.IsConnected()));

- out->uuids.reset(new std::vector<std::string>(device.GetUUIDs()));

+ std::vector<std::string>* string_uuids = new std::vector<std::string>();

+ const device::BluetoothDevice::UUIDList& uuids = device.GetUUIDs();

+ for (device::BluetoothDevice::UUIDList::const_iterator iter = uuids.begin();

+ iter != uuids.end(); ++iter)

+ string_uuids->push_back(iter->canonical_value());

+ out->uuids.reset(string_uuids);

}

void PopulateAdapterState(const device::BluetoothAdapter& adapter,