bluetoothLowEnergy: Send onServiceAdded after all characteristics are discovered

chromeos/dbus/bluetooth_gatt_characteristic_client.cc

 // Copyright 2014 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 "chromeos/dbus/bluetooth_gatt_characteristic_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "dbus/bus.h"
 #include "dbus/object_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
-namespace {
-
-// TODO(armansito): Move these to service_constants.h later.
-const char kNotifyingProperty[] = "Notifying";
-const char kStartNotify[] = "StartNotify";
-const char kStopNotify[] = "StopNotify";
-
-}  // namespace
-
 // static
 const char BluetoothGattCharacteristicClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 // static
 const char BluetoothGattCharacteristicClient::kUnknownCharacteristicError[] =
     "org.chromium.Error.UnknownCharacteristic";
 
 BluetoothGattCharacteristicClient::Properties::Properties(
     dbus::ObjectProxy* object_proxy,
     const std::string& interface_name,
     const PropertyChangedCallback& callback)
     : dbus::PropertySet(object_proxy, interface_name, callback) {
   RegisterProperty(bluetooth_gatt_characteristic::kUUIDProperty, &uuid);
   RegisterProperty(bluetooth_gatt_characteristic::kServiceProperty, &service);
-  RegisterProperty(kNotifyingProperty, &notifying);
+  RegisterProperty(bluetooth_gatt_characteristic::kNotifyingProperty,
+                   &notifying);
   RegisterProperty(bluetooth_gatt_characteristic::kFlagsProperty, &flags);
+  RegisterProperty(bluetooth_gatt_characteristic::kDescriptorsProperty,
+                   &descriptors);
 }
 
 BluetoothGattCharacteristicClient::Properties::~Properties() {
 }
 
 // The BluetoothGattCharacteristicClient implementation used in production.
 class BluetoothGattCharacteristicClientImpl
     : public BluetoothGattCharacteristicClient,
       public dbus::ObjectManager::Interface {
  public:
@@ skipping 100 matching lines @@
                            const ErrorCallback& error_callback) OVERRIDE {
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownCharacteristicError, "");
       return;
     }
 
     dbus::MethodCall method_call(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
-        kStartNotify);
+        bluetooth_gatt_characteristic::kStartNotify);
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback),
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
   }
 
   // BluetoothGattCharacteristicClient override.
   virtual void StopNotify(const dbus::ObjectPath& object_path,
                           const base::Closure& callback,
                           const ErrorCallback& error_callback) OVERRIDE {
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownCharacteristicError, "");
       return;
     }
 
     dbus::MethodCall method_call(
         bluetooth_gatt_characteristic::kBluetoothGattCharacteristicInterface,
-        kStopNotify);
+        bluetooth_gatt_characteristic::kStopNotify);
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback),
         base::Bind(&BluetoothGattCharacteristicClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
@@ skipping 161 matching lines @@
 
 BluetoothGattCharacteristicClient::~BluetoothGattCharacteristicClient() {
 }
 
 // static
 BluetoothGattCharacteristicClient* BluetoothGattCharacteristicClient::Create() {
   return new BluetoothGattCharacteristicClientImpl();
 }
 
 }  // namespace chromeos