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

Unified Diff: device/bluetooth/bluetooth_device_chromeos.cc

Issue 12374062: Bluetooth: Send UI notifications when the connecting status changes. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: DeviceChanged moved in adapter and nits 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
Index: device/bluetooth/bluetooth_device_chromeos.cc
diff --git a/device/bluetooth/bluetooth_device_chromeos.cc b/device/bluetooth/bluetooth_device_chromeos.cc
index b456cf4a011dde707ef312023d4342de4680121c..589a5bf47e42afddbe23abf9092fdfaaf9ccee3a 100644
--- a/device/bluetooth/bluetooth_device_chromeos.cc
+++ b/device/bluetooth/bluetooth_device_chromeos.cc
@@ -148,6 +148,10 @@ void BluetoothDeviceChromeOS::Connect(
// This is safe because Connect() and its callbacks are called in the same
// thread.
connecting_calls_++;
+ if (!connecting_) {
+ connecting_ = true;
+ adapter_->NotifyDeviceChanged(this);
+ }
connecting_ = !!connecting_calls_;
// Set the decrement to be issued when either callback is called.
base::Closure wrapped_callback = base::Bind(
@@ -524,18 +528,22 @@ void BluetoothDeviceChromeOS::OnGetServiceRecordsError(
void BluetoothDeviceChromeOS::OnConnectCallbackCalled(
const base::Closure& callback) {
// Update the connecting status.
+ bool prev_connecting = connecting_;
connecting_calls_--;
connecting_ = !!connecting_calls_;
callback.Run();
+ if (prev_connecting != connecting_) adapter_->NotifyDeviceChanged(this);
}
void BluetoothDeviceChromeOS::OnConnectErrorCallbackCalled(
const ConnectErrorCallback& error_callback,
enum ConnectErrorCode error_code) {
// Update the connecting status.
+ bool prev_connecting = connecting_;
connecting_calls_--;
connecting_ = !!connecting_calls_;
error_callback.Run(error_code);
+ if (prev_connecting != connecting_) adapter_->NotifyDeviceChanged(this);
}
void BluetoothDeviceChromeOS::ConnectApplications(

Powered by Google App Engine
This is Rietveld 408576698