ash/display/unified_mouse_warp_controller_unittest.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/display/unified_mouse_warp_controller_unittest.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: GetNativeScreen 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/unified_mouse_warp_controller_unittest.cc

diff --git a/ash/display/unified_mouse_warp_controller_unittest.cc b/ash/display/unified_mouse_warp_controller_unittest.cc

index e91ca26a5b743af9e6f4b6783f09f6434401e670..8be611030ff71452d85c23e2e691debf8590ae3b 100644

--- a/ash/display/unified_mouse_warp_controller_unittest.cc

+++ b/ash/display/unified_mouse_warp_controller_unittest.cc

@@ -184,8 +184,7 @@ TEST_F(UnifiedMouseWarpControllerTest, WarpMouse) {

if (!SupportsMultipleDisplays())

return;

UpdateDisplay("500x500,600+0-500x500");

- ASSERT_EQ(1, gfx::Screen::GetScreenFor(Shell::GetPrimaryRootWindow())

- ->GetNumDisplays());

+ ASSERT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());

EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(10, 10)));

// Touch the right edge of the first display. Pointer should warp.

@@ -204,8 +203,7 @@ TEST_F(UnifiedMouseWarpControllerTest, WarpMouse) {

// With 2X and 1X displays

UpdateDisplay("500x500*2,600+0-500x500");

- ASSERT_EQ(1, gfx::Screen::GetScreenFor(Shell::GetPrimaryRootWindow())

- ->GetNumDisplays());

+ ASSERT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());

EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(10, 10)));

// Touch the right edge of the first display. Pointer should warp.

@@ -225,8 +223,7 @@ TEST_F(UnifiedMouseWarpControllerTest, WarpMouse) {

// With 1X and 2X displays

UpdateDisplay("500x500,600+0-500x500*2");

- ASSERT_EQ(1, gfx::Screen::GetScreenFor(Shell::GetPrimaryRootWindow())

- ->GetNumDisplays());

+ ASSERT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());

EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(10, 10)));

// Touch the right edge of the first display. Pointer should warp.

@@ -245,8 +242,7 @@ TEST_F(UnifiedMouseWarpControllerTest, WarpMouse) {

// With two 2X displays

UpdateDisplay("500x500*2,600+0-500x500*2");

- ASSERT_EQ(1, gfx::Screen::GetScreenFor(Shell::GetPrimaryRootWindow())

- ->GetNumDisplays());

+ ASSERT_EQ(1, gfx::Screen::GetScreen()->GetNumDisplays());

EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(10, 10)));

// Touch the right edge of the first display. Pointer should warp.

« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | ash/shell.cc » ('J')