Fix to make InputMethodIBus usable on every ChromeOS device (even without TouchUI)

views/widget/native_widget_gtk.cc

Index: views/widget/native_widget_gtk.cc
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index 92ddd11822677a225918347a466b59d02e41bf40..c59f6f132b43561da0cdcdc6d4228a81e6651372 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -45,11 +45,10 @@
 #endif
 #endif
 
-#if defined(TOUCH_UI) && defined(HAVE_IBUS)
+#if defined(HAVE_IBUS)

[oshima, 2011/05/20 21:47:31]

this change adds gtk impl to touch. could you please change so that
touch won't compile  & link gtk?

 #include "views/ime/input_method_ibus.h"
-#else
-#include "views/ime/input_method_gtk.h"
 #endif
+#include "views/ime/input_method_gtk.h"
 
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderGtk;
@@ -620,11 +619,15 @@ void NativeWidgetGtk::InitNativeWidget(const Widget::InitParams& params) {
   // already created at this point.
   // TODO(suzhe): Always enable input method when we start to use
   // RenderWidgetHostViewViews in normal ChromeOS.
-#if defined(TOUCH_UI) && defined(HAVE_IBUS)
-  if (!child_) {
-    input_method_.reset(new InputMethodIBus(this));
-#else
   if (!child_ && NativeTextfieldViews::IsTextfieldViewsEnabled()) {
+#if defined(HAVE_IBUS)
+    if(InputMethodIBus::IsInputMethodIBusEnabled()) {
+      input_method_.reset(new InputMethodIBus(this));
+    }
+    else {
+      input_method_.reset(new InputMethodGtk(this));
+    }
+#else
     input_method_.reset(new InputMethodGtk(this));
 #endif
     input_method_->Init(GetWidget());