ash/desktop_background/desktop_background_controller.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/desktop_background/desktop_background_controller.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/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc ('k') | ash/desktop_background/desktop_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/desktop_background/desktop_background_controller.cc

diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc

index a002f6bfea88ab45152de47a5371d5b092213160..b19e98fb3866a28ae118446b889e57da34306505 100644

--- a/ash/desktop_background/desktop_background_controller.cc

+++ b/ash/desktop_background/desktop_background_controller.cc

@@ -29,6 +29,7 @@

#include "ui/gfx/codec/jpeg_codec.h"

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

#include "ui/gfx/image/image_skia.h"

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

#include "ui/views/widget/widget.h"

using wallpaper::WallpaperResizer;

@@ -162,7 +163,8 @@ void DesktopBackgroundController::OnRootWindowAdded(aura::Window* root_window) {

gfx::Size DesktopBackgroundController::GetMaxDisplaySizeInNative() {

int width = 0;

int height = 0;

- std::vector<gfx::Display> displays = Shell::GetScreen()->GetAllDisplays();

+ std::vector<gfx::Display> displays =

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

DisplayManager* display_manager = Shell::GetInstance()->display_manager();

for (std::vector<gfx::Display>::iterator iter = displays.begin();