Change UpdateProperties to UpdateProperty

chromeos/dbus/ibus/ibus_panel_service.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 "chromeos/dbus/ibus/ibus_panel_service.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 71 matching lines @@
     exported_object_->ExportMethod(
         ibus::panel::kServiceInterface,
         ibus::panel::kRegisterPropertiesMethod,
         base::Bind(&IBusPanelServiceImpl::RegisterProperties,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&IBusPanelServiceImpl::OnMethodExported,
                    weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
         ibus::panel::kServiceInterface,
-        ibus::panel::kUpdatePropertiesMethod,
-        base::Bind(&IBusPanelServiceImpl::UpdateProperties,
+        ibus::panel::kUpdatePropertyMethod,
+        base::Bind(&IBusPanelServiceImpl::UpdateProperty,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&IBusPanelServiceImpl::OnMethodExported,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   virtual ~IBusPanelServiceImpl() {
     bus_->UnregisterExportedObject(
         dbus::ObjectPath(ibus::panel::kServicePath));
   }
 
@@ skipping 178 matching lines @@
       DLOG(WARNING) << "RegisterProperties called with incorrect parameters:"
                     << method_call->ToString();
       return;
     }
     property_handler_->RegisterProperties(properties);
 
     dbus::Response* response = dbus::Response::FromMethodCall(method_call);
     response_sender.Run(response);
   }
 
-  // Handles UpdateProperties method call from ibus-daemon.
-  void UpdateProperties(dbus::MethodCall* method_call,
-                        dbus::ExportedObject::ResponseSender response_sender) {
+  // Handles UpdateProperty method call from ibus-daemon.
+  void UpdateProperty(dbus::MethodCall* method_call,
+                      dbus::ExportedObject::ResponseSender response_sender) {
     if (!property_handler_)
       return;
 
     dbus::MessageReader reader(method_call);
-    ibus::IBusPropertyList properties;
-    if (!ibus::PopIBusPropertyList(&reader, &properties)) {
+    ibus::IBusProperty property;
+    if (!ibus::PopIBusProperty(&reader, &property)) {
       DLOG(WARNING) << "RegisterProperties called with incorrect parameters:"
                     << method_call->ToString();
       return;
     }
-    property_handler_->UpdateProperties(properties);
+    property_handler_->UpdateProperty(property);
 
     dbus::Response* response = dbus::Response::FromMethodCall(method_call);
     response_sender.Run(response);
   }
 
   // Called when the method call is exported.
   void OnMethodExported(const std::string& interface_name,
                         const std::string& method_name,
                         bool success) {
     LOG_IF(WARNING, !success) << "Failed to export "
@@ skipping 47 matching lines @@
                                            dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
     return new IBusPanelServiceImpl(bus);
   } else {
     return new IBusPanelServiceStubImpl();
   }
 }
 
 }  // namespace ibus
 }  // namespace chromeos