Fix candidate window position issue.

ui/base/ime/ibus_client_impl.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 "ui/base/ime/ibus_client_impl.h"
 
 #include <ibus.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #undef FocusIn
 #undef FocusOut
 
 #include "base/basictypes.h"
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/ime/composition_text.h"
+#include "ui/gfx/rect.h"
 
 // input_method_ibus.cc assumes X and IBus use the same mask for Lock, Control,
 // Shift, Alt, and buttons. Check if the assumption is really correct.
 COMPILE_ASSERT(IBUS_LOCK_MASK == LockMask, test_mask);
 COMPILE_ASSERT(IBUS_CONTROL_MASK == ControlMask, test_mask);
 COMPILE_ASSERT(IBUS_SHIFT_MASK == ShiftMask, test_mask);
 COMPILE_ASSERT(IBUS_MOD1_MASK == Mod1Mask, test_mask);
 COMPILE_ASSERT(IBUS_BUTTON1_MASK == Button1Mask, test_mask);
 COMPILE_ASSERT(IBUS_BUTTON2_MASK == Button2Mask, test_mask);
 COMPILE_ASSERT(IBUS_BUTTON3_MASK == Button3Mask, test_mask);
@@ skipping 90 matching lines @@
 void IBusClientImpl::Reset(IBusInputContext* context) {
   ibus_input_context_reset(context);
 }
 
 IBusClient::InputMethodType IBusClientImpl::GetInputMethodType() {
   // This object cannot know the type of the current IME, hence return NORMAL.
   return INPUT_METHOD_NORMAL;
 }
 
 void IBusClientImpl::SetCursorLocation(IBusInputContext* context,
-                                       int32 x,
-                                       int32 y,
-                                       int32 w,
-                                       int32 h) {
-  ibus_input_context_set_cursor_location(context, x, y, w, h);
+                                       const gfx::Rect& cursor_location,
+                                       const gfx::Rect& composition_head) {
+  ibus_input_context_set_cursor_location(context,
+                                         cursor_location.x(),
+                                         cursor_location.y(),
+                                         cursor_location.width(),
+                                         cursor_location.height());
 }
 
 void IBusClientImpl::SendKeyEvent(IBusInputContext* context,
                                   uint32 keyval,
                                   uint32 keycode,
                                   uint32 state,
                                   PendingKeyEvent* pending_key) {
   // Note:
   // 1. We currently set timeout to -1, because ibus doesn't have a mechanism to
   // associate input method results to corresponding key event, thus there is
@@ skipping 98 matching lines @@
 }
 
 string16 IBusClientImpl::ExtractCommitText(IBusText* text) {
   if (!text || !text->text)
     return WideToUTF16(L"");
   return UTF8ToUTF16(text->text);
 }
 
 }  // namespace internal
 }  // namespace ui