Clean Up: Gather ibus constants to ibus_constants.h

chromeos/dbus/ibus/ibus_input_context_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_input_context_client.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 namespace chromeos {
 
 // TODO(nona): Remove after complete libibus removal.
 using chromeos::ibus::IBusText;
 
 namespace {
-const char kIBusInputContextInterface[] = "org.freedesktop.IBus.InputContext";
-
-// Signal names.
-const char kCommitTextSignal[] = "CommitText";
-const char kForwardKeyEventSignal[] = "ForwardKeyEvent";
-const char kHidePreeditTextSignal[] = "HidePreeditText";
-const char kShowPreeditTextSignal[] = "ShowPreeditText";
-const char kUpdatePreeditTextSignal[] = "UpdatePreeditText";
-
-// Method names.
-const char kFocusInMethod[] = "FocusIn";
-const char kFocusOutMethod[] = "FocusOut";
-const char kResetMethod[] = "Reset";
-const char kSetCapabilitiesMethod[] = "SetCapabilities";
-const char kSetCursorLocationMethod[] = "SetCursorLocation";
-const char kProcessKeyEventMethod[] = "ProcessKeyEvent";
 
 // The IBusInputContextClient implementation.
 class IBusInputContextClientImpl : public IBusInputContextClient {
  public:
   IBusInputContextClientImpl()
       : proxy_(NULL),
         weak_ptr_factory_(this) {
   }
 
   virtual ~IBusInputContextClientImpl() {}
 
  public:
   // IBusInputContextClient override.
   virtual void Initialize(dbus::Bus* bus,
                           const dbus::ObjectPath& object_path) OVERRIDE {
     if (proxy_ != NULL) {
       LOG(ERROR) << "IBusInputContextClient is already initialized.";
       return;
     }
-    proxy_ = bus->GetObjectProxy(kIBusServiceName, object_path);
+    proxy_ = bus->GetObjectProxy(ibus::kServiceName, object_path);
 
     ConnectSignals();
   }
 
   // IBusInputContextClient override.
   virtual void ResetObjectProxy() OVERRIDE {
     // Do not delete proxy here, proxy object is managed by dbus::Bus object.
     proxy_ = NULL;
   }
 
@@ skipping 57 matching lines @@
     show_preedit_text_handler_.Reset();
   }
 
   // IBusInputContextClient override.
   virtual void UnsetHidePreeditTextHandler() OVERRIDE {
     hide_preedit_text_handler_.Reset();
   }
 
   // IBusInputContextClient override.
   virtual void SetCapabilities(uint32 capabilities) OVERRIDE {
-    dbus::MethodCall method_call(kIBusInputContextInterface,
-                                 kSetCapabilitiesMethod);
+    dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
+                                 ibus::input_context::kSetCapabilitiesMethod);
     dbus::MessageWriter writer(&method_call);
     writer.AppendUint32(capabilities);
-    CallNoResponseMethod(&method_call, kSetCapabilitiesMethod);
+    CallNoResponseMethod(&method_call,
+                         ibus::input_context::kSetCapabilitiesMethod);
   }
 
   // IBusInputContextClient override.
   virtual void FocusIn() OVERRIDE {
-    dbus::MethodCall method_call(kIBusInputContextInterface, kFocusInMethod);
-    CallNoResponseMethod(&method_call, kFocusInMethod);
+    dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
+                                 ibus::input_context::kFocusInMethod);
+    CallNoResponseMethod(&method_call, ibus::input_context::kFocusInMethod);
   }
 
   // IBusInputContextClient override.
   virtual void FocusOut() OVERRIDE {
-    dbus::MethodCall method_call(kIBusInputContextInterface, kFocusOutMethod);
-    CallNoResponseMethod(&method_call, kFocusOutMethod);
+    dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
+                                 ibus::input_context::kFocusOutMethod);
+    CallNoResponseMethod(&method_call, ibus::input_context::kFocusOutMethod);
   }
 
   // IBusInputContextClient override.
   virtual void Reset() OVERRIDE {
-    dbus::MethodCall method_call(kIBusInputContextInterface, kResetMethod);
-    CallNoResponseMethod(&method_call, kResetMethod);
+    dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
+                                 ibus::input_context::kResetMethod);
+    CallNoResponseMethod(&method_call, ibus::input_context::kResetMethod);
   }
 
   // IBusInputContextClient override.
   virtual void SetCursorLocation(int32 x, int32 y, int32 width,
                                  int32 height) OVERRIDE {
-    dbus::MethodCall method_call(kIBusInputContextInterface,
-                                 kSetCursorLocationMethod);
+    dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
+                                 ibus::input_context::kSetCursorLocationMethod);
     dbus::MessageWriter writer(&method_call);
     writer.AppendInt32(x);
     writer.AppendInt32(y);
     writer.AppendInt32(width);
     writer.AppendInt32(height);
