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

views/ime/input_method_ibus.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/ime/input_method_ibus.h"
 
 #include <ibus.h>
 
 #include <cstring>
 #include <set>
 
 #if defined(TOUCH_UI)
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
 
+#include "base/command_line.h"
 #include "base/basictypes.h"
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #include "views/events/event.h"
 #include "views/widget/widget.h"
 
 #if defined(TOUCH_UI)
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #endif
 
 namespace {
 
+// A global flag to switch the InputMethod implementation to InputMethodIBus
+bool inputmethod_ibus_enabled = false;
+
 // Converts ibus key state flags to Views event flags.
 int ViewsFlagsFromIBusState(guint32 state) {
   return (state & IBUS_LOCK_MASK ? ui::EF_CAPS_LOCK_DOWN : 0) |
          (state & IBUS_CONTROL_MASK ? ui::EF_CONTROL_DOWN : 0) |
          (state & IBUS_SHIFT_MASK ? ui::EF_SHIFT_DOWN : 0) |
          (state & IBUS_MOD1_MASK ? ui::EF_ALT_DOWN : 0) |
          (state & IBUS_BUTTON1_MASK ? ui::EF_LEFT_BUTTON_DOWN : 0) |
          (state & IBUS_BUTTON2_MASK ? ui::EF_MIDDLE_BUTTON_DOWN : 0) |
          (state & IBUS_BUTTON3_MASK ? ui::EF_RIGHT_BUTTON_DOWN : 0);
 }
@@ skipping 75 matching lines @@
     }
   }
 
   // Use a black thin underline by default.
   if (composition->underlines.empty()) {
     composition->underlines.push_back(ui::CompositionUnderline(
         0, length, SK_ColorBLACK, false /* thick */));
   }
 }
 
+// A switch to enable InputMethodIBus
+const char kEnableInputMethodIBusSwitch[] = "enable-inputmethod-ibus";
+
 }  // namespace
 
 namespace views {
 
 // InputMethodIBus::PendingKeyEvent implementation ----------------------------
 class InputMethodIBus::PendingKeyEvent {
  public:
   PendingKeyEvent(InputMethodIBus* input_method, const KeyEvent& key);
   ~PendingKeyEvent();
 
@@ skipping 263 matching lines @@
 
 base::i18n::TextDirection InputMethodIBus::GetInputTextDirection() {
   // Not supported.
   return base::i18n::UNKNOWN_DIRECTION;
 }
 
 bool InputMethodIBus::IsActive() {
   return context_ != NULL;
 }
 
+// static
+bool InputMethodIBus::IsInputMethodIBusEnabled() {
+#if defined(TOUCH_UI)
+  return true;
+#else
+  return inputmethod_ibus_enabled ||
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          kEnableInputMethodIBusSwitch);
+#endif
+}
+
+// static
+void InputMethodIBus::SetEnableInputMethodIBus(bool enabled) {
+  inputmethod_ibus_enabled = enabled;
+}
+
 void InputMethodIBus::FocusedViewWillChange() {
   ConfirmCompositionText();
 }
 
 void InputMethodIBus::FocusedViewDidChange() {
   UpdateContextFocusState();
 
   // Force to update caret bounds, in case the View thinks that the caret
   // bounds has not changed.
   if (context_focused_)
@@ skipping 546 matching lines @@
   DCHECK_EQ(GetIBus(), bus);
   DCHECK(data);
   IBusInputContext* ic =
       ibus_bus_create_input_context_async_finish(bus, res, NULL);
   if (ic)
     data->StoreOrAbandonInputContext(ic);
   delete data;
 }
 
 }  // namespace views