Fix candidate window position issue.

chrome/browser/chromeos/input_method/candidate_window_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
@@ skipping 113 matching lines @@
   //   |2 YYY|
   //   |3 ZZZ|
   //
   // Returns 0 if no candidate is present.
   int GetHorizontalOffset();
 
   void set_cursor_location(const gfx::Rect& cursor_location) {
     cursor_location_ = cursor_location;
   }
 
+  void set_composition_head_location(
+      const gfx::Rect& composition_head_location) {
+    composition_head_location_ = composition_head_location;
+  }
+
   const gfx::Rect& cursor_location() const { return cursor_location_; }
+  const gfx::Rect& composition_head_location() const {
+    return composition_head_location_;
+  }
 
  protected:
   // Override View::VisibilityChanged()
   virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
 
   // Override View::OnBoundsChanged()
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(CandidateWindowViewTest, MozcUpdateCandidateTest);
@@ skipping 49 matching lines @@
   InformationTextArea* footer_area_;
 
   // Current columns size in |candidate_area_|.
   gfx::Size previous_shortcut_column_size_;
   gfx::Size previous_candidate_column_size_;
   gfx::Size previous_annotation_column_size_;
 
   // The last cursor location.
   gfx::Rect cursor_location_;
 
-  // This location is used by suggestion window rendering which is mostly used
-  // by ibus-mozc. The suggestion window should be aligned with the composition
-  // text as opposed to the cursor. In case of ibus-mozc, suggestion window
-  // location is calculated by engine and it carried by update_lookup_table
-  // signal as additional information. This value is available when
-  // is_suggestion_window_available is true.
-  gfx::Rect suggestion_window_location_;
+  // The last compostion head location.
+  gfx::Rect composition_head_location_;
 
-  bool is_suggestion_window_location_available_;
+  // True if the candidate window should be shown with aligning with composition
+  // text as opposed to the cursor.
+  bool should_show_at_composition_head_;
 
   // True if the candidate window should be shonw on the upper side of
   // composition text.
   bool should_show_upper_side_;
 
   // True if the candidate window was open.  This is used to determine when to
   // send OnCandidateWindowOpened and OnCandidateWindowClosed events.
   bool was_candidate_window_open_;
 
   // This function judge whether the candidate window should be shown or not,
@@ skipping 60 matching lines @@
   // Information description font
   scoped_ptr<gfx::Font> description_font_;
 
   DISALLOW_COPY_AND_ASSIGN(InfolistWindowView);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_