Fix candidate window position issue.

ui/base/ime/input_method_ibus.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/input_method_ibus.h"
 
 #include <glib.h>
 #include <glib-object.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ skipping 316 matching lines @@
 }
 
 void InputMethodIBus::OnCaretBoundsChanged(const TextInputClient* client) {
   if (!context_focused_ || !IsTextInputClientFocused(client))
     return;
 
   // The current text input type should not be NONE if |context_| is focused.
   DCHECK(!IsTextInputTypeNone());
   const gfx::Rect rect = GetTextInputClient()->GetCaretBounds();
 
+  gfx::Rect composition_head;
+  if (!GetTextInputClient()->GetCompositionCharacterBounds(0,
+                                                           &composition_head))

[Yusuke Sato, 2012/06/13 15:17:38]

{} is needed for a multi-line if.

[Seigo Nonaka, 2012/06/14 01:04:57]

Done.

+    composition_head = gfx::Rect();
+
   // This function runs asynchronously.
-  ibus_client_->SetCursorLocation(
-      context_, rect.x(), rect.y(), rect.width(), rect.height());
+  ibus_client_->SetCursorLocation(context_, rect, composition_head);
 }
 
 void InputMethodIBus::CancelComposition(const TextInputClient* client) {
   if (context_focused_ && IsTextInputClientFocused(client))
     ResetContext();
 }
 
 std::string InputMethodIBus::GetInputLocale() {
   // Not supported.
   return "";
@@ skipping 506 matching lines @@
   static IBusBus* ibus = NULL;
 
   if (!ibus) {
     ibus = ibus_client_->GetConnection();
     DCHECK(ibus);
   }
   return ibus;
 }
 
 }  // namespace ui