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

Unified Diff: ui/views/mus/native_widget_mus.cc

Issue 2013503002: Keep non-key event handling in-house for NativeWidgetMus Base URL: https://chromium.googlesource.com/chromium/src.git@native_widget_mus9
Patch Set: Add test for mouse input info agreement between widget and view Created 4 years, 7 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: ui/views/mus/native_widget_mus.cc
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index 8cf60f7192eb697aca0ebe7cf8df66dd682e1d65..e8d687e9a079df92ea9e8249a8542979890964b4 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -1321,9 +1321,14 @@ void NativeWidgetMus::OnWindowInputEvent(
EventAckHandler ack_handler(std::move(*ack_callback));
std::unique_ptr<ui::Event> event = ui::Event::Clone(event_in);
- // TODO(markdittmer): This should be this->OnEvent(event.get()), but that
- // can't happen until IME is refactored out of in WindowTreeHostMus.
- platform_window_delegate()->DispatchEvent(event.get());
+
+ if (!event->IsKeyEvent()) {
+ OnEvent(event.get());
+ } else {
+ // TODO(markdittmer): This should be this->OnEvent(event.get()), but that
+ // can't happen until IME is refactored out of in WindowTreeHostMus.
+ platform_window_delegate()->DispatchEvent(event.get());
+ }
// NOTE: |this| may be deleted.
ack_handler.set_handled(event->handled());

Powered by Google App Engine
This is Rietveld 408576698