Remove InputMethodLookupTable and use IBusLookupTable instead.

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 "chrome/browser/chromeos/input_method/ibus_ui_controller.h"
+#include "chromeos/dbus/ibus/ibus_lookup_table.h"
 #include "ui/views/view.h"
 
 namespace gfx {
 class Font;
 }
 
 namespace chromeos {
+class IBusLookupTable;
 namespace input_method {
 
 class CandidateView;
 class HidableArea;
 class InformationTextArea;
 
 // CandidateWindowView is the main container of the candidate window UI.
 class CandidateWindowView : public views::View {
  public:
   // The object can be monitored by the observer.
@@ skipping 61 matching lines @@
   void UpdateAuxiliaryText(const std::string& utf8_text);
 
   // Updates the preedit text.
   void UpdatePreeditText(const std::string& utf8_text);
 
   // Returns true if we should update candidate views in the window.  For
   // instance, if we are going to show the same candidates as before, we
   // don't have to update candidate views. This happens when the user just
   // moves the cursor in the same page in the candidate window.
   static bool ShouldUpdateCandidateViews(
-      const InputMethodLookupTable& old_table,
-      const InputMethodLookupTable& new_table);
+      const ibus::IBusLookupTable& old_table,
+      const ibus::IBusLookupTable& new_table);
 
   // Updates candidates of the candidate window from |lookup_table|.
   // Candidates are arranged per |orientation|.
-  void UpdateCandidates(const InputMethodLookupTable& lookup_table);
+  void UpdateCandidates(const ibus::IBusLookupTable& lookup_table);
 
   // Resizes and moves the parent frame. The two actions should be
   // performed consecutively as resizing may require the candidate window
   // to move. For instance, we may need to move the candidate window from
   // below the cursor to above the cursor, if the candidate window becomes
   // too big to be shown near the bottom of the screen.  This function
   // needs to be called when the visible contents of the candidate window
   // are modified.
   void ResizeAndMoveParentFrame();
 
@@ skipping 31 matching lines @@
   // Override View::OnBoundsChanged()
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(CandidateWindowViewTest, MozcUpdateCandidateTest);
   FRIEND_TEST_ALL_PREFIXES(CandidateWindowViewTest, ShortcutSettingTest);
   FRIEND_TEST_ALL_PREFIXES(CandidateWindowViewTest,
                            DoNotChangeRowHeightWithLabelSwitchTest);
 
   // Initializes the candidate views if needed.
-  void MaybeInitializeCandidateViews(
-      const InputMethodLookupTable& lookup_table);
+  void MaybeInitializeCandidateViews(const ibus::IBusLookupTable& lookup_table);
 
   // Returns the appropriate area (header or footer) to put auxiliary texts.
   InformationTextArea* GetAuxiliaryTextArea();
 
   // Returns true if the candidate window is open.  The suggestion window does
   // not count as the candidate window.
   bool IsCandidateWindowOpen() const;
 
   // Notifies observers if the candidate window's opened/closed state has
   // changed from the previous call to this function.
   void NotifyIfCandidateWindowOpenedOrClosed();
 
   // The lookup table (candidates).
-  InputMethodLookupTable lookup_table_;
+  ibus::IBusLookupTable lookup_table_;
 
   // The index in the current page of the candidate currently being selected.
   int selected_candidate_index_in_page_;
 
   // The observers of the object.
   ObserverList<Observer> observers_;
 
   // The parent frame.
   views::Widget* parent_frame_;
 
@@ skipping 44 matching lines @@
   // if should be, shows parent_frame and if not, hides parent_frame.
   void UpdateParentArea();
 
   DISALLOW_COPY_AND_ASSIGN(CandidateWindowView);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_