Delete redundant functions for auxiliary text.

This patch unifies:
* IBusPanelCandidateWindowHandlerInterface::UpdateAuxiliaryText into UpdateLookupTable
* InputMethodEngineInterface::SetCandidateWindowAuxText into SetCandidateWindowProperty
* InputMethodEngineInterface::SetCandidateWindowAuxTextVisible into SetCandidateWindowProperty


BUG=N/A

Review URL: https://codereview.chromium.org/111333004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242610 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 23 insertions, 0 deletions

diff --git a/chromeos/ime/candidate_window.cc b/chromeos/ime/candidate_window.cc
index b78e05a..75ed3eb 100644
--- a/chromeos/ime/candidate_window.cc
+++ b/chromeos/ime/candidate_window.cc
@@ -29,6 +29,8 @@ bool CandidateWindow::IsEqual(const CandidateWindow& cw) const {
       is_cursor_visible() != cw.is_cursor_visible() ||
       orientation() != cw.orientation() ||
       show_window_at_composition() != cw.show_window_at_composition() ||
+      is_auxiliary_text_visible() != cw.is_auxiliary_text_visible() ||
+      auxiliary_text() != cw.auxiliary_text() ||
       candidates_.size() != cw.candidates_.size())
     return false;
 
diff --git a/chromeos/ime/candidate_window.h b/chromeos/ime/candidate_window.h
index 9de1a16..d0f5f89 100644
--- a/chromeos/ime/candidate_window.h
+++ b/chromeos/ime/candidate_window.h
@@ -30,6 +30,11 @@ class CHROMEOS_EXPORT CandidateWindow {
     bool is_cursor_visible;
     bool is_vertical;
     bool show_window_at_composition;
+
+    // Auxiliary text is typically displayed in the footer of the candidate
+    // window.
+    std::string auxiliary_text;
+    bool is_auxiliary_text_visible;
   };
 
   // Represents a candidate entry.
@@ -83,6 +88,22 @@ class CHROMEOS_EXPORT CandidateWindow {
     property_->is_vertical = (orientation == VERTICAL);
   }
 
+  // Returns true if the auxiliary text is visible.
+  bool is_auxiliary_text_visible() const {
+    return property_->is_auxiliary_text_visible;
+  }
+  void set_is_auxiliary_text_visible(bool is_auxiliary_text_visible) const {
+    property_->is_auxiliary_text_visible = is_auxiliary_text_visible;
+  }
+
+  // Accessors of auxiliary_text.
+  const std::string& auxiliary_text() const {
+    return property_->auxiliary_text;
+  }
+  void set_auxiliary_text(const std::string& auxiliary_text) const {
+    property_->auxiliary_text = auxiliary_text;
+  }
+
   const std::vector<Entry>& candidates() const { return candidates_; }
   std::vector<Entry>* mutable_candidates() { return &candidates_; }