OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h" | 5 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/common/extensions/api/bluetooth.h" | 9 #include "chrome/common/extensions/api/bluetooth.h" |
10 #include "device/bluetooth/bluetooth_adapter.h" | 10 #include "device/bluetooth/bluetooth_adapter.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 out->vendor_id.reset(new int(device.GetVendorID())); | 105 out->vendor_id.reset(new int(device.GetVendorID())); |
106 out->product_id.reset(new int(device.GetProductID())); | 106 out->product_id.reset(new int(device.GetProductID())); |
107 out->device_id.reset(new int(device.GetDeviceID())); | 107 out->device_id.reset(new int(device.GetDeviceID())); |
108 } | 108 } |
109 | 109 |
110 ConvertDeviceTypeToApi(device.GetDeviceType(), &(out->type)); | 110 ConvertDeviceTypeToApi(device.GetDeviceType(), &(out->type)); |
111 | 111 |
112 out->paired.reset(new bool(device.IsPaired())); | 112 out->paired.reset(new bool(device.IsPaired())); |
113 out->connected.reset(new bool(device.IsConnected())); | 113 out->connected.reset(new bool(device.IsConnected())); |
114 | 114 |
115 out->uuids.reset(new std::vector<std::string>(device.GetUUIDs())); | 115 std::vector<std::string>* string_uuids = new std::vector<std::string>(); |
| 116 const device::BluetoothDevice::UUIDList& uuids = device.GetUUIDs(); |
| 117 for (device::BluetoothDevice::UUIDList::const_iterator iter = uuids.begin(); |
| 118 iter != uuids.end(); ++iter) |
| 119 string_uuids->push_back(iter->canonical_value()); |
| 120 out->uuids.reset(string_uuids); |
116 } | 121 } |
117 | 122 |
118 void PopulateAdapterState(const device::BluetoothAdapter& adapter, | 123 void PopulateAdapterState(const device::BluetoothAdapter& adapter, |
119 AdapterState* out) { | 124 AdapterState* out) { |
120 out->discovering = adapter.IsDiscovering(); | 125 out->discovering = adapter.IsDiscovering(); |
121 out->available = adapter.IsPresent(); | 126 out->available = adapter.IsPresent(); |
122 out->powered = adapter.IsPowered(); | 127 out->powered = adapter.IsPowered(); |
123 out->name = adapter.GetName(); | 128 out->name = adapter.GetName(); |
124 out->address = adapter.GetAddress(); | 129 out->address = adapter.GetAddress(); |
125 } | 130 } |
126 | 131 |
127 } // namespace bluetooth | 132 } // namespace bluetooth |
128 } // namespace api | 133 } // namespace api |
129 } // namespace extensions | 134 } // namespace extensions |
OLD | NEW |