Bluetooth: call DeviceChanged observer method on IsConnecting() change

device/bluetooth/bluetooth_device_experimental_chromeos.cc

 // Copyright (c) 2013 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_experimental_chromeos.h"
 
 #include "base/bind.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/experimental_bluetooth_adapter_client.h"
 #include "chromeos/dbus/experimental_bluetooth_agent_manager_client.h"
@@ skipping 120 matching lines @@
 }
 
 bool BluetoothDeviceExperimentalChromeOS::ExpectingConfirmation() const {
   return !confirmation_callback_.is_null();
 }
 
 void BluetoothDeviceExperimentalChromeOS::Connect(
     BluetoothDevice::PairingDelegate* pairing_delegate,
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback) {
-  ++num_connecting_calls_;
+  if (num_connecting_calls_++ == 0)
+    adapter_->NotifyDeviceChanged(this);
+
   VLOG(1) << object_path_.value() << ": Connecting, " << num_connecting_calls_
           << " in progress";
 
   if (IsPaired() || IsConnected() || !pairing_delegate || !IsPairable()) {
     // No need to pair, or unable to, skip straight to connection.
     ConnectInternal(callback, error_callback);
   } else {
     // Initiate high-security connection with pairing.
     DCHECK(!pairing_delegate_);
     DCHECK(agent_.get() == NULL);
@@ skipping 233 matching lines @@
               weak_ptr_factory_.GetWeakPtr(),
               callback),
           base::Bind(
               &BluetoothDeviceExperimentalChromeOS::OnConnectError,
               weak_ptr_factory_.GetWeakPtr(),
               error_callback));
 }
 
 void BluetoothDeviceExperimentalChromeOS::OnConnect(
     const base::Closure& callback) {
-  --num_connecting_calls_;
+  if (--num_connecting_calls_ == 0)
+    adapter_->NotifyDeviceChanged(this);
+
   DCHECK(num_connecting_calls_ >= 0);
   VLOG(1) << object_path_.value() << ": Connected, " << num_connecting_calls_
         << " still in progress";
 
   SetTrusted();
 
   callback.Run();
 }
 
 void BluetoothDeviceExperimentalChromeOS::OnConnectError(
     const ConnectErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
-  --num_connecting_calls_;
+  if (--num_connecting_calls_ == 0)
+    adapter_->NotifyDeviceChanged(this);
+
   DCHECK(num_connecting_calls_ >= 0);
   LOG(WARNING) << object_path_.value() << ": Failed to connect device: "
                << error_name << ": " << error_message;
   VLOG(1) << object_path_.value() << ": " << num_connecting_calls_
           << " still in progress";
 
   // Determine the error code from error_name.
   ConnectErrorCode error_code = ERROR_UNKNOWN;
   if (error_name == bluetooth_adapter::kErrorFailed) {
     error_code = ERROR_FAILED;
@@ skipping 20 matching lines @@
            base::Bind(
                &BluetoothDeviceExperimentalChromeOS::OnPairError,
                weak_ptr_factory_.GetWeakPtr(),
                error_callback));
 }
 
 void BluetoothDeviceExperimentalChromeOS::OnRegisterAgentError(
     const ConnectErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
-  --num_connecting_calls_;
+  if (--num_connecting_calls_ == 0)
+    adapter_->NotifyDeviceChanged(this);
+
   DCHECK(num_connecting_calls_ >= 0);
   LOG(WARNING) << object_path_.value() << ": Failed to register agent: "
                << error_name << ": " << error_message;
   VLOG(1) << object_path_.value() << ": " << num_connecting_calls_
           << " still in progress";
 
   UnregisterAgent();
 
   // Determine the error code from error_name.
   ConnectErrorCode error_code = ERROR_UNKNOWN;
   if (error_name == bluetooth_adapter::kErrorAlreadyExists)
     error_code = ERROR_INPROGRESS;
 
   error_callback.Run(error_code);
 }
 
 void BluetoothDeviceExperimentalChromeOS::OnPair(
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback) {
   VLOG(1) << object_path_.value() << ": Paired";
   UnregisterAgent();
   SetTrusted();
   ConnectInternal(callback, error_callback);
 }
 
 void BluetoothDeviceExperimentalChromeOS::OnPairError(
     const ConnectErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
-  --num_connecting_calls_;
+  if (--num_connecting_calls_ == 0)
+    adapter_->NotifyDeviceChanged(this);
+
   DCHECK(num_connecting_calls_ >= 0);
   LOG(WARNING) << object_path_.value() << ": Failed to pair device: "
                << error_name << ": " << error_message;
   VLOG(1) << object_path_.value() << ": " << num_connecting_calls_
           << " still in progress";
 
   UnregisterAgent();
 
   // Determine the error code from error_name.
   ConnectErrorCode error_code = ERROR_UNKNOWN;
@@ skipping 112 matching lines @@
   if (!confirmation_callback_.is_null()) {
     confirmation_callback_.Run(status);
     confirmation_callback_.Reset();
     callback_run = true;
   }
 
   return callback_run;
 }
 
 }  // namespace chromeos