ash/wm/window_animations.cc - Issue 1743493002: Cleanup ash shelf accessor functions.

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 1743493002: Cleanup ash shelf accessor functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix ShelfBrowserTest. Created 4 years, 10 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 98574487a1115c70be204c042f4222d6a3f83363..eb6c5532ad8e4acc913032d61ec48af1366ef091 100644

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

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

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

// width will be 0 but the position in the launcher and the major dimension

// are still reported correctly and the window can be animated to the launcher

// item's light bar.

- ShelfLayoutManager* layout_manager =

- shelf->shelf_widget()->shelf_layout_manager();

+ ShelfLayoutManager* layout_manager = shelf->shelf_layout_manager();

if (item_rect.width() != 0 || item_rect.height() != 0) {

if (layout_manager->visibility_state() == SHELF_AUTO_HIDE) {

gfx::Rect shelf_bounds = shelf->shelf_widget()->GetWindowBoundsInScreen();