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

Unified Diff: ash/wm/immersive_fullscreen_controller.cc

Issue 2256343003: Update ui::PointerEvent to support mouse wheel and capture change events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
Index: ash/wm/immersive_fullscreen_controller.cc
diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc
index d284041fa66a778157cab97968b6d966a15f4aab..31b82a41b9853e65a09cd9e2ec77cd83b348e5ed 100644
--- a/ash/wm/immersive_fullscreen_controller.cc
+++ b/ash/wm/immersive_fullscreen_controller.cc
@@ -275,7 +275,12 @@ void ImmersiveFullscreenController::OnPointerEventObserved(
const ui::PointerEvent& event,
const gfx::Point& location_in_screen,
views::Widget* target) {
- if (event.IsMousePointerEvent()) {
+ if (event.type() == ui::ET_POINTER_CAPTURE_CHANGED) {
+ const ui::MouseEvent event(ui::ET_MOUSE_CAPTURE_CHANGED, gfx::Point(),
+ gfx::Point(), ui::EventTimeForNow(), 0, 0);
+ OnMouseEvent(event, display::Screen::GetScreen()->GetCursorScreenPoint(),
+ nullptr);
sadrul 2016/08/19 04:18:27 Do you need this special block? You have already u
riajiang 2016/08/19 16:19:39 Removed. I was not getting the right target and lo
+ } else if (event.IsMousePointerEvent()) {
const ui::MouseEvent mouse_event(event);
OnMouseEvent(mouse_event, location_in_screen, target);
} else {
@@ -285,13 +290,6 @@ void ImmersiveFullscreenController::OnPointerEventObserved(
}
}
-void ImmersiveFullscreenController::OnMouseCaptureChanged() {
- const ui::MouseEvent event(ui::ET_MOUSE_CAPTURE_CHANGED, gfx::Point(),
- gfx::Point(), ui::EventTimeForNow(), 0, 0);
- OnMouseEvent(event, display::Screen::GetScreen()->GetCursorScreenPoint(),
- nullptr);
-}
-
////////////////////////////////////////////////////////////////////////////////
// views::WidgetObserver overrides:

Powered by Google App Engine
This is Rietveld 408576698