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

Issue 1743493002: Cleanup ash shelf accessor functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert ash/shelf/shelf_widget.cc for browser_tests crash... 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/app_list_controller.cc

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

index 67a50c3ac414c89a5382e76e19a1bad0b9428379..d6465d262842e580febe4a7d25c8c8c1d305f541 100644

--- a/ash/wm/app_list_controller.cc

+++ b/ash/wm/app_list_controller.cc

@@ -55,12 +55,9 @@ ui::Layer* GetLayer(views::Widget* widget) {

// Gets arrow location based on shelf alignment.

views::BubbleBorder::Arrow GetBubbleArrow(aura::Window* window) {

DCHECK(Shell::HasInstance());

- return ShelfLayoutManager::ForShelf(window)->

- SelectValueForShelfAlignment(

- views::BubbleBorder::BOTTOM_CENTER,

- views::BubbleBorder::LEFT_CENTER,

- views::BubbleBorder::RIGHT_CENTER,

- views::BubbleBorder::TOP_CENTER);

+ return Shelf::ForWindow(window)->SelectValueForShelfAlignment(

+ views::BubbleBorder::BOTTOM_CENTER, views::BubbleBorder::LEFT_CENTER,

+ views::BubbleBorder::RIGHT_CENTER, views::BubbleBorder::TOP_CENTER);

}

// Offset given |rect| towards shelf.