Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

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: Created 7 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:
View side-by-side diff with in-line comments
Download patch
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..da5a07c3e83bc06e66766fb0e2220d68109d99ef 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()->shelf_layout_manager()->
+ UpdateAutoHideState();
if (view_) {
ScheduleAnimation();

Powered by Google App Engine
This is Rietveld 408576698