ash/wm/window_animations.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/wm/window_animations.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

Index: ash/wm/window_animations.cc

diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc

index fc1422470e2e513be8c55b8a9d4cc5b6f0cfb0bb..d6261086ff3e410d6f814f36c9e063514702998f 100644

--- a/ash/wm/window_animations.cc

+++ b/ash/wm/window_animations.cc

@@ -13,7 +13,6 @@

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_widget.h"

-#include "ash/shell.h"

#include "ash/wm/window_util.h"

#include "ash/wm/workspace_controller.h"

#include "base/command_line.h"

@@ -493,7 +492,7 @@ gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {

// to the location of the application launcher (which is fixed as first item

// of the shelf).

gfx::Rect work_area =

- Shell::GetScreen()->GetDisplayNearestWindow(window).work_area();

+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area();

int ltr_adjusted_x = base::i18n::IsRTL() ? work_area.right() : work_area.x();

switch (layout_manager->GetAlignment()) {

case SHELF_ALIGNMENT_BOTTOM:

« no previous file with comments | « ash/wm/toplevel_window_event_handler_unittest.cc ('k') | ash/wm/window_manager_unittest.cc » ('j') | no next file with comments »