ash/wm/app_list_controller.cc - Issue 12313118: Refactor: Shelf Widget

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 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: safer shutdown (status_area_widget_) Created 7 years, 9 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 f23b398bc0d86499b72aac36b3dcd98fef852ea2..3c3498434908894a65db6f2334982b17fa1bcbb3 100644

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

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

@@ -6,11 +6,11 @@

#include "ash/launcher/launcher.h"

#include "ash/root_window_controller.h"

+#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shell.h"

#include "ash/shell_delegate.h"

#include "ash/shell_window_ids.h"

#include "ash/wm/property_util.h"

-#include "ash/wm/shelf_layout_manager.h"

#include "ui/app_list/app_list_constants.h"

#include "ui/app_list/pagination_model.h"

#include "ui/app_list/views/app_list_view.h"

@@ -109,7 +109,8 @@ void AppListController::SetVisible(bool visible, aura::Window* window) {

// App list needs to know the new shelf layout in order to calculate its

// UI layout when AppListView visibility changes.

- Shell::GetPrimaryRootWindowController()->shelf()->UpdateAutoHideState();

+ Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->

+ UpdateAutoHideState();

if (view_) {

ScheduleAnimation();

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