Bluetooth: Send UI notifications when the connecting status changes.

device/bluetooth/bluetooth_adapter_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_adapter_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 216 matching lines @@
 void BluetoothAdapterChromeOS::PoweredChanged(bool powered) {
   if (powered == powered_)
     return;
 
   powered_ = powered;
 
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                     AdapterPoweredChanged(this, powered_));
 }
 
+void BluetoothAdapterChromeOS::NotifyDeviceChanged(
+    BluetoothDeviceChromeOS* device) {
+  CHECK(device->adapter_ == this);

[keybuk, 2013/04/19 20:48:53]

this must be a DCHECK...

please fix in a follow-up commit

[deymo, 2013/04/19 21:05:43]

Done.

+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
+                    DeviceChanged(this, device));
+}
+
 void BluetoothAdapterChromeOS::OnStartDiscovery(
     const base::Closure& callback,
     const ErrorCallback& error_callback,
     const dbus::ObjectPath& adapter_path,
     bool success) {
   if (success) {
     if (discovering_count_++ == 0) {
       VLOG(1) << object_path_.value() << ": started discovery.";
 
       // Clear devices found in previous discovery attempts
@@ skipping 112 matching lines @@
     devices_[address] = device;
   }
 
   if (!device->HasObjectPath()) {
     VLOG(1) << "Assigned object path " << device_path.value() << " to device "
             << address;
     device->SetObjectPath(device_path);
   }
   device->Update(properties, true);
 
-  if (update_device) {
-    FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                      DeviceChanged(this, device));
-  } else {
+  if (update_device)
+    NotifyDeviceChanged(device);
+  else {
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceAdded(this, device));
   }
 }
 
 void BluetoothAdapterChromeOS::ClearDevices() {
   DevicesMap replace;
   devices_.swap(replace);
   for (DevicesMap::iterator iter = replace.begin();
        iter != replace.end(); ++iter) {
@@ skipping 38 matching lines @@
                         DeviceRemoved(this, device));
 
       VLOG(1) << "Removed device " << device->GetAddress();
 
       delete device;
       devices_.erase(temp);
     } else {
       VLOG(1) << "Removed object path from device " << device->GetAddress();
       device->RemoveObjectPath();
 
-      FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                        DeviceChanged(this, device));
+      NotifyDeviceChanged(device);
     }
   }
 }
 
 void BluetoothAdapterChromeOS::DevicesChanged(
     const std::vector<dbus::ObjectPath>& devices) {
   for (std::vector<dbus::ObjectPath>::const_iterator iter =
            devices.begin(); iter != devices.end(); ++iter)
     UpdateDevice(*iter);
 }
@@ skipping 35 matching lines @@
     device = static_cast<BluetoothDeviceChromeOS*>(iter->second);
   } else {
     device = BluetoothDeviceChromeOS::Create(this);
     devices_[address] = device;
   }
 
   VLOG(1) << "Device " << address << " is visible to the adapter";
   device->SetDiscovered(true);
   device->Update(&properties, false);
 
-  if (update_device) {
-    FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                      DeviceChanged(this, device));
-  } else {
+  if (update_device)
+    NotifyDeviceChanged(device);
+  else {
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceAdded(this, device));
   }
 }
 
 void BluetoothAdapterChromeOS::DeviceDisappeared(
     const dbus::ObjectPath& adapter_path,
     const std::string& address) {
   if (adapter_path != object_path_)
     return;
@@ skipping 15 matching lines @@
     VLOG(1) << "Discovered device " << device->GetAddress()
              << " is no longer visible to the adapter";
 
     delete device;
     devices_.erase(iter);
   } else {
     VLOG(1) << "Paired device " << device->GetAddress()
             << " is no longer visible to the adapter";
     device->SetDiscovered(false);
 
-    FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
-                      DeviceChanged(this, device));
+    NotifyDeviceChanged(device);
   }
 }
 
 }  // namespace chromeos