Clean Up: Remove ibus namespace.

chromeos/dbus/dbus_thread_manager.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/dbus_thread_manager.h"
 
 #include <map>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
@@ skipping 167 matching lines @@
 
     ibus_client_.reset(
         IBusClient::Create(client_type, ibus_bus_.get()));
     ibus_config_client_.reset(
         IBusConfigClient::Create(client_type, ibus_bus_.get()));
     ibus_input_context_client_.reset(
         IBusInputContextClient::Create(client_type));
     ibus_engine_factory_service_.reset(
         IBusEngineFactoryService::Create(ibus_bus_.get(), client_type));
     ibus_panel_service_.reset(
-        ibus::IBusPanelService::Create(client_type,
-                                       ibus_bus_.get(),
-                                       ibus_input_context_client_.get()));
+        IBusPanelService::Create(client_type,
+                                 ibus_bus_.get(),
+                                 ibus_input_context_client_.get()));
 
     ibus_engine_services_.clear();
   }
 
   // DBusThreadManager overrides:
   virtual dbus::Bus* GetSystemBus() OVERRIDE {
     return system_bus_.get();
   }
 
   virtual dbus::Bus* GetIBusBus() OVERRIDE {
@@ skipping 130 matching lines @@
       const dbus::ObjectPath& object_path) OVERRIDE {
     if (ibus_engine_services_.find(object_path) !=
         ibus_engine_services_.end()) {
       LOG(WARNING) << "Object path not found: " << object_path.value();
       return;
     }
     delete ibus_engine_services_[object_path];
     ibus_engine_services_.erase(object_path);
   }
 
-  virtual ibus::IBusPanelService* GetIBusPanelService() OVERRIDE {
+  virtual IBusPanelService* GetIBusPanelService() OVERRIDE {
     return ibus_panel_service_.get();
   }
 
   scoped_ptr<base::Thread> dbus_thread_;
   scoped_refptr<dbus::Bus> system_bus_;
   scoped_refptr<dbus::Bus> ibus_bus_;
   scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
   scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
   scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
   scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_;
@@ skipping 15 matching lines @@
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SMSClient> sms_client_;
   scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
   scoped_ptr<IBusClient> ibus_client_;
   scoped_ptr<IBusConfigClient> ibus_config_client_;
   scoped_ptr<IBusInputContextClient> ibus_input_context_client_;
   scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_;
   std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_;
-  scoped_ptr<ibus::IBusPanelService> ibus_panel_service_;
+  scoped_ptr<IBusPanelService> ibus_panel_service_;
 
   std::string ibus_address_;
 
   ObserverList<DBusThreadManagerObserver> observers_;
 };
 
 // static
 void DBusThreadManager::Initialize() {
   // Ignore Initialize() if we set a test DBusThreadManager.
   if (g_dbus_thread_manager_set_for_testing)
@@ skipping 59 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos