ash/shelf/shelf_layout_manager.cc - Issue 2169533002: mash: Migrate shelf app list button to wm common types

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/shelf/shelf_layout_manager.cc

Issue 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move files, cleanup Created 4 years, 5 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/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc

index d89ffb22ce78178bb9a30a3f6e0ad4d961969b40..7bda0c509c65a9412aad9a3bab845cd76cf88f5b 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -1031,10 +1031,9 @@ ShelfAutoHideState ShelfLayoutManager::CalculateAutoHideState(

!shelf_widget_->shelf())

return SHELF_AUTO_HIDE_HIDDEN;

- Shell* shell = Shell::GetInstance();

// Unhide the shelf only on the active screen when the AppList is shown

// (crbug.com/312445).

- if (shell->GetAppListTargetVisibility()) {

+ if (WmShell::Get()->GetAppListTargetVisibility()) {

aura::Window* active_window = wm::GetActiveWindow();

aura::Window* shelf_window = shelf_widget_->GetNativeWindow();

if (active_window && shelf_window &&

« ash/shelf/app_list_button.h ('K') | « ash/shelf/app_list_shelf_item_delegate.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | ash/shell.cc » ('J')