ash/wm/window_animations.cc - Issue 138003007: [Cleanup] Screen cleanup

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 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make sure screen_for_shutdown is reset everytime Created 6 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:

Index: ash/wm/window_animations.cc

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

index dc010c45b8ee891f004356bd814d0c48e66e7bda..5aecb0645704b125574d3f6107b37b432754a734 100644

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

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

@@ -9,7 +9,7 @@

#include <algorithm>

#include <vector>

-#include "ash/screen_ash.h"

+#include "ash/screen_util.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_widget.h"

@@ -79,7 +79,7 @@ void AddLayerAnimationsForMinimize(aura::Window* window,

gfx::Rect bounds = window->bounds();

gfx::Rect target_bounds = GetMinimizeAnimationTargetBoundsInScreen(window);

target_bounds =

- ScreenAsh::ConvertRectFromScreen(window->parent(), target_bounds);

+ ScreenUtil::ConvertRectFromScreen(window->parent(), target_bounds);

float scale_x = static_cast<float>(target_bounds.width()) / bounds.width();

float scale_y = static_cast<float>(target_bounds.height()) / bounds.height();

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