ash/display/root_window_transformers.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/display/root_window_transformers.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 | « ash/display/resolution_notification_controller_unittest.cc ('k') | ash/display/root_window_transformers_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/display/root_window_transformers.cc

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

index 830cdba812dbfefa2019b45d8edfff4feea4c42b..4e3d139639e1280b57d918a18feab308bf007710 100644

--- a/ash/display/root_window_transformers.cc

+++ b/ash/display/root_window_transformers.cc

@@ -21,6 +21,7 @@

#include "ui/gfx/display.h"

#include "ui/gfx/geometry/insets.h"

#include "ui/gfx/geometry/size_conversions.h"

+#include "ui/gfx/screen.h"

#include "ui/gfx/transform.h"

@@ -279,7 +280,7 @@ class PartialBoundsRootWindowTransformer : public RootWindowTransformer {

PartialBoundsRootWindowTransformer(const gfx::Rect& screen_bounds,

const gfx::Display& display) {

gfx::Display unified_display =

- Shell::GetInstance()->GetScreen()->GetPrimaryDisplay();

+ gfx::Screen::GetScreen()->GetPrimaryDisplay();

DisplayInfo display_info =

Shell::GetInstance()->display_manager()->GetDisplayInfo(display.id());

root_bounds_ = gfx::Rect(display_info.bounds_in_native().size());

« no previous file with comments | « ash/display/resolution_notification_controller_unittest.cc ('k') | ash/display/root_window_transformers_unittest.cc » ('j') | no next file with comments »