Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1055)

Unified Diff: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

Issue 24946003: Rename IBusLookupTable to CandidateWindow, and move it to chromeos/ime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3b6c4ebe0c568f864344e7696f1b909743ec6f3a..618523c30923627a31e4ecdba24a0beda3c9bee7 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
@@ -19,10 +19,9 @@ class Widget;
} // namespace views
namespace chromeos {
-class IBusLookupTable;
-
namespace input_method {
+class CandidateWindow;
class DelayableWidget;
// The implementation of CandidateWindowController.
@@ -56,10 +55,10 @@ class CandidateWindowControllerImpl
const gfx::Rect& screen_rect,
const gfx::Size& infolist_winodw_size);
- // Converts |lookup_table| to infolist entries. |focused_index| become
+ // Converts |candidate_window| to infolist entries. |focused_index| become
// InfolistWindowView::InvalidFocusIndex if there is no selected entries.
static void ConvertLookupTableToInfolistEntry(
- const IBusLookupTable& lookup_table,
+ const CandidateWindow& candidate_window,
std::vector<InfolistWindowView::Entry>* infolist_entries,
size_t* focused_index);
@@ -88,7 +87,7 @@ class CandidateWindowControllerImpl
const ibus::Rect& composition_head) OVERRIDE;
virtual void UpdateAuxiliaryText(const std::string& utf8_text,
bool visible) OVERRIDE;
- virtual void UpdateLookupTable(const IBusLookupTable& lookup_table,
+ virtual void UpdateLookupTable(const CandidateWindow& candidate_window,
bool visible) OVERRIDE;
virtual void UpdatePreeditText(const std::string& utf8_text,
unsigned int cursor, bool visible) OVERRIDE;
@@ -98,7 +97,7 @@ class CandidateWindowControllerImpl
void UpdateInfolistBounds();
// The candidate window view.
- CandidateWindowView* candidate_window_;
+ CandidateWindowView* candidate_window_view_;
// This is the outer frame of the candidate window view. The frame will
// own |candidate_window_|.

Powered by Google App Engine
This is Rietveld 408576698