| Index: components/exo/pointer_unittest.cc
|
| diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc
|
| index 5948f95cf14a400042b3a4f8f6784c3c424737a2..fa4435b9a8f95eccf16ba1a756ba938baf96c5a3 100644
|
| --- a/components/exo/pointer_unittest.cc
|
| +++ b/components/exo/pointer_unittest.cc
|
| @@ -2,13 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "components/exo/pointer.h"
|
| +
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/shell.h"
|
| +#include "ash/shell_port.h"
|
| #include "ash/wm/window_positioning_utils.h"
|
| -#include "ash/wm_shell.h"
|
| #include "ash/wm_window.h"
|
| #include "components/exo/buffer.h"
|
| -#include "components/exo/pointer.h"
|
| #include "components/exo/pointer_delegate.h"
|
| #include "components/exo/shell_surface.h"
|
| #include "components/exo/surface.h"
|
| @@ -319,7 +320,7 @@ TEST_F(PointerTest, IgnorePointerEventDuringModal) {
|
|
|
| // Make the window modal.
|
| shell_surface2->SetSystemModal(true);
|
| - EXPECT_TRUE(ash::WmShell::Get()->IsSystemModalWindowOpen());
|
| + EXPECT_TRUE(ash::ShellPort::Get()->IsSystemModalWindowOpen());
|
|
|
| EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
|
| EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
|
| @@ -408,7 +409,7 @@ TEST_F(PointerTest, IgnorePointerEventDuringModal) {
|
|
|
| // Make the window non-modal.
|
| shell_surface2->SetSystemModal(false);
|
| - EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
|
| + EXPECT_FALSE(ash::ShellPort::Get()->IsSystemModalWindowOpen());
|
|
|
| // Check if pointer events on non-modal window are registered.
|
| {
|
|
|