Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1690)

Unified Diff: ash/display/screen_position_controller_unittest.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5
Patch Set: . Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/display/screen_position_controller_unittest.cc
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc
index a35b5654e04e023d8287fd341aa1a3368985800b..35a4727ca35aa70355ef927cd4424c461e1acf2d 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));

Powered by Google App Engine
This is Rietveld 408576698