ash/test/ash_test_base.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: ash/test/ash_test_base.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

« ash/display/screen_ash_unittest.cc ('K') | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/ui_controls_factory_ash.cc » ('j') | ash/wm/window_animations.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/test/ash_test_base.cc

diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc

index 93d770f601023725a854cfa1db020eba5c5ce8b4..6805926f6c0633a678ec1b3375270278dcb9d080 100644

--- a/ash/test/ash_test_base.cc

+++ b/ash/test/ash_test_base.cc

@@ -61,7 +61,7 @@ class AshEventGeneratorDelegate

// aura::test::EventGeneratorDelegateAura overrides:

aura::WindowTreeHost* GetHostAt(

const gfx::Point& point_in_screen) const override {

- gfx::Screen* screen = Shell::GetScreen();

+ gfx::Screen* screen = gfx::Screen::GetScreen();

gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen);

return Shell::GetInstance()

->window_tree_host_manager()

@@ -244,8 +244,7 @@ aura::Window* AshTestBase::CreateTestWindowInShellWithDelegateAndType(

if (bounds.IsEmpty()) {

ParentWindowInPrimaryRootWindow(window);

} else {

- gfx::Display display =

- Shell::GetScreen()->GetDisplayMatching(bounds);

+ gfx::Display display = gfx::Screen::GetScreen()->GetDisplayMatching(bounds);

aura::Window* root = ash::Shell::GetInstance()

->window_tree_host_manager()

->GetRootWindowForDisplayId(display.id());