nfc: Various fixes to the NFC D-Bus client in chromeos/dbus.

chromeos/dbus/nfc_record_client.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 "chromeos/dbus/nfc_record_client.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chromeos/dbus/fake_nfc_record_client.h"
@@ skipping 169 matching lines @@
     // signal for the tags "Records" property, without creating a new object
     // path. Sync the properties of all records here, in case Update objects
     // doesn't do it.
     VLOG(1) << "Fetch properties for all records.";
     object_map->RefreshAllProperties();
   }
 
   // nfc_client_helpers::DBusObjectMap::Delegate override.
   virtual NfcPropertySet* CreateProperties(
       dbus::ObjectProxy* object_proxy) OVERRIDE {
-    return new Properties(
+    Properties* properties = new Properties(
         object_proxy,
         base::Bind(&NfcRecordClientImpl::OnPropertyChanged,
                    weak_ptr_factory_.GetWeakPtr(),
                    object_proxy->object_path()));
+    properties->SetAllPropertiesReceivedCallback(
+        base::Bind(&NfcRecordClientImpl::OnPropertiesReceived,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   object_proxy->object_path()));
+    return properties;
   }
 
   // nfc_client_helpers::DBusObjectMap::Delegate override.
   virtual void ObjectAdded(const dbus::ObjectPath& object_path) OVERRIDE {
     FOR_EACH_OBSERVER(NfcRecordClient::Observer, observers_,
                       RecordAdded(object_path));
   }
 
   // nfc_client_helpers::DBusObjectMap::Delegate override.
   virtual void ObjectRemoved(const dbus::ObjectPath& object_path) OVERRIDE {
     FOR_EACH_OBSERVER(NfcRecordClient::Observer, observers_,
                       RecordRemoved(object_path));
   }
 
   // Called by NfcPropertySet when a property value is changed, either by
   // result of a signal or response to a GetAll() or Get() call.
   void OnPropertyChanged(const dbus::ObjectPath& object_path,
                          const std::string& property_name) {
     VLOG(1) << "Record property changed; Path: " << object_path.value()
             << " Property: " << property_name;
     FOR_EACH_OBSERVER(NfcRecordClient::Observer, observers_,
                       RecordPropertyChanged(object_path, property_name));
   }
 
+  // Called by NfcPropertySet when all properties have been processed as a
+  // result of a call to GetAll.
+  void OnPropertiesReceived(const dbus::ObjectPath& object_path) {
+    VLOG(1) << "All record properties received; Path: " << object_path.value();
+    FOR_EACH_OBSERVER(NfcRecordClient::Observer, observers_,
+                      RecordPropertiesReceived(object_path));
+  }
+
   // We maintain a pointer to the bus to be able to request proxies for
   // new NFC records that appear.
   dbus::Bus* bus_;
 
   // List of observers interested in event notifications.
   ObserverList<NfcRecordClient::Observer> observers_;
 
   // Mapping from object paths to object proxies and properties structures that
   // were already created by us. Record objects belong to either Tag or Device
   // objects. This structure stores a different DBusObjectMap for each known
@@ skipping 21 matching lines @@
 NfcRecordClient* NfcRecordClient::Create(DBusClientImplementationType type,
                                          NfcDeviceClient* device_client,
                                          NfcTagClient* tag_client) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new NfcRecordClientImpl(device_client, tag_client);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FakeNfcRecordClient();
 }
 
 }  // namespace chromeos