Index: components/exo/pointer_unittest.cc |
diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc |
index 5948f95cf14a400042b3a4f8f6784c3c424737a2..883967b058e448594496beed3a8825f81b970297 100644 |
--- a/components/exo/pointer_unittest.cc |
+++ b/components/exo/pointer_unittest.cc |
@@ -2,13 +2,13 @@ |
// 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" |
reveman
2017/04/10 20:50:28
nit: blank line after this
sky
2017/04/10 20:58:36
THis is a bug in git cl format. I fixed this and f
|
#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 +319,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 +408,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. |
{ |