chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc - Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

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: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.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: cros 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

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

index 75c0b40ab604096f0755b631e8b832879be64404..43366bd6a347c81d5e1ccbd5a04aa571ef554a52 100644

--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

@@ -61,7 +61,7 @@ void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) {

gfx::Point center =

GetChromeIconBoundsForRootWindow(root_window).CenterPoint();

gfx::Display display =

- ash::Shell::GetScreen()->GetDisplayNearestWindow(root_window);

+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_window);

const gfx::Point& origin = display.bounds().origin();

center.Offset(- origin.x(), - origin.y());

generator.MoveMouseTo(center);

@@ -71,11 +71,15 @@ void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) {

} // namespace

#if !defined(OS_CHROMEOS)

-#define MAYBE_OpenBrowserUsingShelfOnOtherDisplay DISABLED_OpenBrowserUsingShelfOnOtherDisplay

-#define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay DISABLED_OpenBrowserUsingContextMenuOnOtherDisplay

+#define MAYBE_OpenBrowserUsingShelfOnOtherDisplay \

+ DISABLED_OpenBrowserUsingShelfOnOtherDisplay

+#define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay \

+ DISABLED_OpenBrowserUsingContextMenuOnOtherDisplay

#else

-#define MAYBE_OpenBrowserUsingShelfOnOtherDisplay OpenBrowserUsingShelfOnOtherDisplay

-#define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay OpenBrowserUsingContextMenuOnOtherDisplay

+#define MAYBE_OpenBrowserUsingShelfOnOtherDisplay \

+ OpenBrowserUsingShelfOnOtherDisplay

+#define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay \

+ OpenBrowserUsingContextMenuOnOtherDisplay

#endif

IN_PROC_BROWSER_TEST_F(WindowSizerTest,