Index: ash/wm/toplevel_window_event_handler_unittest.cc |
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc |
index 0322dde43afd75bad539b7194775ac7ef77be879..749d5fcb6632e988b174a02c5f4c437f2d07ff16 100644 |
--- a/ash/wm/toplevel_window_event_handler_unittest.cc |
+++ b/ash/wm/toplevel_window_event_handler_unittest.cc |
@@ -305,8 +305,9 @@ TEST_F(ToplevelWindowEventHandlerTest, BottomRightPastMinimum) { |
TEST_F(ToplevelWindowEventHandlerTest, BottomRightWorkArea) { |
scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOMRIGHT)); |
- gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow( |
- target.get()).work_area(); |
+ gfx::Rect work_area = gfx::Screen::GetScreen() |
+ ->GetDisplayNearestWindow(target.get()) |
+ .work_area(); |
gfx::Point position = target->bounds().origin(); |
// Drag further than work_area bottom. |
DragFromCenterBy(target.get(), 100, work_area.height()); |
@@ -320,8 +321,9 @@ TEST_F(ToplevelWindowEventHandlerTest, BottomRightWorkArea) { |
TEST_F(ToplevelWindowEventHandlerTest, BottomLeftWorkArea) { |
scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOMLEFT)); |
- gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow( |
- target.get()).work_area(); |
+ gfx::Rect work_area = gfx::Screen::GetScreen() |
+ ->GetDisplayNearestWindow(target.get()) |
+ .work_area(); |
gfx::Point position = target->bounds().origin(); |
// Drag further than work_area bottom. |
DragFromCenterBy(target.get(), -30, work_area.height()); |
@@ -336,8 +338,9 @@ TEST_F(ToplevelWindowEventHandlerTest, BottomLeftWorkArea) { |
TEST_F(ToplevelWindowEventHandlerTest, BottomWorkArea) { |
scoped_ptr<aura::Window> target(CreateWindow(HTBOTTOM)); |
- gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow( |
- target.get()).work_area(); |
+ gfx::Rect work_area = gfx::Screen::GetScreen() |
+ ->GetDisplayNearestWindow(target.get()) |
+ .work_area(); |
gfx::Point position = target->bounds().origin(); |
// Drag further than work_area bottom. |
DragFromCenterBy(target.get(), 0, work_area.height()); |
@@ -383,8 +386,8 @@ TEST_F(ToplevelWindowEventHandlerTest, DontDragToNegativeY) { |
// Verifies we don't let windows go bigger than the display width. |
TEST_F(ToplevelWindowEventHandlerTest, DontGotWiderThanScreen) { |
scoped_ptr<aura::Window> target(CreateWindow(HTRIGHT)); |
- gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow( |
- target.get()).bounds(); |
+ gfx::Rect work_area = |
+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(target.get()).bounds(); |
DragFromCenterBy(target.get(), work_area.width() * 2, 0); |
// The y location and height should not have changed. |
EXPECT_EQ(work_area.width(), target->bounds().width()); |