Revert 113574 - Remove views::InputMethodIBus.

ui/views/widget/native_widget_gtk.cc

 // Copyright (c) 2011 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 "ui/views/widget/native_widget_gtk.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>
 #include <gdk/gdk.h>
@@ skipping 931 matching lines @@
   if (delegate_lost_capture)
     delegate_->OnMouseCaptureLost();
 }
 
 bool NativeWidgetGtk::HasMouseCapture() const {
   return GTK_WIDGET_HAS_GRAB(window_contents_) || has_pointer_grab_;
 }
 
 InputMethod* NativeWidgetGtk::CreateInputMethod() {
   // Create input method when pure views is enabled but not on views desktop.
+  // TODO(suzhe): Always enable input method when we start to use
+  // RenderWidgetHostViewViews in normal ChromeOS.
   if (views::Widget::IsPureViews()) {
+#if defined(HAVE_IBUS)
+    InputMethod* input_method =
+        InputMethodIBus::IsInputMethodIBusEnabled() ?
+        static_cast<InputMethod*>(new InputMethodIBus(this)) :
+        static_cast<InputMethod*>(new InputMethodGtk(this));
+#else
     InputMethod* input_method = new InputMethodGtk(this);
+#endif
     input_method->Init(GetWidget());
     return input_method;
   }
   // GTK's textfield will handle IME.
   return NULL;
 }
 
 void NativeWidgetGtk::CenterWindow(const gfx::Size& size) {
   gfx::Rect center_rect;
 
@@ skipping 1248 matching lines @@
     button_pressed = event->type == GDK_BUTTON_PRESS ||
         event->type == GDK_2BUTTON_PRESS ||
         event->type == GDK_3BUTTON_PRESS;
     gdk_event_free(event);
   }
   return button_pressed;
 }
 
 }  // namespace internal
 }  // namespace views