Clean Up: Remove ibus namespace.

chrome/browser/chromeos/input_method/input_method_engine_ibus.cc

Index: chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
index 738a87869c09ce459a729d30c2cf6fac34d8a198..31213d3d57b414e9dab171f1451da246a5cc042f 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
@@ -45,13 +45,13 @@ InputMethodEngineIBus::InputMethodEngineIBus()
       context_id_(0),
       next_context_id_(1),
       current_object_path_(0),
-      aux_text_(new ibus::IBusText()),
+      aux_text_(new IBusText()),
       aux_text_visible_(false),
       observer_(NULL),
-      preedit_text_(new ibus::IBusText()),
+      preedit_text_(new IBusText()),
       preedit_cursor_(0),
-      component_(new ibus::IBusComponent()),
-      table_(new ibus::IBusLookupTable()),
+      component_(new IBusComponent()),
+      table_(new IBusLookupTable()),
       window_visible_(false),
       weak_ptr_factory_(this) {
 }
@@ -93,12 +93,12 @@ void InputMethodEngineIBus::Initialize(
     layout = fallback_desc->keyboard_layout();
   }
 
-  component_.reset(new ibus::IBusComponent());
+  component_.reset(new IBusComponent());
   component_->set_name(std::string(kEngineBusPrefix) + std::string(engine_id));
   component_->set_description(description);
   component_->set_author(engine_name);
 
-  chromeos::ibus::IBusComponent::EngineDescription engine_desc;
+  chromeos::IBusComponent::EngineDescription engine_desc;
   engine_desc.engine_id = ibus_id_;
   engine_desc.display_name = description;
   engine_desc.description = description;
@@ -133,20 +133,20 @@ bool InputMethodEngineIBus::SetComposition(
   }
 
   preedit_cursor_ = cursor;
