diff options
| author | scottmg <scottmg@chromium.org> | 2016-01-26 21:07:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 05:08:46 +0000 |
| commit | e8b0429751298d4bff935658ad0501597bedfb54 (patch) | |
| tree | 2fc8223b144eb8183f9b248b40cb13fa07f808f6 /ash/display/screen_position_controller_unittest.cc | |
| parent | fc512ffcf066bf2c50b565bd54019ee0074a542d (diff) | |
| download | chromium_src-e8b0429751298d4bff935658ad0501597bedfb54.zip chromium_src-e8b0429751298d4bff935658ad0501597bedfb54.tar.gz chromium_src-e8b0429751298d4bff935658ad0501597bedfb54.tar.bz2 | |
Remove now-unnecessary wrappers around gfx::Screen::GetScreen()
- ash::Shell::GetScreen()
- DisplayInfoProvider::GetActiveScreen()
Followup to https://codereview.chromium.org/1608733002/.
R=oshima@chromium.org, sky@chromium.org
BUG=558054
Review URL: https://codereview.chromium.org/1608053002
Cr-Commit-Position: refs/heads/master@{#371733}
Diffstat (limited to 'ash/display/screen_position_controller_unittest.cc')
| -rw-r--r-- | ash/display/screen_position_controller_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc index a35b565..35a4727 100644 --- a/ash/display/screen_position_controller_unittest.cc +++ b/ash/display/screen_position_controller_unittest.cc @@ -114,7 +114,7 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) { const gfx::Point window_pos(100, 100); window_->SetBoundsInScreen( gfx::Rect(window_pos, gfx::Size(100, 100)), - Shell::GetScreen()->GetDisplayNearestPoint(window_pos)); + gfx::Screen::GetScreen()->GetDisplayNearestPoint(window_pos)); SetSecondaryDisplayLayout(DisplayLayout::RIGHT); // The point is on the primary root window. EXPECT_EQ("50,50", ConvertHostPointToScreen(50, 50)); @@ -152,7 +152,7 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) { const gfx::Point window_pos2(300, 100); window_->SetBoundsInScreen( gfx::Rect(window_pos2, gfx::Size(100, 100)), - Shell::GetScreen()->GetDisplayNearestPoint(window_pos2)); + gfx::Screen::GetScreen()->GetDisplayNearestPoint(window_pos2)); // The point is on the secondary display. EXPECT_EQ("250,50", ConvertHostPointToScreen(50, 50)); // The point is out of the all root windows. @@ -197,7 +197,7 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) { // Put |window_| to the primary 2x display. window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50), - Shell::GetScreen()->GetPrimaryDisplay()); + gfx::Screen::GetScreen()->GetPrimaryDisplay()); // (30, 30) means the host coordinate, so the point is still on the primary // root window. Since it's 2x, the specified native point was halved. EXPECT_EQ("15,15", ConvertHostPointToScreen(30, 30)); @@ -223,7 +223,7 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenRotate) { UpdateDisplay("100+100-200x200/r,100+500-200x200/l"); // Put |window_| to the 1st. window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50), - Shell::GetScreen()->GetPrimaryDisplay()); + gfx::Screen::GetScreen()->GetPrimaryDisplay()); // The point is on the 1st host. EXPECT_EQ("70,149", ConvertHostPointToScreen(50, 70)); @@ -255,7 +255,7 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenUIScale) { UpdateDisplay("100+100-200x200*2@1.5,100+500-200x200"); // Put |window_| to the 1st. window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50), - Shell::GetScreen()->GetPrimaryDisplay()); + gfx::Screen::GetScreen()->GetPrimaryDisplay()); // The point is on the 1st host. EXPECT_EQ("45,45", ConvertHostPointToScreen(60, 60)); |