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

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 "views/widget/native_widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 26 matching lines @@
 
 #if defined(TOUCH_UI)
 #if defined(HAVE_XINPUT2)
 #include <gdk/gdkx.h>
 
 #include "ui/gfx/gtk_util.h"
 #include "views/touchui/touch_factory.h"
 #endif
 #endif
 
-#if defined(TOUCH_UI) && defined(HAVE_IBUS)
+#if defined(HAVE_IBUS)
 #include "views/ime/input_method_ibus.h"
-#else
+#endif
+#if !defined(TOUCH_UI)
 #include "views/ime/input_method_gtk.h"
 #endif
 
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderGtk;
 using ui::ActiveWindowWatcherX;
 
 namespace views {
 
 namespace {
@@ skipping 552 matching lines @@
 
   // Make container here.
   CreateGtkWidget(modified_params);
   delegate_->OnNativeWidgetCreated();
 
   // Creates input method for toplevel widget after calling
   // delegate_->OnNativeWidgetCreated(), to make sure that focus manager is
   // 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_) {
+  if (!child_ && NativeTextfieldViews::IsTextfieldViewsEnabled()) {
+#if defined(TOUCH_UI)
     input_method_.reset(new InputMethodIBus(this));
+#elif defined(HAVE_IBUS)
+    input_method_.reset(InputMethodIBus::IsInputMethodIBusEnabled() ?
+                        static_cast<InputMethod*>(new InputMethodIBus(this)) :
+                        static_cast<InputMethod*>(new InputMethodGtk(this)));
 #else
-  if (!child_ && NativeTextfieldViews::IsTextfieldViewsEnabled()) {
     input_method_.reset(new InputMethodGtk(this));
 #endif
     input_method_->Init(GetWidget());
   }
 
   if (opacity_ != 255)
     SetOpacity(opacity_);
 
   // Make sure we receive our motion events.
 
@@ skipping 1168 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views