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

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 2712963003: mustash: Use ui::chromeos::EventRewriter in mus (Closed)
Patch Set: Fix build issues. Created 3 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
Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index 2d52d39a8a37ee6c9cb3fbba758df229342b4c82..75a51dccf80f3c5877f3ce950028e5597afd4cfa 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -1789,12 +1789,12 @@ void DesktopWindowTreeHostX11::DispatchMouseEvent(ui::MouseEvent* event) {
FlashFrame(false);
if (!g_current_capture || g_current_capture == this) {
- SendEventToProcessor(event);
+ SendEventToSink(event);
} else {
// Another DesktopWindowTreeHostX11 has installed itself as
// capture. Translate the event's location and dispatch to the other.
ConvertEventToDifferentHost(event, g_current_capture);
- g_current_capture->SendEventToProcessor(event);
+ g_current_capture->SendEventToSink(event);
}
}
@@ -1802,9 +1802,9 @@ void DesktopWindowTreeHostX11::DispatchTouchEvent(ui::TouchEvent* event) {
if (g_current_capture && g_current_capture != this &&
event->type() == ui::ET_TOUCH_PRESSED) {
ConvertEventToDifferentHost(event, g_current_capture);
- g_current_capture->SendEventToProcessor(event);
+ g_current_capture->SendEventToSink(event);
} else {
- SendEventToProcessor(event);
+ SendEventToSink(event);
}
}
@@ -2140,7 +2140,7 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
case ui::ET_SCROLL_FLING_CANCEL:
case ui::ET_SCROLL: {
ui::ScrollEvent scrollev(xev);
- SendEventToProcessor(&scrollev);
+ SendEventToSink(&scrollev);
break;
}
case ui::ET_KEY_PRESSED:
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698