-  preedit_text_.reset(new ibus::IBusText());
+  preedit_text_.reset(new IBusText());
   preedit_text_->set_text(text);
 
   // TODO: Add support for displaying selected text in the composition string.
   for (std::vector<SegmentInfo>::const_iterator segment = segments.begin();
        segment != segments.end(); ++segment) {
-    ibus::IBusText::UnderlineAttribute underline;
+    IBusText::UnderlineAttribute underline;
 
     switch (segment->style) {
       case SEGMENT_STYLE_UNDERLINE:
-        underline.type = ibus::IBusText::IBUS_TEXT_UNDERLINE_SINGLE;
+        underline.type = IBusText::IBUS_TEXT_UNDERLINE_SINGLE;
         break;
       case SEGMENT_STYLE_DOUBLE_UNDERLINE:
-        underline.type = ibus::IBusText::IBUS_TEXT_UNDERLINE_DOUBLE;
+        underline.type = IBusText::IBUS_TEXT_UNDERLINE_DOUBLE;
         break;
       default:
         continue;
@@ -178,7 +178,7 @@ bool InputMethodEngineIBus::ClearComposition(int context_id,
   }
 
   preedit_cursor_ = 0;
-  preedit_text_.reset(new ibus::IBusText());
+  preedit_text_.reset(new IBusText());
   GetCurrentService()->UpdatePreedit(
       *preedit_text_.get(),
       0,
@@ -222,8 +222,8 @@ void InputMethodEngineIBus::SetCandidateWindowCursorVisible(bool visible) {
 }
 
 void InputMethodEngineIBus::SetCandidateWindowVertical(bool vertical) {
-  table_->set_orientation(vertical ? ibus::IBusLookupTable::VERTICAL :
-                          ibus::IBusLookupTable::HORIZONTAL);
+  table_->set_orientation(vertical ? IBusLookupTable::VERTICAL :
+                          IBusLookupTable::HORIZONTAL);
   if (active_)
     GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
 }
@@ -273,7 +273,7 @@ bool InputMethodEngineIBus::SetCandidates(
   table_->mutable_candidates()->clear();
   for (std::vector<Candidate>::const_iterator ix = candidates.begin();
        ix != candidates.end(); ++ix) {
-    ibus::IBusLookupTable::Entry entry;
+    IBusLookupTable::Entry entry;
     entry.value = ix->value;
     entry.label = ix->label;
     entry.annotation = ix->annotation;
@@ -317,10 +317,10 @@ bool InputMethodEngineIBus::SetMenuItems(const std::vector<MenuItem>& items) {
   if (!active_)
     return false;
 
-  ibus::IBusPropertyList properties;
+  IBusPropertyList properties;
   for (std::vector<MenuItem>::const_iterator item = items.begin();
        item != items.end(); ++item) {
-    ibus::IBusProperty* property = new ibus::IBusProperty();
+    IBusProperty* property = new IBusProperty();
     if (!MenuItemToProperty(*item, property)) {
       delete property;
       DVLOG(1) << "Bad menu item";
@@ -337,10 +337,10 @@ bool InputMethodEngineIBus::UpdateMenuItems(
   if (!active_)
     return false;
 
-  ibus::IBusPropertyList properties;
+  IBusPropertyList properties;
   for (std::vector<MenuItem>::const_iterator item = items.begin();
        item != items.end(); ++item) {
-    ibus::IBusProperty* property = new ibus::IBusProperty();
+    IBusProperty* property = new IBusProperty();
     if (!MenuItemToProperty(*item, property)) {
       delete property;
       DVLOG(1) << "Bad menu item";
@@ -401,7 +401,7 @@ void InputMethodEngineIBus::Disable() {
 
 void InputMethodEngineIBus::PropertyActivate(
     const std::string& property_name,
-    IBusPropertyState property_state) {
+    ibus::IBusPropertyState property_state) {
   observer_->OnMenuItemActivated(engine_id_, property_name);
 }
 
@@ -441,10 +441,9 @@ void InputMethodEngineIBus::ProcessKeyEvent(
       reinterpret_cast<input_method::KeyEventHandle*>(handler));
 }
 
-void InputMethodEngineIBus::CandidateClicked(
-    uint32 index,
-    ibus::IBusMouseButton button,
-    uint32 state) {
+void InputMethodEngineIBus::CandidateClicked(uint32 index,
+                                             ibus::IBusMouseButton button,
+                                             uint32 state) {
   if (index > candidate_ids_.size()) {
     return;
   }
@@ -482,7 +481,7 @@ IBusEngineService* InputMethodEngineIBus::GetCurrentService() {
 
 bool InputMethodEngineIBus::MenuItemToProperty(
     const MenuItem& item,
-    ibus::IBusProperty* property) {
+    IBusProperty* property) {
   property->set_key(item.id);
 
   if (item.modified & MENU_ITEM_MODIFIED_LABEL) {
@@ -498,23 +497,23 @@ bool InputMethodEngineIBus::MenuItemToProperty(
     // TODO(nona): implement sensitive entry(crbug.com/140192).
   }
   if (item.modified & MENU_ITEM_MODIFIED_STYLE) {
-    ibus::IBusProperty::IBusPropertyType type =
-        ibus::IBusProperty::IBUS_PROPERTY_TYPE_NORMAL;
+    IBusProperty::IBusPropertyType type =
+        IBusProperty::IBUS_PROPERTY_TYPE_NORMAL;
     if (!item.children.empty()) {
-      type = ibus::IBusProperty::IBUS_PROPERTY_TYPE_MENU;
+      type = IBusProperty::IBUS_PROPERTY_TYPE_MENU;
     } else {
       switch (item.style) {
         case MENU_ITEM_STYLE_NONE:
-          type = ibus::IBusProperty::IBUS_PROPERTY_TYPE_NORMAL;
+          type = IBusProperty::IBUS_PROPERTY_TYPE_NORMAL;
           break;
         case MENU_ITEM_STYLE_CHECK:
-          type = ibus::IBusProperty::IBUS_PROPERTY_TYPE_TOGGLE;
+          type = IBusProperty::IBUS_PROPERTY_TYPE_TOGGLE;
           break;
         case MENU_ITEM_STYLE_RADIO:
-          type = ibus::IBusProperty::IBUS_PROPERTY_TYPE_RADIO;
+          type = IBusProperty::IBUS_PROPERTY_TYPE_RADIO;
           break;
         case MENU_ITEM_STYLE_SEPARATOR:
-          type = ibus::IBusProperty::IBUS_PROPERTY_TYPE_SEPARATOR;
+          type = IBusProperty::IBUS_PROPERTY_TYPE_SEPARATOR;
           break;
       }
     }
@@ -523,7 +522,7 @@ bool InputMethodEngineIBus::MenuItemToProperty(
 
   for (std::vector<MenuItem>::const_iterator child = item.children.begin();
        child != item.children.end(); ++child) {
-    ibus::IBusProperty* new_property = new ibus::IBusProperty();
+    IBusProperty* new_property = new IBusProperty();
     if (!MenuItemToProperty(*child, new_property)) {
       delete new_property;
       DVLOG(1) << "Bad menu item child";