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

Unified Diff: services/ui/ws/platform_display_default.cc

Issue 2712963003: mustash: Use ui::chromeos::EventRewriter in mus (Closed)
Patch Set: Address review 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: services/ui/ws/platform_display_default.cc
diff --git a/services/ui/ws/platform_display_default.cc b/services/ui/ws/platform_display_default.cc
index 43fed49ee090ad7ddb617469dd9123fafc337aa7..74475d6bff6326ba0b12c97a7c94e863a562f442 100644
--- a/services/ui/ws/platform_display_default.cc
+++ b/services/ui/ws/platform_display_default.cc
@@ -52,6 +52,10 @@ PlatformDisplayDefault::~PlatformDisplayDefault() {
platform_window_.reset();
}
+EventSink* PlatformDisplayDefault::GetEventSink() {
+ return delegate_->GetEventSink();
+}
+
void PlatformDisplayDefault::Init(PlatformDisplayDelegate* delegate) {
delegate_ = delegate;
@@ -176,14 +180,18 @@ void PlatformDisplayDefault::DispatchEvent(ui::Event* event) {
if (event->IsScrollEvent()) {
// TODO(moshayedi): crbug.com/602859. Dispatch scroll events as
// they are once we have proper support for scroll events.
- delegate_->OnEvent(
- ui::PointerEvent(ui::MouseWheelEvent(*event->AsScrollEvent())));
+
+ ui::PointerEvent pointer_event(
+ ui::MouseWheelEvent(*event->AsScrollEvent()));
+ SendEventToSink(&pointer_event);
} else if (event->IsMouseEvent()) {
- delegate_->OnEvent(ui::PointerEvent(*event->AsMouseEvent()));
+ ui::PointerEvent pointer_event(*event->AsMouseEvent());
+ SendEventToSink(&pointer_event);
} else if (event->IsTouchEvent()) {
- delegate_->OnEvent(ui::PointerEvent(*event->AsTouchEvent()));
+ ui::PointerEvent pointer_event(*event->AsTouchEvent());
+ SendEventToSink(&pointer_event);
} else {
- delegate_->OnEvent(*event);
+ SendEventToSink(event);
}
#if defined(USE_X11) || defined(USE_OZONE)
@@ -208,7 +216,7 @@ void PlatformDisplayDefault::DispatchEvent(ui::Event* event) {
// example, from 'M' to '^M'.
DCHECK_EQ(key_press_event->key_code(), char_event.key_code());
DCHECK_EQ(key_press_event->flags(), char_event.flags());
- delegate_->OnEvent(char_event);
+ SendEventToSink(&char_event);
}
#endif
}

Powered by Google App Engine
This is Rietveld 408576698