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

Unified Diff: components/arc/bluetooth/arc_bluetooth_bridge.cc

Issue 2083423004: arc/bluetooth: plumb adapter discoverable timeout property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-discoverable-timeout
Patch Set: add external gyp dependency Created 4 years, 6 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
« components/arc.gypi ('K') | « components/arc.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/bluetooth/arc_bluetooth_bridge.cc
diff --git a/components/arc/bluetooth/arc_bluetooth_bridge.cc b/components/arc/bluetooth/arc_bluetooth_bridge.cc
index b17ea3c835159d42064efa96b22dca7b72202501..bc9703dc72aabd33b34da26114a02904d0344ac6 100644
--- a/components/arc/bluetooth/arc_bluetooth_bridge.cc
+++ b/components/arc/bluetooth/arc_bluetooth_bridge.cc
@@ -27,6 +27,7 @@
#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
#include "device/bluetooth/bluetooth_remote_gatt_service.h"
+#include "device/bluetooth/bluez/bluetooth_adapter_bluez.h"
using device::BluetoothAdapter;
using device::BluetoothAdapterFactory;
@@ -1185,7 +1186,8 @@ ArcBluetoothBridge::GetAdapterProperties(
if (type == mojom::BluetoothPropertyType::ALL ||
type == mojom::BluetoothPropertyType::ADAPTER_DISCOVERY_TIMEOUT) {
mojom::BluetoothPropertyPtr btp = mojom::BluetoothProperty::New();
- btp->set_discovery_timeout(120);
+ btp->set_discovery_timeout(static_cast<bluez::BluetoothAdapterBlueZ*>(
Ken Rockot(use gerrit already) 2016/06/27 17:10:49 drive-by comment: could you just store bluetooth_a
+ bluetooth_adapter_.get())->GetDiscoverableTimeout());
properties.push_back(std::move(btp));
}
« components/arc.gypi ('K') | « components/arc.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698