-    CallNoResponseMethod(&method_call, kSetCursorLocationMethod);
+    CallNoResponseMethod(&method_call,
+                         ibus::input_context::kSetCursorLocationMethod);
   }
 
   // IBusInputContextClient override.
   virtual void ProcessKeyEvent(
       uint32 keyval,
       uint32 keycode,
       uint32 state,
       const ProcessKeyEventCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
-    dbus::MethodCall method_call(kIBusInputContextInterface,
-                                 kProcessKeyEventMethod);
+    dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
+                                 ibus::input_context::kProcessKeyEventMethod);
     dbus::MessageWriter writer(&method_call);
     writer.AppendUint32(keyval);
     writer.AppendUint32(keycode);
     writer.AppendUint32(state);
     proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&IBusInputContextClientImpl::OnProcessKeyEvent,
                    callback,
                    error_callback),
@@ skipping 113 matching lines @@
 
   // Handles HidePreeditText signal.
   void OnHidePreeditText(dbus::Signal* signal) {
     if (!hide_preedit_text_handler_.is_null())
       hide_preedit_text_handler_.Run();
   }
 
   // Connects signals to signal handlers.
   void ConnectSignals() {
     proxy_->ConnectToSignal(
-        kIBusInputContextInterface,
-        kCommitTextSignal,
+        ibus::input_context::kServiceInterface,
+        ibus::input_context::kCommitTextSignal,
         base::Bind(&IBusInputContextClientImpl::OnCommitText,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
 
     proxy_->ConnectToSignal(
-        kIBusInputContextInterface,
-        kForwardKeyEventSignal,
+        ibus::input_context::kServiceInterface,
+        ibus::input_context::kForwardKeyEventSignal,
         base::Bind(&IBusInputContextClientImpl::OnForwardKeyEvent,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
 
     proxy_->ConnectToSignal(
-        kIBusInputContextInterface,
-        kUpdatePreeditTextSignal,
+        ibus::input_context::kServiceInterface,
+        ibus::input_context::kUpdatePreeditTextSignal,
         base::Bind(&IBusInputContextClientImpl::OnUpdatePreeditText,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
 
     proxy_->ConnectToSignal(
-        kIBusInputContextInterface,
-        kShowPreeditTextSignal,
+        ibus::input_context::kServiceInterface,
+        ibus::input_context::kShowPreeditTextSignal,
         base::Bind(&IBusInputContextClientImpl::OnShowPreeditText,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
 
     proxy_->ConnectToSignal(
-        kIBusInputContextInterface,
-        kHidePreeditTextSignal,
+        ibus::input_context::kServiceInterface,
+        ibus::input_context::kHidePreeditTextSignal,
         base::Bind(&IBusInputContextClientImpl::OnHidePreeditText,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   // Handles the result of signal connection setup.
   void OnSignalConnected(const std::string& interface,
                          const std::string& signal,
                          bool succeeded) {
@@ skipping 78 matching lines @@
 // static
 IBusInputContextClient* IBusInputContextClient::Create(
     DBusClientImplementationType type) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
     return new IBusInputContextClientImpl();
   }
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new IBusInputContextClientStubImpl();
 }
 }  // namespace chromeos