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

Unified Diff: ash/shared/immersive_fullscreen_controller.cc

Issue 2301593002: Add POINTER_WHEEL_CHANGED event to mojo. (Closed)
Patch Set: Created 4 years, 4 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 | « no previous file | services/ui/public/cpp/window_tree_client.cc » ('j') | ui/events/event.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shared/immersive_fullscreen_controller.cc
diff --git a/ash/shared/immersive_fullscreen_controller.cc b/ash/shared/immersive_fullscreen_controller.cc
index bf26c2cb5ead4eaff35e53ee439896b887f54312..c648f41a53e1b2e81aac3e3b168d934b06098c63 100644
--- a/ash/shared/immersive_fullscreen_controller.cc
+++ b/ash/shared/immersive_fullscreen_controller.cc
@@ -234,8 +234,13 @@ void ImmersiveFullscreenController::OnPointerEventObserved(
const gfx::Point& location_in_screen,
views::Widget* target) {
if (event.IsMousePointerEvent()) {
- const ui::MouseEvent mouse_event(event);
- OnMouseEvent(mouse_event, location_in_screen, target);
+ if (event.type() == ui::ET_POINTER_WHEEL_CHANGED) {
+ const ui::MouseWheelEvent mouse_wheel_event(event);
+ OnMouseEvent(mouse_wheel_event, location_in_screen, target);
+ } else {
+ const ui::MouseEvent mouse_event(event);
+ OnMouseEvent(mouse_event, location_in_screen, target);
+ }
} else {
DCHECK(event.IsTouchPointerEvent());
const ui::TouchEvent touch_event(event);
« no previous file with comments | « no previous file | services/ui/public/cpp/window_tree_client.cc » ('j') | ui/events/event.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698