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

Unified Diff: views/controls/textfield/native_textfield_views.cc

Issue 8491035: Revert 109583 - Move views/ime/text_input_client.h to ui/base/ime/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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: views/controls/textfield/native_textfield_views.cc
===================================================================
--- views/controls/textfield/native_textfield_views.cc (revision 109585)
+++ views/controls/textfield/native_textfield_views.cc (working copy)
@@ -555,7 +555,7 @@
touch_selection_controller_->ClientViewLostFocus();
}
-ui::TextInputClient* NativeTextfieldViews::GetTextInputClient() {
+TextInputClient* NativeTextfieldViews::GetTextInputClient() {
return textfield_->read_only() ? NULL : this;
}
@@ -652,7 +652,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-// NativeTextfieldViews, ui::TextInputClient implementation, private:
+// NativeTextfieldViews, TextInputClient implementation, private:
void NativeTextfieldViews::SetCompositionText(
const ui::CompositionText& composition) {
@@ -813,6 +813,10 @@
return false;
}
+View* NativeTextfieldViews::GetOwnerViewOfTextInputClient() {
+ return textfield_;
+}
+
void NativeTextfieldViews::OnCompositionTextConfirmedOrCleared() {
if (skip_input_method_cancel_composition_)
return;
« no previous file with comments | « views/controls/textfield/native_textfield_views.h ('k') | views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698