Index: ash/wm/window_state_unittest.cc |
diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc |
index 4c95ce7476a761d2d79d6cdeca4c2aee313209a5..9184d299418373b6e1f53158f4665183bac8d582 100644 |
--- a/ash/wm/window_state_unittest.cc |
+++ b/ash/wm/window_state_unittest.cc |
@@ -7,13 +7,13 @@ |
#include <utility> |
#include "ash/screen_util.h" |
-#include "ash/shell.h" |
#include "ash/test/ash_test_base.h" |
#include "ash/wm/window_state.h" |
#include "ash/wm/wm_event.h" |
#include "ui/aura/client/aura_constants.h" |
#include "ui/aura/test/test_window_delegate.h" |
#include "ui/aura/window.h" |
+#include "ui/gfx/screen.h" |
namespace ash { |
namespace wm { |
@@ -58,7 +58,7 @@ TEST_F(WindowStateTest, SnapWindowBasic) { |
UpdateDisplay("0+0-500x400, 0+500-600x400"); |
const gfx::Rect kPrimaryDisplayWorkAreaBounds = |
- ash::Shell::GetScreen()->GetPrimaryDisplay().work_area(); |
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area(); |
const gfx::Rect kSecondaryDisplayWorkAreaBounds = |
ScreenUtil::GetSecondaryDisplay().work_area(); |
@@ -105,7 +105,7 @@ TEST_F(WindowStateTest, SnapWindowMinimumSize) { |
UpdateDisplay("0+0-600x900"); |
const gfx::Rect kWorkAreaBounds = |
- ash::Shell::GetScreen()->GetPrimaryDisplay().work_area(); |
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area(); |
aura::test::TestWindowDelegate delegate; |
scoped_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate( |
@@ -171,7 +171,7 @@ TEST_F(WindowStateTest, TestIgnoreTooBigMinimumSize) { |
UpdateDisplay("0+0-1024x768"); |
const gfx::Size work_area_size = |
- ash::Shell::GetScreen()->GetPrimaryDisplay().work_area().size(); |
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area().size(); |
const gfx::Size illegal_size(1280, 960); |
const gfx::Rect illegal_bounds(gfx::Point(0, 0), illegal_size); |
@@ -202,7 +202,7 @@ TEST_F(WindowStateTest, SnapWindowSetBounds) { |
UpdateDisplay("0+0-900x600"); |
const gfx::Rect kWorkAreaBounds = |
- ash::Shell::GetScreen()->GetPrimaryDisplay().work_area(); |
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area(); |
scoped_ptr<aura::Window> window( |
CreateTestWindowInShellWithBounds(gfx::Rect(100, 100, 100, 100))); |
@@ -278,7 +278,7 @@ TEST_F(WindowStateTest, AutoManaged) { |
window_state->OnWMEvent(&snap_right); |
const gfx::Rect kWorkAreaBounds = |
- ash::Shell::GetScreen()->GetPrimaryDisplay().work_area(); |
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area(); |
gfx::Rect expected_snapped_bounds( |
kWorkAreaBounds.x() + kWorkAreaBounds.width() / 2, |
kWorkAreaBounds.y(), |
@@ -323,7 +323,7 @@ TEST_F(WindowStateTest, RestoredWindowBoundsShrink) { |
WindowState* window_state = GetWindowState(window.get()); |
EXPECT_FALSE(window_state->IsMaximized()); |
gfx::Rect work_area = |
- ash::Shell::GetScreen()->GetPrimaryDisplay().work_area(); |
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().work_area(); |
window->SetBounds(work_area); |
window_state->Maximize(); |