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

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

Issue 6675005: Integrate the new input method API for Views into Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Windows build. Created 9 years, 9 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
« no previous file with comments | « views/controls/textfield/native_textfield_gtk.h ('k') | views/controls/textfield/native_textfield_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/textfield/native_textfield_gtk.cc
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index ec7c27118dd88095a1f7e66ccd29ab577e322baf..77b39402238aa606beb473dcace8c1f6bb95087b 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -376,6 +376,10 @@ void NativeTextfieldGtk::HandleFocus() {
void NativeTextfieldGtk::HandleBlur() {
}
+TextInputClient* NativeTextfieldGtk::GetTextInputClient() {
+ return NULL;
+}
+
// static
gboolean NativeTextfieldGtk::OnKeyPressEventHandler(
GtkWidget* widget,
@@ -405,18 +409,16 @@ gboolean NativeTextfieldGtk::OnActivate() {
if (!event || event->type != GDK_KEY_PRESS)
return false;
- GdkEventKey* key_event = reinterpret_cast<GdkEventKey*>(event);
+ KeyEvent views_key_event(event);
gboolean handled = false;
TextfieldController* controller = textfield_->GetController();
- if (controller) {
- KeyEvent views_key_event(event);
+ if (controller)
handled = controller->HandleKeyEvent(textfield_, views_key_event);
- }
WidgetGtk* widget = static_cast<WidgetGtk*>(GetWidget());
if (!handled && widget)
- handled = widget->HandleKeyboardEvent(key_event);
+ handled = widget->HandleKeyboardEvent(views_key_event);
return handled;
}
@@ -430,9 +432,6 @@ gboolean NativeTextfieldGtk::OnChangedHandler(
gboolean NativeTextfieldGtk::OnChanged() {
textfield_->SyncText();
- TextfieldController* controller = textfield_->GetController();
- if (controller)
- controller->ContentsChanged(textfield_, GetText());
textfield_->GetWidget()->NotifyAccessibilityEvent(
textfield_, ui::AccessibilityTypes::EVENT_TEXT_CHANGED, true);
return false;
« no previous file with comments | « views/controls/textfield/native_textfield_gtk.h ('k') | views/controls/textfield/native_textfield_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698