diff options
Diffstat (limited to 'chromium/components/exo/touch_unittest.cc')
| -rw-r--r-- | chromium/components/exo/touch_unittest.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/chromium/components/exo/touch_unittest.cc b/chromium/components/exo/touch_unittest.cc index 1384229ac62..665b2701c4e 100644 --- a/chromium/components/exo/touch_unittest.cc +++ b/chromium/components/exo/touch_unittest.cc @@ -2,18 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/common/wm/window_positioner.h" -#include "ash/common/wm/window_positioning_utils.h" -#include "ash/common/wm_shell.h" -#include "ash/common/wm_window.h" +#include "components/exo/touch.h" + #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" +#include "ash/shell_port.h" +#include "ash/wm/window_positioner.h" +#include "ash/wm/window_positioning_utils.h" +#include "ash/wm_window.h" #include "components/exo/buffer.h" #include "components/exo/shell_surface.h" #include "components/exo/surface.h" #include "components/exo/test/exo_test_base.h" #include "components/exo/test/exo_test_helper.h" -#include "components/exo/touch.h" #include "components/exo/touch_delegate.h" #include "components/exo/touch_stylus_delegate.h" #include "testing/gmock/include/gmock/gmock.h" @@ -210,8 +211,9 @@ TEST_F(TouchTest, OnTouchCancel) { // One touch point being canceled is enough for OnTouchCancel to be called. EXPECT_CALL(delegate, OnTouchCancel()); EXPECT_CALL(delegate, OnTouchFrame()); - ui::TouchEvent cancel_event(ui::ET_TOUCH_CANCELLED, gfx::Point(), 1, - ui::EventTimeForNow()); + ui::TouchEvent cancel_event( + ui::ET_TOUCH_CANCELLED, gfx::Point(), ui::EventTimeForNow(), + ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1)); generator.Dispatch(&cancel_event); EXPECT_CALL(delegate, OnTouchDestroying(touch.get())); @@ -229,7 +231,7 @@ TEST_F(TouchTest, IgnoreTouchEventDuringModal) { // Make the window modal. modal.shell_surface()->SetSystemModal(true); - EXPECT_TRUE(ash::WmShell::Get()->IsSystemModalWindowOpen()); + EXPECT_TRUE(ash::ShellPort::Get()->IsSystemModalWindowOpen()); EXPECT_CALL(delegate, OnTouchShape(testing::_, testing::_, testing::_)) .Times(testing::AnyNumber()); EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(window.surface())) @@ -269,7 +271,7 @@ TEST_F(TouchTest, IgnoreTouchEventDuringModal) { // Make the window non-modal. modal.shell_surface()->SetSystemModal(false); - EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen()); + EXPECT_FALSE(ash::ShellPort::Get()->IsSystemModalWindowOpen()); // Check if touch events on non-modal window are registered. { |