Fix candidate window position issue.

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
 
@@ skipping 277 matching lines @@
     }
 
     // ui::IBusClient override.
     virtual InputMethodType GetInputMethodType() OVERRIDE {
       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,

[Yusuke Sato, 2012/06/13 14:31:26]

line 298-301: const gfx::Rect&

[Seigo Nonaka, 2012/06/13 15:07:18]

Done.

                                    int32 y,
                                    int32 w,
-                                   int32 h) OVERRIDE {
-      // The list of input method IDs for Mozc Japanese IMEs.

[Yusuke Sato, 2012/06/13 14:31:26]

super-nice :)
I'm very happy to see the hack will be gone soon.

-      const char* kMozcJaInputMethodIds[] = { "mozc", "mozc-jp", "mozc-dv" };
-
+                                   int32 h,
+                                   const gfx::Rect& composition_head) OVERRIDE {
       if (!ui_)
         return;
-
-      scoped_ptr<InputMethodDescriptors> input_methods(
-          InputMethodManager::GetInstance()->GetSupportedInputMethods());
-      for (size_t i = 0; i < arraysize(kMozcJaInputMethodIds); ++i) {
-        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.
-      ui_->SetCursorLocation(NULL, x, y, w, h);
+      ui_->SetCursorLocation(NULL, x, y, w, h, composition_head);
     }
 
     void set_ui(IBusUiControllerImpl* ui) {
       ui_ = ui;
     }
 
    private:
     std::string GetCurrentInputMethodId() {
       InputMethodManager* manager = InputMethodManager::GetInstance();
       return manager->GetCurrentInputMethod().id();
@@ skipping 43 matching lines @@
   static void UpdateAuxiliaryTextThunk(IBusPanelService* sender,
                                        IBusText* text, gboolean visible,
                                        gpointer userdata) {
     return reinterpret_cast<IBusUiControllerImpl*>(userdata)
         ->UpdateAuxiliaryText(sender, text, visible);
   }
   static void SetCursorLocationThunk(IBusPanelService* sender,
                                      gint x, gint y, gint width, gint height,
                                      gpointer userdata) {
     return reinterpret_cast<IBusUiControllerImpl*>(userdata)
-        ->SetCursorLocation(sender, x, y, width, height);
+        ->SetCursorLocation(sender, x, y, width, height, gfx::Rect());
   }
   static void UpdateLookupTableThunk(IBusPanelService* sender,
                                      IBusLookupTable* table, gboolean visible,
                                      gpointer userdata) {
     return reinterpret_cast<IBusUiControllerImpl*>(userdata)
         ->UpdateLookupTable(sender, table, visible);
   }
   static void UpdatePreeditTextThunk(IBusPanelService* sender,
                                      IBusText* text,
                                      guint cursor_pos,
@@ skipping 166 matching lines @@
     const std::string simple_text = text->text;
     FOR_EACH_OBSERVER(Observer, observers_,
                       OnUpdateAuxiliaryText(simple_text, visible == TRUE));
   }
 
   // Handles IBusPanelService's |SetCursorLocation| method call.
   void SetCursorLocation(IBusPanelService *panel,
                          gint x,
                          gint y,
                          gint width,
-                         gint height) {
+                         gint height,
+                         const gfx::Rect& composition_head) {
     // Note: |panel| might be NULL. See IBusChromeOSClientImpl above.
     FOR_EACH_OBSERVER(Observer, observers_,
-                      OnSetCursorLocation(x, y, width, height));
+                      OnSetCursorLocation(x, y, width, height,
+                                          composition_head));
   }
 
   // Handles IBusPanelService's |UpdatePreeditText| method call.
   void UpdatePreeditText(IBusPanelService *panel,
                          IBusText *text,
                          guint cursor_pos,
                          gboolean visible) {
     FOR_EACH_OBSERVER(Observer, observers_,
                       OnUpdatePreeditText(text->text, cursor_pos, visible));
   }
@@ skipping 164 matching lines @@
 IBusUiController::~IBusUiController() {
 }
 
 bool IsActiveForTesting(const std::string& input_method_id,
                         const InputMethodDescriptors* descriptors) {
   return IsActive(input_method_id, descriptors);
 }
 
 }  // namespace input_method
 }  // namespace chromeos