chrome: bluetooth: hook up the AdapterAdded signal

chrome/browser/chromeos/dbus/bluetooth_manager_client.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "dbus/bus.h"
@@ skipping 12 matching lines @@
     VLOG(1) << "Creating BluetoothManagerClientImpl";
 
     DCHECK(bus);
 
     bluetooth_manager_proxy_ = bus->GetObjectProxy(
         bluetooth_manager::kBluetoothManagerServiceName,
         bluetooth_manager::kBluetoothManagerServicePath);
 
     bluetooth_manager_proxy_->ConnectToSignal(
         bluetooth_manager::kBluetoothManagerInterface,
+        bluetooth_manager::kAdapterAddedSignal,
+        base::Bind(&BluetoothManagerClientImpl::AdapterAddedReceived,
+                   weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&BluetoothManagerClientImpl::AdapterAddedConnected,
+                   weak_ptr_factory_.GetWeakPtr()));
+
+    bluetooth_manager_proxy_->ConnectToSignal(
+        bluetooth_manager::kBluetoothManagerInterface,
         bluetooth_manager::kAdapterRemovedSignal,
         base::Bind(&BluetoothManagerClientImpl::AdapterRemovedReceived,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothManagerClientImpl::AdapterRemovedConnected,
                    weak_ptr_factory_.GetWeakPtr()));
 
     bluetooth_manager_proxy_->ConnectToSignal(
         bluetooth_manager::kBluetoothManagerInterface,
         bluetooth_manager::kDefaultAdapterChangedSignal,
         base::Bind(&BluetoothManagerClientImpl::DefaultAdapterChangedReceived,
@@ skipping 29 matching lines @@
 
     DCHECK(bluetooth_manager_proxy_);
     bluetooth_manager_proxy_->CallMethod(
       &method_call,
       dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
       base::Bind(&BluetoothManagerClientImpl::OnDefaultAdapter,
                  weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  private:
+  // Called by dbus:: when an AdapterAdded signal is received.
+  void AdapterAddedReceived(dbus::Signal* signal) {
+    DCHECK(signal);
+    dbus::MessageReader reader(signal);
+    std::string object_path;
+    if (!reader.PopObjectPath(&object_path)) {
+      LOG(ERROR) << "AdapterAdded signal has incorrect parameters: "
+          << signal->ToString();
+      return;
+    }
+    VLOG(1) << "Adapter added: " << object_path;
+    FOR_EACH_OBSERVER(Observer, observers_, AdapterAdded(object_path));
+  }
+
+  // Called by dbus:: when the AdapterAdded signal is initially connected.
+  void AdapterAddedConnected(const std::string& interface_name,
+                             const std::string& signal_name,
+                             bool success) {
+    LOG_IF(WARNING, !success) << "Failed to connect to AdapterAdded signal.";
+  }
+
   // Called by dbus:: when an AdapterRemoved signal is received.
   void AdapterRemovedReceived(dbus::Signal* signal) {
     DCHECK(signal);
     dbus::MessageReader reader(signal);
-    std::string adapter;
-    if (!reader.PopObjectPath(&adapter)) {
+    std::string object_path;
+    if (!reader.PopObjectPath(&object_path)) {
       LOG(ERROR) << "AdapterRemoved signal has incorrect parameters: "
           << signal->ToString();
       return;
     }
-    VLOG(1) << "Adapter removed: " << adapter;
-    FOR_EACH_OBSERVER(Observer, observers_, AdapterRemoved(adapter));
+    VLOG(1) << "Adapter removed: " << object_path;
+    FOR_EACH_OBSERVER(Observer, observers_, AdapterRemoved(object_path));
   }
 
   // Called by dbus:: when the AdapterRemoved signal is initially connected.
   void AdapterRemovedConnected(const std::string& interface_name,
                                const std::string& signal_name,
                                bool success) {
     LOG_IF(WARNING, !success) << "Failed to connect to AdapterRemoved signal.";
   }
 
   // Called by dbus:: when a DefaultAdapterChanged signal is received.
@@ skipping 81 matching lines @@
 
 BluetoothManagerClient* BluetoothManagerClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new BluetoothManagerClientImpl(bus);
   } else {
     return new BluetoothManagerClientStubImpl();
   }
 }
 
 }  // namespace chromeos