Update ui::PointerEvent to support mouse wheel and capture change events.

ash/wm/immersive_fullscreen_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/immersive_fullscreen_controller.h"
 
 #include <set>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 257 matching lines @@
       break;
     default:
       break;
   }
 }
 
 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 updated the
MouseEvent(PointerEvent) to do the right thing for CAPTURE_CHANGED events. So
the current code should just work?

[riajiang, 2016/08/19 16:19:39]

Removed. I was not getting the right target and location in
PointerWatcherDelegateAura::NotifyWatchers so it was not working without this
block.

+  } else if (event.IsMousePointerEvent()) {
     const ui::MouseEvent mouse_event(event);
     OnMouseEvent(mouse_event, location_in_screen, target);
   } else {
     DCHECK(event.IsTouchPointerEvent());
     const ui::TouchEvent touch_event(event);
     OnTouchEvent(touch_event, location_in_screen);
   }
 }
 
-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:
 
 void ImmersiveFullscreenController::OnWidgetDestroying(views::Widget* widget) {
   EnableWindowObservers(false);
   widget_window_ = nullptr;
 
   // Set |enabled_| to false such that any calls to MaybeStartReveal() and
   // MaybeEndReveal() have no effect.
   enabled_ = false;
@@ skipping 374 matching lines @@
   // another screen in an extended desktop).
   gfx::Rect screen_bounds =
       display::Screen::GetScreen()->GetDisplayNearestPoint(location).bounds();
   return (!screen_bounds.Contains(location) &&
           location.y() < hit_bounds_in_screen.y() &&
           location.x() >= hit_bounds_in_screen.x() &&
           location.x() < hit_bounds_in_screen.right());
 }
 
 }  // namespace ash