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

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

Issue 132453002: Moves CandidateWindow model to ui/base/ime (2nd) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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.cc
diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
index 5adab6490348b6bb49aeaf392747c11158381829..66001faca72f72452132252261620d245ac59c18 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
@@ -19,7 +19,6 @@
#include "ui/gfx/screen.h"
#include "ui/views/widget/widget.h"
-
namespace chromeos {
namespace input_method {
@@ -101,7 +100,7 @@ void CandidateWindowControllerImpl::FocusStateChanged(bool is_focused) {
// static
void CandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
- const CandidateWindow& candidate_window,
+ const ui::CandidateWindow& candidate_window,
std::vector<InfolistEntry>* infolist_entries,
bool* has_highlighted) {
DCHECK(infolist_entries);
@@ -113,7 +112,7 @@ void CandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
candidate_window.cursor_position() % candidate_window.page_size();
for (size_t i = 0; i < candidate_window.candidates().size(); ++i) {
- const CandidateWindow::Entry& ibus_entry =
+ const ui::CandidateWindow::Entry& ibus_entry =
candidate_window.candidates()[i];
if (ibus_entry.description_title.empty() &&
ibus_entry.description_body.empty())
@@ -129,7 +128,7 @@ void CandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
}
void CandidateWindowControllerImpl::UpdateLookupTable(
- const CandidateWindow& candidate_window,
+ const ui::CandidateWindow& candidate_window,
bool visible) {
// If it's not visible, hide the lookup table and return.
if (!visible) {

Powered by Google App Engine
This is Rietveld 408576698