Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(564)

Side by Side Diff: extensions/browser/api/bluetooth/bluetooth_api_utils.cc

Issue 735893002: Add GetConnectionInfo function for BluetoothDevice, replacing the existing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
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 "extensions/browser/api/bluetooth/bluetooth_api_utils.h" 5 #include "extensions/browser/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 "device/bluetooth/bluetooth_adapter.h" 9 #include "device/bluetooth/bluetooth_adapter.h"
10 #include "device/bluetooth/bluetooth_device.h" 10 #include "device/bluetooth/bluetooth_device.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 int rssi = device.GetRSSI();
116 if (rssi != BluetoothDevice::kUnknownPower)
117 out->rssi.reset(new int(rssi));
118
119 if (*out->connected) {
120 int current_transmit_power = device.GetCurrentHostTransmitPower();
121 if (current_transmit_power != BluetoothDevice::kUnknownPower)
122 out->current_host_transmit_power.reset(new int(current_transmit_power));
123 int maximum_transmit_power = device.GetMaximumHostTransmitPower();
124 if (maximum_transmit_power != BluetoothDevice::kUnknownPower)
125 out->maximum_host_transmit_power.reset(new int(maximum_transmit_power));
126 }
Ilya Sherman 2014/11/19 22:18:07 Do you want to remove these from the IDL as well?
Tim Song 2014/12/06 00:51:38 Done.
127
128 std::vector<std::string>* string_uuids = new std::vector<std::string>(); 115 std::vector<std::string>* string_uuids = new std::vector<std::string>();
129 const device::BluetoothDevice::UUIDList& uuids = device.GetUUIDs(); 116 const device::BluetoothDevice::UUIDList& uuids = device.GetUUIDs();
130 for (device::BluetoothDevice::UUIDList::const_iterator iter = uuids.begin(); 117 for (device::BluetoothDevice::UUIDList::const_iterator iter = uuids.begin();
131 iter != uuids.end(); ++iter) 118 iter != uuids.end(); ++iter)
132 string_uuids->push_back(iter->canonical_value()); 119 string_uuids->push_back(iter->canonical_value());
133 out->uuids.reset(string_uuids); 120 out->uuids.reset(string_uuids);
134 } 121 }
135 122
136 void PopulateAdapterState(const device::BluetoothAdapter& adapter, 123 void PopulateAdapterState(const device::BluetoothAdapter& adapter,
137 AdapterState* out) { 124 AdapterState* out) {
138 out->discovering = adapter.IsDiscovering(); 125 out->discovering = adapter.IsDiscovering();
139 out->available = adapter.IsPresent(); 126 out->available = adapter.IsPresent();
140 out->powered = adapter.IsPowered(); 127 out->powered = adapter.IsPowered();
141 out->name = adapter.GetName(); 128 out->name = adapter.GetName();
142 out->address = adapter.GetAddress(); 129 out->address = adapter.GetAddress();
143 } 130 }
144 131
145 } // namespace bluetooth 132 } // namespace bluetooth
146 } // namespace core_api 133 } // namespace core_api
147 } // namespace extensions 134 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698