Clean Up: Remove ibus namespace.

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"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "chromeos/dbus/ibus/ibus_lookup_table.h"
 #include "chromeos/dbus/ibus/ibus_property.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 namespace chromeos {
-// TODO(nona): Remove ibus namespace after complete libibus removal.
-namespace ibus {
 
 class IBusPanelServiceImpl : public IBusPanelService {
  public:
   explicit IBusPanelServiceImpl(dbus::Bus* bus,
                                 IBusInputContextClient* input_context)
       : bus_(bus),
         candidate_window_handler_(NULL),
         property_handler_(NULL),
         weak_ptr_factory_(this) {
     exported_object_ = bus->GetExportedObject(
@@ skipping 159 matching lines @@
   }
 
  private:
   // Handles UpdateLookupTable method call from ibus-daemon.
   void UpdateLookupTable(dbus::MethodCall* method_call,
                          dbus::ExportedObject::ResponseSender response_sender) {
     if (!candidate_window_handler_)
       return;
 
     dbus::MessageReader reader(method_call);
-    ibus::IBusLookupTable table;
-    if (!ibus::PopIBusLookupTable(&reader, &table)) {
+    IBusLookupTable table;
+    if (!PopIBusLookupTable(&reader, &table)) {
       LOG(WARNING) << "UpdateLookupTable called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     bool visible = false;
     if (!reader.PopBool(&visible)) {
       LOG(WARNING) << "UpdateLookupTable called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
@@ skipping 15 matching lines @@
 
   // Handles UpdateAuxiliaryText method call from ibus-daemon.
   void UpdateAuxiliaryText(
       dbus::MethodCall* method_call,
       dbus::ExportedObject::ResponseSender response_sender) {
     if (!candidate_window_handler_)
       return;
 
     dbus::MessageReader reader(method_call);
     std::string text;
-    if (!ibus::PopStringFromIBusText(&reader, &text)) {
+    if (!PopStringFromIBusText(&reader, &text)) {
       LOG(WARNING) << "UpdateAuxiliaryText called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     bool visible = false;
     if (!reader.PopBool(&visible)) {
       LOG(WARNING) << "UpdateAuxiliaryText called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
@@ skipping 14 matching lines @@
   }
 
   // Handles UpdatePreeditText method call from ibus-daemon.
   void UpdatePreeditText(dbus::MethodCall* method_call,
                          dbus::ExportedObject::ResponseSender response_sender) {
     if (!candidate_window_handler_)
       return;
 
     dbus::MessageReader reader(method_call);
     std::string text;
-    if (!ibus::PopStringFromIBusText(&reader, &text)) {
+    if (!PopStringFromIBusText(&reader, &text)) {
       LOG(WARNING) << "UpdatePreeditText called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
     uint32 cursor_pos = 0;
     if (!reader.PopUint32(&cursor_pos)) {
       LOG(WARNING) << "UpdatePreeditText called with incorrect parameters: "
                    << method_call->ToString();
       return;
     }
@@ skipping 20 matching lines @@
   }
 
   // Handles RegisterProperties method call from ibus-daemon.
   void RegisterProperties(
       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)) {
+    IBusPropertyList properties;
+    if (!PopIBusPropertyList(&reader, &properties)) {
       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 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::IBusProperty property;
-    if (!ibus::PopIBusProperty(&reader, &property)) {
+    IBusProperty property;
+    if (!PopIBusProperty(&reader, &property)) {
       DLOG(WARNING) << "RegisterProperties called with incorrect parameters:"
                     << method_call->ToString();
       return;
     }
     property_handler_->UpdateProperty(property);
 
     dbus::Response* response = dbus::Response::FromMethodCall(method_call);
     response_sender.Run(response);
   }
 
@@ skipping 106 matching lines @@
     DBusClientImplementationType type,
     dbus::Bus* bus,
     IBusInputContextClient* input_context) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
     return new IBusPanelServiceImpl(bus, input_context);
   } else {
     return new IBusPanelServiceDaemonlessImpl();
   }
 }
 
-}  // namespace ibus
 }  // namespace chromeos