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

Unified Diff: device/bluetooth/bluetooth_device_chromeos.cc

Issue 14316006: Bluetooth: Show trusted devices as paired. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 8 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 | « device/bluetooth/bluetooth_device_chromeos.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_device_chromeos.cc
diff --git a/device/bluetooth/bluetooth_device_chromeos.cc b/device/bluetooth/bluetooth_device_chromeos.cc
index 0d87b18694a17de8966d7674aee1cba8e931c8e8..b456cf4a011dde707ef312023d4342de4680121c 100644
--- a/device/bluetooth/bluetooth_device_chromeos.cc
+++ b/device/bluetooth/bluetooth_device_chromeos.cc
@@ -52,6 +52,7 @@ BluetoothDeviceChromeOS::BluetoothDeviceChromeOS(
adapter_(adapter),
bluetooth_class_(0),
paired_(false),
+ trusted_(false),
connected_(false),
connectable_(true),
connecting_(false),
@@ -78,7 +79,7 @@ std::string BluetoothDeviceChromeOS::GetAddress() const {
}
bool BluetoothDeviceChromeOS::IsPaired() const {
- return paired_;
+ return paired_ || trusted_;
}
bool BluetoothDeviceChromeOS::IsConnected() const {
@@ -390,6 +391,7 @@ void BluetoothDeviceChromeOS::Update(
base::Bind(&base::DoNothing));
paired_ = properties->paired.value();
+ trusted_ = properties->trusted.value();
connected_ = properties->connected.value();
}
}
« no previous file with comments | « device/bluetooth/bluetooth_device_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698