Index: chrome/browser/extensions/api/bluetooth/bluetooth_api.cc |
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc |
index ea750a3ae14d92fc51903aaf8ac35bf920519872..85f102ab677448313376d222b385031ec7dca263 100644 |
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc |
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc |
@@ -22,10 +22,12 @@ |
#include "base/safe_strerror_posix.h" |
#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h" |
#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h" |
+#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h" |
#include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h" |
#include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h" |
#include "chrome/browser/chromeos/extensions/bluetooth_event_router.h" |
#include "chromeos/dbus/bluetooth_out_of_band_client.h" |
+#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h" |
namespace { |
@@ -110,8 +112,7 @@ void BluetoothGetDevicesFunction::DispatchDeviceSearchResult( |
} |
void BluetoothGetDevicesFunction::ProvidesServiceCallback( |
- const chromeos::BluetoothDevice* device, |
- bool providesService) { |
+ const chromeos::BluetoothDevice* device, bool providesService) { |
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
CHECK(device); |
@@ -144,7 +145,7 @@ bool BluetoothGetDevicesFunction::RunImpl() { |
chromeos::BluetoothAdapter::DeviceList devices = |
GetMutableAdapter(profile())->GetDevices(); |
for (chromeos::BluetoothAdapter::DeviceList::iterator i = devices.begin(); |
- i != devices.end(); ++i) { |
+ i != devices.end(); ++i) { |
bryeung
2012/09/18 19:18:39
is that actually the style guide? I can't find it
youngki
2012/09/19 01:13:55
I also couldn't find it in chrome style guide; Als
|
chromeos::BluetoothDevice* device = *i; |
CHECK(device); |
@@ -178,7 +179,7 @@ void BluetoothGetServicesFunction::GetServiceRecordsCallback( |
base::ListValue* services, |
const chromeos::BluetoothDevice::ServiceRecordList& records) { |
for (chromeos::BluetoothDevice::ServiceRecordList::const_iterator i = |
- records.begin(); i != records.end(); ++i) { |
+ records.begin(); i != records.end(); ++i) { |
const chromeos::BluetoothServiceRecord& record = **i; |
experimental_bluetooth::ServiceRecord api_record; |
api_record.name = record.name(); |