Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_engine_service.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_IBUS_IBUS_ENGINE_SERVICE_H_
 #define CHROMEOS_DBUS_IBUS_IBUS_ENGINE_SERVICE_H_
 
 #include <string>
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
 
 namespace dbus {
 class Bus;
 class ObjectPath;
 }  // namespace dbus
 
 namespace chromeos {
 
-// TODO(nona): Remove ibus namespace after complete libibus removal.
-namespace ibus {
 class IBusLookupTable;
 class IBusProperty;
 class IBusText;
 typedef ScopedVector<IBusProperty> IBusPropertyList;
-}  // namespace
 
 // A interface to handle the engine handler method call.
 class CHROMEOS_EXPORT IBusEngineHandlerInterface {
  public:
   typedef base::Callback<void (bool consumed)> KeyEventDoneCallback;
 
   // Following capability mask is introduced from
   // http://ibus.googlecode.com/svn/docs/ibus-1.4/ibus-ibustypes.html#IBusCapabilite
   // TODO(nona): Move to ibus_contants and merge one in ui/base/ime/*
   enum IBusCapability {
     IBUS_CAPABILITY_PREEDIT_TEXT = 1U,
     IBUS_CAPABILITY_FOCUS = 8U,
   };
 
-  // Following property state value is introduced from
-  // http://ibus.googlecode.com/svn/docs/ibus-1.4/IBusProperty.html#IBusPropState
-  enum IBusPropertyState {
-    IBUS_PROPERTY_STATE_UNCHECKED = 0U,
-    IBUS_PROPERTY_STATE_CHECKED = 1U,
-    IBUS_PROPERTY_STATE_INCONSISTENT = 2U,
-  };
-
   virtual ~IBusEngineHandlerInterface() {}
 
   // Called when the Chrome input field get the focus.
   virtual void FocusIn() = 0;
 
   // Called when the Chrome input field lose the focus.
   virtual void FocusOut() = 0;
 
   // Called when the IME is enabled.
   virtual void Enable() = 0;
 
   // Called when the IME is disabled.
   virtual void Disable() = 0;
 
   // Called when a property is activated or changed.
   virtual void PropertyActivate(const std::string& property_name,
-                                IBusPropertyState property_state) = 0;
+                                ibus::IBusPropertyState property_state) = 0;
 
   // Called when a property is shown.
   virtual void PropertyShow(const std::string& property_name) = 0;
 
   // Called when a property is hidden.
   virtual void PropertyHide(const std::string& property_name) = 0;
 
   // Called when the Chrome input field set their capabilities.
   virtual void SetCapability(IBusCapability capability) = 0;
 
@@ skipping 46 matching lines @@
 
   // Sets a new IBus engine handler and old handler will be overridden.
   // This class doesn't take the ownership of |handler|.
   virtual void SetEngine(IBusEngineHandlerInterface* handler) = 0;
 
   // Unsets the current IBus engine handler.
   virtual void UnsetEngine() = 0;
 
   // Emits RegisterProperties signal.
   virtual void RegisterProperties(
-      const ibus::IBusPropertyList& property_list) = 0;
+      const IBusPropertyList& property_list) = 0;
   // Emits UpdatePreedit signal.
-  virtual void UpdatePreedit(const ibus::IBusText& ibus_text,
+  virtual void UpdatePreedit(const IBusText& ibus_text,
                              uint32 cursor_pos,
                              bool is_visible,
                              IBusEnginePreeditFocusOutMode mode) = 0;
   // Emits UpdateAuxiliaryText signal.
-  virtual void UpdateAuxiliaryText(const ibus::IBusText& ibus_text,
+  virtual void UpdateAuxiliaryText(const IBusText& ibus_text,
                                    bool is_visible) = 0;
   // Emits UpdateLookupTable signal.
-  virtual void UpdateLookupTable(const ibus::IBusLookupTable& lookup_table,
+  virtual void UpdateLookupTable(const IBusLookupTable& lookup_table,
                                  bool is_visible) = 0;
   // Emits UpdateProperty signal.
-  virtual void UpdateProperty(const ibus::IBusProperty& property) = 0;
+  virtual void UpdateProperty(const IBusProperty& property) = 0;
   // Emits ForwardKeyEvent signal.
   virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode, uint32 state) = 0;
   // Emits RequireSurroundingText signal.
   virtual void RequireSurroundingText() = 0;
   // Emits CommitText signal.
   virtual void CommitText(const std::string& text) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static CHROMEOS_EXPORT IBusEngineService* Create(
       DBusClientImplementationType type,
       dbus::Bus* bus,
       const dbus::ObjectPath& object_path);
 
  protected:
   // Create() should be used instead.
   IBusEngineService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IBusEngineService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_IBUS_IBUS_ENGINE_SERVICE_H_