Add PointerDetails to ui::MouseEvent's constructors

chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc

 // Copyright 2014 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 "chrome/browser/ui/views/apps/shaped_app_window_targeter.h"
 
 #include <utility>
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "base/macros.h"
@@ skipping 49 matching lines @@
   ChromeNativeAppWindowViewsAura app_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShapedAppWindowTargeterTest);
 };
 
 TEST_F(ShapedAppWindowTargeterTest, HitTestBasic) {
   aura::Window* window = widget()->GetNativeWindow();
   {
     // Without any custom shapes, the event should be targeted correctly to the
     // window.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(40, 40),
-                        gfx::Point(40, 40), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(40, 40), gfx::Point(40, 40),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
 
   std::unique_ptr<SkRegion> region(new SkRegion);
   region->op(SkIRect::MakeXYWH(0, 0, 0, 0), SkRegion::kUnion_Op);
   app_window()->UpdateShape(std::move(region));
   {
     // With an empty custom shape, all events within the window should fall
     // through to the root window.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(40, 40),
-                        gfx::Point(40, 40), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(40, 40), gfx::Point(40, 40),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(root_window(), move.target());
   }
 
   // Window shape (global coordinates)
   //    30       70    90        130
   //  30 +        +-----+
   //       .      |     |             <- mouse move (40,40)
   //  70 +--------+     +---------+
   //     |           .            |   <- mouse move (80,80)
   //  90 +--------+     +---------+
   //              |     |
   // 130          +-----+
   region.reset(new SkRegion);
   region->op(SkIRect::MakeXYWH(40, 0, 20, 100), SkRegion::kUnion_Op);
   region->op(SkIRect::MakeXYWH(0, 40, 100, 20), SkRegion::kUnion_Op);
   app_window()->UpdateShape(std::move(region));
   {
     // With the custom shape, the events that don't fall within the custom shape
     // will go through to the root window.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(40, 40),
-                        gfx::Point(40, 40), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(40, 40), gfx::Point(40, 40),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(root_window(), move.target());
 
     // But events within the shape will still reach the window.
-    ui::MouseEvent move2(ui::ET_MOUSE_MOVED, gfx::Point(80, 80),
-                         gfx::Point(80, 80), ui::EventTimeForNow(), ui::EF_NONE,
-                         ui::EF_NONE);
+    ui::MouseEvent move2(
+        ui::ET_MOUSE_MOVED, gfx::Point(80, 80), gfx::Point(80, 80),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     details = event_sink()->OnEventFromSource(&move2);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move2.target());
   }
 }
 
 TEST_F(ShapedAppWindowTargeterTest, HitTestOnlyForShapedWindow) {
   // Install a window-targeter on the root window that allows a window to
   // receive events outside of its bounds. Verify that this window-targeter is
   // active unless the window has a custom shape.
   gfx::Insets inset(-30);
   root_window()->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(
       new wm::EasyResizeWindowTargeter(root_window(), inset, inset)));
 
   aura::Window* window = widget()->GetNativeWindow();
   {
     // Without any custom shapes, an event within the window bounds should be
     // targeted correctly to the window.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(40, 40),
-                        gfx::Point(40, 40), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(40, 40), gfx::Point(40, 40),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
   {
     // Without any custom shapes, an event that falls just outside the window
     // bounds should also be targeted correctly to the window, because of the
     // targeter installed on the root-window.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
 
   std::unique_ptr<SkRegion> region(new SkRegion);
   region->op(SkIRect::MakeXYWH(40, 0, 20, 100), SkRegion::kUnion_Op);
   region->op(SkIRect::MakeXYWH(0, 40, 100, 20), SkRegion::kUnion_Op);
   app_window()->UpdateShape(std::move(region));
   {
     // With the custom shape, the events that don't fall within the custom shape
     // will go through to the root window.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(root_window(), move.target());
   }
 
   // Remove the custom shape. This should restore the behaviour of targeting the
   // app window for events just outside its bounds.
   app_window()->UpdateShape(std::unique_ptr<SkRegion>());
   {
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(10, 10), gfx::Point(10, 10),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
 }
 
 // Tests targeting of events on a window with an EasyResizeWindowTargeter
 // installed on its container.
 TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
   aura::Window* window = widget()->GetNativeWindow();
   {
     // An event in the center of the window should always have
     // |window| as its target.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(80, 80),
-                        gfx::Point(80, 80), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(80, 80), gfx::Point(80, 80),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
   {
     // Without an EasyResizeTargeter on the container, an event
     // inside the window and within 5px of an edge should have
     // |window| as its target.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(32, 37),
-                        gfx::Point(32, 37), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(32, 37), gfx::Point(32, 37),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
 
 #if !defined(OS_CHROMEOS)
   // The non standard app frame has a easy resize targetter installed.
   std::unique_ptr<views::NonClientFrameView> frame(
       app_window_views()->CreateNonStandardAppFrame());
   {
     // Ensure that the window has an event targeter (there should be an
     // EasyResizeWindowTargeter installed).
     EXPECT_TRUE(static_cast<ui::EventTarget*>(window)->GetEventTargeter());
   }
   {
     // An event in the center of the window should always have
     // |window| as its target.
     // TODO(mgiuca): This isn't really testing anything (note that it has the
     // same expectation as the border case below). In the real environment, the
     // target will actually be the RenderWidgetHostViewAura's window that is the
     // child of the child of |window|, whereas in the border case it *will* be
     // |window|. However, since this test environment does not have a
     // RenderWidgetHostViewAura, we cannot differentiate the two cases. Fix
     // the test environment so that the test can assert that non-border events
     // bubble down to a child of |window|.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(80, 80),
-                        gfx::Point(80, 80), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(80, 80), gfx::Point(80, 80),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
   {
     // With an EasyResizeTargeter on the container, an event
     // inside the window and within 5px of an edge should have
     // |window| as its target.
-    ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(32, 37),
-                        gfx::Point(32, 37), ui::EventTimeForNow(), ui::EF_NONE,
-                        ui::EF_NONE);
+    ui::MouseEvent move(
+        ui::ET_MOUSE_MOVED, gfx::Point(32, 37), gfx::Point(32, 37),
+        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(window, move.target());
   }
 #endif  // defined (OS_CHROMEOS)
 }