| 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) {
|
|
|