device/bluetooth: Move GATT observer methods to BluetoothAdapter::Observer.

device/bluetooth/bluetooth_adapter_chromeos.cc

 // Copyright 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_adapter_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/bluetooth_agent_service_provider.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_device_chromeos.h"
 #include "device/bluetooth/bluetooth_pairing_chromeos.h"
+#include "device/bluetooth/bluetooth_remote_gatt_characteristic_chromeos.h"
+#include "device/bluetooth/bluetooth_remote_gatt_descriptor_chromeos.h"
+#include "device/bluetooth/bluetooth_remote_gatt_service_chromeos.h"
 #include "device/bluetooth/bluetooth_socket_chromeos.h"
 #include "device/bluetooth/bluetooth_socket_thread.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
 using device::BluetoothSocket;
 using device::BluetoothUUID;
 
@@ skipping 710 matching lines @@
 }
 
 void BluetoothAdapterChromeOS::NotifyDeviceChanged(
     BluetoothDeviceChromeOS* device) {
   DCHECK(device->adapter_ == this);
 
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                     DeviceChanged(this, device));
 }
 
+void BluetoothAdapterChromeOS::NotifyGattServiceAdded(
+    BluetoothRemoteGattServiceChromeOS* service) {
+  DCHECK_EQ(service->GetAdapter(), this);
+  DCHECK_EQ(
+      static_cast<BluetoothDeviceChromeOS*>(service->GetDevice())->adapter_,
+      this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattServiceAdded(this, service->GetDevice(), service));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattServiceRemoved(
+    BluetoothRemoteGattServiceChromeOS* service) {
+  DCHECK_EQ(service->GetAdapter(), this);
+  DCHECK_EQ(
+      static_cast<BluetoothDeviceChromeOS*>(service->GetDevice())->adapter_,
+      this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattServiceRemoved(this, service->GetDevice(), service));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattServiceChanged(
+    BluetoothRemoteGattServiceChromeOS* service) {
+  DCHECK_EQ(service->GetAdapter(), this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattServiceChanged(this, service));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattDiscoveryComplete(
+    BluetoothRemoteGattServiceChromeOS* service) {
+  DCHECK_EQ(service->GetAdapter(), this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattDiscoveryCompleteForService(this, service));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattCharacteristicAdded(
+    BluetoothRemoteGattCharacteristicChromeOS* characteristic) {
+  DCHECK_EQ(static_cast<BluetoothRemoteGattServiceChromeOS*>(
+                characteristic->GetService())->GetAdapter(),
+            this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattCharacteristicAdded(this, characteristic));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattCharacteristicRemoved(
+    BluetoothRemoteGattCharacteristicChromeOS* characteristic) {
+  DCHECK_EQ(static_cast<BluetoothRemoteGattServiceChromeOS*>(
+                characteristic->GetService())->GetAdapter(),
+            this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattCharacteristicRemoved(this, characteristic));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattDescriptorAdded(
+    BluetoothRemoteGattDescriptorChromeOS* descriptor) {
+  DCHECK_EQ(static_cast<BluetoothRemoteGattServiceChromeOS*>(
+                descriptor->GetCharacteristic()->GetService())->GetAdapter(),
+            this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattDescriptorAdded(this, descriptor));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattDescriptorRemoved(
+    BluetoothRemoteGattDescriptorChromeOS* descriptor) {
+  DCHECK_EQ(static_cast<BluetoothRemoteGattServiceChromeOS*>(
+                descriptor->GetCharacteristic()->GetService())->GetAdapter(),
+            this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattDescriptorRemoved(this, descriptor));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattCharacteristicValueChanged(
+    BluetoothRemoteGattCharacteristicChromeOS* characteristic,
+    const std::vector<uint8>& value) {
+  DCHECK_EQ(static_cast<BluetoothRemoteGattServiceChromeOS*>(
+                characteristic->GetService())->GetAdapter(),
+            this);
+
+  FOR_EACH_OBSERVER(
+      BluetoothAdapter::Observer,
+      observers_,
+      GattCharacteristicValueChanged(this, characteristic, value));
+}
+
+void BluetoothAdapterChromeOS::NotifyGattDescriptorValueChanged(
+    BluetoothRemoteGattDescriptorChromeOS* descriptor,
+    const std::vector<uint8>& value) {
+  DCHECK_EQ(static_cast<BluetoothRemoteGattServiceChromeOS*>(
+                descriptor->GetCharacteristic()->GetService())->GetAdapter(),
+            this);
+
+  FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
+                    observers_,
+                    GattDescriptorValueChanged(this, descriptor, value));
+}
+
 void BluetoothAdapterChromeOS::OnSetDiscoverable(
     const base::Closure& callback,
     const ErrorCallback& error_callback,
     bool success) {
   // Set the discoverable_timeout property to zero so the adapter remains
   // discoverable forever.
   DBusThreadManager::Get()->GetBluetoothAdapterClient()->
       GetProperties(object_path_)->discoverable_timeout.Set(
           0,
           base::Bind(&BluetoothAdapterChromeOS::OnPropertyChangeCompleted,
@@ skipping 178 matching lines @@
 
     // If the queued request resulted in a pending call, then let it
     // asynchonously process the remaining queued requests once the pending
     // call returns.
     if (discovery_request_pending_)
       return;
   }
 }
 
 }  // namespace chromeos