ash/wm/window_animations.cc - Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access

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 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix control reaches end of non-void function warnings Created 4 years, 4 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/wm/panels/panel_layout_manager_unittest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/window_animations.cc

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

index b39896b620edd628124588d8b63807806436a8a4..77024956054399758947f800a641cae8fdf10309 100644

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

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

@@ -482,10 +482,17 @@ gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {

gfx::Rect work_area =

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

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

- return shelf->SelectValueForShelfAlignment(

- gfx::Rect(ltr_adjusted_x, work_area.bottom(), 0, 0),

- gfx::Rect(work_area.x(), work_area.y(), 0, 0),

- gfx::Rect(work_area.right(), work_area.y(), 0, 0));

+ switch (shelf->alignment()) {

+ case SHELF_ALIGNMENT_BOTTOM:

+ case SHELF_ALIGNMENT_BOTTOM_LOCKED:

+ return gfx::Rect(ltr_adjusted_x, work_area.bottom(), 0, 0);

+ case SHELF_ALIGNMENT_LEFT:

+ return gfx::Rect(work_area.x(), work_area.y(), 0, 0);

+ case SHELF_ALIGNMENT_RIGHT:

+ return gfx::Rect(work_area.right(), work_area.y(), 0, 0);

+ }

+ NOTREACHED();

+ return gfx::Rect();

}

} // namespace ash