Clean Up: Gather ibus constants to ibus_constants.h

chromeos/dbus/ibus/ibus_client.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_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
 #include "chromeos/dbus/ibus/ibus_component.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 namespace chromeos {
 
 namespace {
-const char kIBusBusRegisterComponentMethod[] = "RegisterComponent";
 
 // The IBusClient implementation.
 class IBusClientImpl : public IBusClient {
  public:
   explicit IBusClientImpl(dbus::Bus* bus)
-      : proxy_(bus->GetObjectProxy(kIBusServiceName,
-                                   dbus::ObjectPath(kIBusServicePath))),
+      : proxy_(bus->GetObjectProxy(ibus::kServiceName,
+                                   dbus::ObjectPath(ibus::bus::kServicePath))),
         weak_ptr_factory_(this) {
   }
 
   virtual ~IBusClientImpl() {}
 
   // IBusClient override.
   virtual void CreateInputContext(
       const std::string& client_name,
       const CreateInputContextCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
     DCHECK(!callback.is_null());
     DCHECK(!error_callback.is_null());
-    dbus::MethodCall method_call(kIBusServiceInterface,
-                                 kIBusBusCreateInputContextMethod);
+    dbus::MethodCall method_call(ibus::bus::kServiceInterface,
+                                 ibus::bus::kCreateInputContextMethod);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(client_name);
     proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&IBusClientImpl::OnCreateInputContext,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback,
                    error_callback),
         base::Bind(&IBusClientImpl::OnCreateInputContextFail,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
   }
 
   // IBusClient override.
   virtual void RegisterComponent(
       const ibus::IBusComponent& ibus_component,
       const RegisterComponentCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
     DCHECK(!callback.is_null());
     DCHECK(!error_callback.is_null());
-    dbus::MethodCall method_call(kIBusServiceInterface,
-                                 kIBusBusRegisterComponentMethod);
+    dbus::MethodCall method_call(ibus::bus::kServiceInterface,
+                                 ibus::bus::kRegisterComponentMethod);
     dbus::MessageWriter writer(&method_call);
     ibus::AppendIBusComponent(ibus_component, &writer);
     proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&IBusClientImpl::OnRegisterComponent,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback,
                    error_callback),
         base::Bind(&IBusClientImpl::OnRegisterComponentFail,
@@ skipping 85 matching lines @@
 IBusClient* IBusClient::Create(DBusClientImplementationType type,
                                dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
     return new IBusClientImpl(bus);
   }
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new IBusClientStubImpl();
 }
 
 }  // namespace chromeos