Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_engine_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_engine_service.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 126 matching lines @@
   }
 
   // IBusEngineService override.
   virtual void UnsetEngine() OVERRIDE {
     LOG_IF(ERROR, engine_handler_ == NULL) << "There is no engine.";
     engine_handler_ = NULL;
   }
 
   // IBusEngineService override.
   virtual void RegisterProperties(
-      const ibus::IBusPropertyList& property_list) OVERRIDE {
+      const IBusPropertyList& property_list) OVERRIDE {
     dbus::Signal signal(ibus::engine::kServiceInterface,
                         ibus::engine::kRegisterPropertiesSignal);
     dbus::MessageWriter writer(&signal);
     AppendIBusPropertyList(property_list, &writer);
     exported_object_->SendSignal(&signal);
   }
 
   // IBusEngineService override.
-  virtual void UpdatePreedit(const ibus::IBusText& ibus_text,
+  virtual void UpdatePreedit(const IBusText& ibus_text,
                              uint32 cursor_pos,
                              bool is_visible,
                              IBusEnginePreeditFocusOutMode mode) OVERRIDE {
     dbus::Signal signal(ibus::engine::kServiceInterface,
                         ibus::engine::kUpdatePreeditSignal);
     dbus::MessageWriter writer(&signal);
     AppendIBusText(ibus_text, &writer);
     writer.AppendUint32(cursor_pos);
     writer.AppendBool(is_visible);
     writer.AppendUint32(static_cast<uint32>(mode));
     exported_object_->SendSignal(&signal);
   }
 
   // IBusEngineService override.
-  virtual void UpdateAuxiliaryText(const ibus::IBusText& ibus_text,
+  virtual void UpdateAuxiliaryText(const IBusText& ibus_text,
                                    bool is_visible) OVERRIDE {
     dbus::Signal signal(ibus::engine::kServiceInterface,
                         ibus::engine::kUpdateAuxiliaryTextSignal);
     dbus::MessageWriter writer(&signal);
     AppendIBusText(ibus_text, &writer);
     writer.AppendBool(is_visible);
     exported_object_->SendSignal(&signal);
   }
 
   // IBusEngineService override.
-  virtual void UpdateLookupTable(const ibus::IBusLookupTable& lookup_table,
+  virtual void UpdateLookupTable(const IBusLookupTable& lookup_table,
                                  bool is_visible) OVERRIDE {
     dbus::Signal signal(ibus::engine::kServiceInterface,
                         ibus::engine::kUpdateLookupTableSignal);
     dbus::MessageWriter writer(&signal);
     AppendIBusLookupTable(lookup_table, &writer);
     writer.AppendBool(is_visible);
     exported_object_->SendSignal(&signal);
   }
 
   // IBusEngineService override.
-  virtual void UpdateProperty(const ibus::IBusProperty& property) OVERRIDE {
+  virtual void UpdateProperty(const IBusProperty& property) OVERRIDE {
     dbus::Signal signal(ibus::engine::kServiceInterface,
                         ibus::engine::kUpdatePropertySignal);
     dbus::MessageWriter writer(&signal);
     AppendIBusProperty(property, &writer);
     exported_object_->SendSignal(&signal);
   }
 
   // IBusEngineService override.
   virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode,
                                uint32 state) OVERRIDE {
@@ skipping 10 matching lines @@
   virtual void RequireSurroundingText() OVERRIDE {
     dbus::Signal signal(ibus::engine::kServiceInterface,
                         ibus::engine::kRequireSurroundingTextSignal);
     exported_object_->SendSignal(&signal);
   }
 
   virtual void CommitText(const std::string& text) OVERRIDE {
     dbus::Signal signal(ibus::engine::kServiceInterface,
                         ibus::engine::kCommitTextSignal);
     dbus::MessageWriter writer(&signal);
-    ibus::AppendStringAsIBusText(text, &writer);
+    AppendStringAsIBusText(text, &writer);
     exported_object_->SendSignal(&signal);
   }
 
  private:
   // Handles FocusIn method call from ibus-daemon.
   void FocusIn(dbus::MethodCall* method_call,
                dbus::ExportedObject::ResponseSender response_sender) {
     if (engine_handler_ == NULL)
       return;
     engine_handler_->FocusIn();
@@ skipping 44 matching lines @@
       return;
     }
     uint32 property_state = 0;
     if (!reader.PopUint32(&property_state)) {
       LOG(WARNING) << "PropertyActivate called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     engine_handler_->PropertyActivate(
         property_name,
-        static_cast<IBusEngineHandlerInterface::IBusPropertyState>(
-            property_state));
+        static_cast<ibus::IBusPropertyState>(property_state));
     dbus::Response* response = dbus::Response::FromMethodCall(method_call);
     response_sender.Run(response);
   }
 
   // Handles PropertyShow method call from ibus-daemon.
   void PropertyShow(dbus::MethodCall* method_call,
                     dbus::ExportedObject::ResponseSender response_sender) {
     if (engine_handler_ == NULL)
       return;
     dbus::MessageReader reader(method_call);
@@ skipping 192 matching lines @@
     // TODO(nona): Implement this.
   }
 
   // IBusEngineService override.
   virtual void UnsetEngine() OVERRIDE {
     // TODO(nona): Implement this.
   }
 
   // IBusEngineService override.
   virtual void RegisterProperties(
-      const ibus::IBusPropertyList& property_list) OVERRIDE {
+      const IBusPropertyList& property_list) OVERRIDE {
     // TODO(nona): Implement this.
   }
 
   // IBusEngineService override.
-  virtual void UpdatePreedit(const ibus::IBusText& ibus_text,
+  virtual void UpdatePreedit(const IBusText& ibus_text,
                              uint32 cursor_pos,
                              bool is_visible,
                              IBusEnginePreeditFocusOutMode mode) OVERRIDE {
     // TODO(nona): Implement this.
   }
 
   // IBusEngineService override.
-  virtual void UpdateAuxiliaryText(const ibus::IBusText& ibus_text,
+  virtual void UpdateAuxiliaryText(const IBusText& ibus_text,
                                    bool is_visible) OVERRIDE {
     // TODO(nona): Implement this.
   }
 
   // IBusEngineService override.
-  virtual void UpdateLookupTable(const ibus::IBusLookupTable& lookup_table,
+  virtual void UpdateLookupTable(const IBusLookupTable& lookup_table,
                                  bool is_visible) OVERRIDE {
     // TODO(nona): Implement this.
   }
 
   // IBusEngineService override.
-  virtual void UpdateProperty(const ibus::IBusProperty& property) OVERRIDE {
+  virtual void UpdateProperty(const IBusProperty& property) OVERRIDE {
     // TODO(nona): Implement this.
   }
 
   // IBusEngineService override.
   virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode,
                                uint32 state) OVERRIDE {
     // TODO(nona): Implement this.
   }
 
   // IBusEngineService override.
@@ skipping 21 matching lines @@
     DBusClientImplementationType type,
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new IBusEngineServiceImpl(bus, object_path);
   else
     return new IBusEngineServiceDaemonlessImpl();
 }
 
 }  // namespace chromeos