| Index: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
|
| diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
|
| index 539652577dd2e02ac0d86003a4ffe586cb57d703..9976555bc3b395fd7368a06461220db46c7686fb 100644
|
| --- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
|
| +++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
|
| @@ -18,10 +18,13 @@ namespace views {
|
| class Widget;
|
| } // namespace views
|
|
|
| +namespace ui {
|
| +class CandidateWindow;
|
| +} // namespace ui
|
| +
|
| namespace chromeos {
|
| namespace input_method {
|
|
|
| -class CandidateWindow;
|
| class DelayableWidget;
|
| class ModeIndicatorController;
|
|
|
| @@ -48,7 +51,7 @@ class CandidateWindowControllerImpl
|
| // |has_highlighted| to true if infolist_entries contains highlighted entry.
|
| // TODO(mukai): move this method (and tests) to the new InfolistEntry model.
|
| static void ConvertLookupTableToInfolistEntry(
|
| - const CandidateWindow& candidate_window,
|
| + const ui::CandidateWindow& candidate_window,
|
| std::vector<InfolistEntry>* infolist_entries,
|
| bool* has_highlighted);
|
|
|
| @@ -62,8 +65,9 @@ class CandidateWindowControllerImpl
|
| // IBusPanelCandidateWindowHandlerInterface implementation.
|
| virtual void SetCursorBounds(const gfx::Rect& cursor_bounds,
|
| const gfx::Rect& composition_head) OVERRIDE;
|
| - virtual void UpdateLookupTable(const CandidateWindow& candidate_window,
|
| - bool visible) OVERRIDE;
|
| + virtual void UpdateLookupTable(
|
| + const ui::CandidateWindow& candidate_window,
|
| + bool visible) OVERRIDE;
|
| virtual void UpdatePreeditText(const std::string& utf8_text,
|
| unsigned int cursor, bool visible) OVERRIDE;
|
| virtual void FocusStateChanged(bool is_focused) OVERRIDE;
|
|
|