Partial fix for crbug.com/120597. Send the current cursor location when one of the Japanese IMEs is

chrome/browser/chromeos/input_method/ibus_ui_controller.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/input_method/ibus_ui_controller.h"
 
 #if defined(HAVE_IBUS)
 #include <ibus.h>
 #endif
 
 #include <sstream>
 
+#include "ash/shell.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
-#include "third_party/mozc/session/candidates_lite.pb.h"
-
-#if defined(HAVE_IBUS)
-#include "ash/shell.h"
+#include "chrome/browser/chromeos/input_method/input_method_descriptor.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
+#include "third_party/mozc/session/candidates_lite.pb.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/ime/ibus_client_impl.h"
 #include "ui/base/ime/input_method_ibus.h"
 
+namespace chromeos {
+namespace input_method {
 namespace {
 
-// The list of input method IDs for Mozc Japanese IMEs.
-const char* kMozcJaInputMethodIds[] = { "mozc", "mozc-jp", "mozc-dv" };
+bool IsActive(const std::string& input_method_id,
+              const InputMethodDescriptors* descriptors) {
+  for (size_t i = 0; i < descriptors->size(); ++i) {
+    if (descriptors->at(i).id() == input_method_id) {
+      return true;
+    }
+  }
+  return false;
+}
 
 }  // namespace
-#endif
-
-namespace chromeos {
-namespace input_method {
 
 InputMethodLookupTable::InputMethodLookupTable()
     : visible(false),
       cursor_absolute_index(0),
       page_size(0),
       orientation(kHorizontal) {
 }
 
 InputMethodLookupTable::~InputMethodLookupTable() {
 }
@@ skipping 241 matching lines @@
       const std::string current_input_method_id = GetCurrentInputMethodId();
       return InputMethodUtil::IsKeyboardLayout(current_input_method_id) ?
           INPUT_METHOD_XKB_LAYOUT : INPUT_METHOD_NORMAL;
     }
 
     virtual void SetCursorLocation(IBusInputContext* context,
                                    int32 x,
                                    int32 y,
                                    int32 w,
                                    int32 h) OVERRIDE {
+      // The list of input method IDs for Mozc Japanese IMEs.
+      const char* kMozcJaInputMethodIds[] = { "mozc", "mozc-jp", "mozc-dv" };
+
       if (!ui_)
         return;
 
-      const std::string current_input_method_id = GetCurrentInputMethodId();
+      scoped_ptr<InputMethodDescriptors> input_methods(
+          InputMethodManager::GetInstance()->GetSupportedInputMethods());
       for (size_t i = 0; i < arraysize(kMozcJaInputMethodIds); ++i) {
-        if (kMozcJaInputMethodIds[i] == current_input_method_id) {
+        if (IsActive(kMozcJaInputMethodIds[i], input_methods.get())) {
           // Mozc Japanese IMEs require cursor location information to show the
           // suggestion window in a correct position.
           ui::internal::IBusClientImpl::SetCursorLocation(context, x, y, w, h);
           break;  // call IBusUiControllerImpl::SetCursorLocation() as well.
         }
       }
 
       // We don't have to call ibus_input_context_set_cursor_location() on
       // Chrome OS because the candidate window for IBus is integrated with
       // Chrome.
@@ skipping 418 matching lines @@
 #if defined(HAVE_IBUS)
   return new IBusUiControllerImpl;
 #else
   return new IBusUiControllerStubImpl;
 #endif
 }
 
 IBusUiController::~IBusUiController() {
 }
 
+bool IsActiveForTesting(const std::string& input_method_id,
+                        const InputMethodDescriptors* descriptors) {
+  return IsActive(input_method_id, descriptors);
+}
+
 }  // namespace input_method
 }  // namespace chromeos