Bluetooth: Send UI notifications when the connecting status changes.

device/bluetooth/bluetooth_device_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_device_chromeos.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 100 matching lines @@
   return !confirmation_callback_.is_null();
 }
 
 void BluetoothDeviceChromeOS::Connect(
     PairingDelegate* pairing_delegate,
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback) {
   // This is safe because Connect() and its callbacks are called in the same
   // thread.
   connecting_calls_++;
+  if (connecting_calls_ != 0 && !connecting_) {

[keybuk, 2013/04/18 00:52:24]

How can connecting calls be zero if you just incremented it? :)

[deymo, 2013/04/18 01:38:40]

Probably it can't. I just translated this:
if (invariant is false) { fix it! and notify }

Done.

+    connecting_ = true;
+    adapter_->DeviceChanged(this);
+  }
   connecting_ = !!connecting_calls_;
   // Set the decrement to be issued when either callback is called.
   base::Closure wrapped_callback = base::Bind(
       &BluetoothDeviceChromeOS::OnConnectCallbackCalled,
       weak_ptr_factory_.GetWeakPtr(),
       callback);
   ConnectErrorCallback wrapped_error_callback = base::Bind(
       &BluetoothDeviceChromeOS::OnConnectErrorCallbackCalled,
       weak_ptr_factory_.GetWeakPtr(),
       error_callback);
@@ skipping 383 matching lines @@
   if (service_records_loaded_) {
     callback.Run(service_records_);
   } else {
     error_callback.Run();
   }
 }
 
 void BluetoothDeviceChromeOS::OnConnectCallbackCalled(
     const base::Closure& callback) {
   // Update the connecting status.
+  bool prev_connecting = !!connecting_calls_;
   connecting_calls_--;
   connecting_ = !!connecting_calls_;
   callback.Run();
+  if (prev_connecting != connecting_) adapter_->DeviceChanged(this);
 }
 
 void BluetoothDeviceChromeOS::OnConnectErrorCallbackCalled(
     const ConnectErrorCallback& error_callback,
     enum ConnectErrorCode error_code) {
   // Update the connecting status.
+  bool prev_connecting = !!connecting_calls_;
   connecting_calls_--;
   connecting_ = !!connecting_calls_;
   error_callback.Run(error_code);
+  if (prev_connecting != connecting_) adapter_->DeviceChanged(this);
 }
 
 void BluetoothDeviceChromeOS::ConnectApplications(
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback) {
   // Introspect the device object to determine supported applications.
   DBusThreadManager::Get()->GetIntrospectableClient()->
       Introspect(bluetooth_device::kBluetoothDeviceServiceName,
                  object_path_,
                  base::Bind(&BluetoothDeviceChromeOS::OnIntrospect,
@@ skipping 301 matching lines @@
 }
 
 
 // static
 BluetoothDeviceChromeOS* BluetoothDeviceChromeOS::Create(
     BluetoothAdapterChromeOS* adapter) {
   return new BluetoothDeviceChromeOS(adapter);
 }
 
 }  // namespace chromeos