| Index: chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
|
| diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
|
| index 88a0bbcb2103e3c8930266b1ce3123cfc9e15923..7448ccf4030c1114c117c2819bae9a5e3291c308 100644
|
| --- a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
|
| +++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
|
| @@ -70,8 +70,7 @@ TEST_F(ShapedAppWindowTargeterTest, HitTestBasic) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(40, 40),
|
| gfx::Point(40, 40), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move.target());
|
| }
|
| @@ -85,8 +84,7 @@ TEST_F(ShapedAppWindowTargeterTest, HitTestBasic) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(40, 40),
|
| gfx::Point(40, 40), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(root_window(), move.target());
|
| }
|
| @@ -110,8 +108,7 @@ TEST_F(ShapedAppWindowTargeterTest, HitTestBasic) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(40, 40),
|
| gfx::Point(40, 40), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(root_window(), move.target());
|
|
|
| @@ -119,7 +116,7 @@ TEST_F(ShapedAppWindowTargeterTest, HitTestBasic) {
|
| ui::MouseEvent move2(ui::ET_MOUSE_MOVED, gfx::Point(80, 80),
|
| gfx::Point(80, 80), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - details = event_processor()->OnEventFromSource(&move2);
|
| + details = event_sink()->OnEventFromSource(&move2);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move2.target());
|
| }
|
| @@ -140,8 +137,7 @@ TEST_F(ShapedAppWindowTargeterTest, HitTestOnlyForShapedWindow) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(40, 40),
|
| gfx::Point(40, 40), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move.target());
|
| }
|
| @@ -152,8 +148,7 @@ TEST_F(ShapedAppWindowTargeterTest, HitTestOnlyForShapedWindow) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
|
| gfx::Point(10, 10), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move.target());
|
| }
|
| @@ -168,8 +163,7 @@ TEST_F(ShapedAppWindowTargeterTest, HitTestOnlyForShapedWindow) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
|
| gfx::Point(10, 10), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(root_window(), move.target());
|
| }
|
| @@ -181,8 +175,7 @@ TEST_F(ShapedAppWindowTargeterTest, HitTestOnlyForShapedWindow) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
|
| gfx::Point(10, 10), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move.target());
|
| }
|
| @@ -198,8 +191,7 @@ TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(80, 80),
|
| gfx::Point(80, 80), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move.target());
|
| }
|
| @@ -210,8 +202,7 @@ TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(32, 37),
|
| gfx::Point(32, 37), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move.target());
|
| }
|
| @@ -239,8 +230,7 @@ TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(80, 80),
|
| gfx::Point(80, 80), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move.target());
|
| }
|
| @@ -251,8 +241,7 @@ TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
|
| ui::MouseEvent move(ui::ET_MOUSE_MOVED, gfx::Point(32, 37),
|
| gfx::Point(32, 37), ui::EventTimeForNow(), ui::EF_NONE,
|
| ui::EF_NONE);
|
| - ui::EventDispatchDetails details =
|
| - event_processor()->OnEventFromSource(&move);
|
| + ui::EventDispatchDetails details = event_sink()->OnEventFromSource(&move);
|
| ASSERT_FALSE(details.dispatcher_destroyed);
|
| EXPECT_EQ(window, move.target());
|
| }
|
|
|