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

3 files changed, 1 insertions, 27 deletions

diff --git a/ui/base/ime/chromeos/ibus_bridge.h b/ui/base/ime/chromeos/ibus_bridge.h
index 08e314b..4383bd8 100644
--- a/ui/base/ime/chromeos/ibus_bridge.h
+++ b/ui/base/ime/chromeos/ibus_bridge.h
@@ -115,10 +115,6 @@ class UI_EXPORT IBusPanelCandidateWindowHandlerInterface {
       const input_method::CandidateWindow& candidate_window,
       bool visible) = 0;
 
-  // Called when the IME updates the auxiliary text. The |text| is given in
-  // UTF-8 encoding.
-  virtual void UpdateAuxiliaryText(const std::string& text, bool visible) = 0;
-
   // Called when the IME updates the preedit text. The |text| is given in
   // UTF-8 encoding.
   virtual void UpdatePreeditText(const std::string& text, uint32 cursor_pos,
diff --git a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc
index 7491643..b7bf198 100644
--- a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc
+++ b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc
@@ -8,8 +8,7 @@ namespace chromeos {
 
 MockIMECandidateWindowHandler::MockIMECandidateWindowHandler()
     : set_cursor_bounds_call_count_(0),
-      update_lookup_table_call_count_(0),
-      update_auxiliary_text_call_count_(0) {
+      update_lookup_table_call_count_(0) {
 }
 
 MockIMECandidateWindowHandler::~MockIMECandidateWindowHandler() {
@@ -24,13 +23,6 @@ void MockIMECandidateWindowHandler::UpdateLookupTable(
   last_update_lookup_table_arg_.is_visible = visible;
 }
 
-void MockIMECandidateWindowHandler::UpdateAuxiliaryText(const std::string& text,
-                                                        bool visible) {
-  ++update_auxiliary_text_call_count_;
-  last_update_auxiliary_text_arg_.text = text;
-  last_update_auxiliary_text_arg_.is_visible = visible;
-}
-
 void MockIMECandidateWindowHandler::UpdatePreeditText(const std::string& text,
                                                       uint32 cursor_pos,
                                                       bool visible) {
@@ -45,7 +37,6 @@ void MockIMECandidateWindowHandler::SetCursorBounds(
 void MockIMECandidateWindowHandler::Reset() {
   set_cursor_bounds_call_count_ = 0;
   update_lookup_table_call_count_ = 0;
-  update_auxiliary_text_call_count_ = 0;
 }
 
 }  // namespace chromeos
diff --git a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h
index 5d03b12..6f7829c 100644
--- a/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h
+++ b/ui/base/ime/chromeos/mock_ime_candidate_window_handler.h
@@ -31,8 +31,6 @@ class UI_EXPORT MockIMECandidateWindowHandler
   virtual void UpdateLookupTable(
       const input_method::CandidateWindow& candidate_window,
       bool visible) OVERRIDE;
-  virtual void UpdateAuxiliaryText(const std::string& text,
-                                   bool visible) OVERRIDE;
   virtual void UpdatePreeditText(const std::string& text, uint32 cursor_pos,
                                  bool visible) OVERRIDE;
   virtual void SetCursorBounds(const gfx::Rect& cursor_bounds,
@@ -46,27 +44,16 @@ class UI_EXPORT MockIMECandidateWindowHandler
     return update_lookup_table_call_count_;
   }
 
-  int update_auxiliary_text_call_count() const {
-    return update_auxiliary_text_call_count_;
-  }
-
   const UpdateLookupTableArg& last_update_lookup_table_arg() {
     return last_update_lookup_table_arg_;
   }
-
-  const UpdateAuxiliaryTextArg& last_update_auxiliary_text_arg() {
-    return last_update_auxiliary_text_arg_;
-  }
-
   // Resets all call count.
   void Reset();
 
  private:
   int set_cursor_bounds_call_count_;
   int update_lookup_table_call_count_;
-  int update_auxiliary_text_call_count_;
   UpdateLookupTableArg last_update_lookup_table_arg_;
-  UpdateAuxiliaryTextArg last_update_auxiliary_text_arg_;
 };
 
 }  // namespace chromeos