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

Unified Diff: ui/views/widget/desktop_native_widget_aura.cc

Issue 10911317: KeyEvent work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 | « ui/views/views.gyp ('k') | ui/views/widget/desktop_root_window_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_native_widget_aura.cc
===================================================================
--- ui/views/widget/desktop_native_widget_aura.cc (revision 156802)
+++ ui/views/widget/desktop_native_widget_aura.cc (working copy)
@@ -117,7 +117,7 @@
}
InputMethod* DesktopNativeWidgetAura::CreateInputMethod() {
- return NULL;
+ return desktop_root_window_host_->CreateInputMethod();
}
internal::InputMethodDelegate*
@@ -380,7 +380,8 @@
// DesktopNativeWidgetAura, ui::EventHandler implementation:
ui::EventResult DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
- return ui::ER_UNHANDLED;
+ return native_widget_delegate_->OnKeyEvent(*event) ? ui::ER_HANDLED :
+ ui::ER_UNHANDLED;
}
ui::EventResult DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/desktop_root_window_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698