diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-09 02:50:58 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-09 02:50:58 +0000 |
| commit | 478c6c3aa0165dfd120993c5ec0757d594e70fe6 (patch) | |
| tree | 3dd95bfe585e857e3672c9cfa1e705e6cdd19416 /ash/wm/app_list_controller.cc | |
| parent | 62ad3097ac2d96a2e8c65769a997702e7f0a755b (diff) | |
| download | chromium_src-478c6c3aa0165dfd120993c5ec0757d594e70fe6.zip chromium_src-478c6c3aa0165dfd120993c5ec0757d594e70fe6.tar.gz chromium_src-478c6c3aa0165dfd120993c5ec0757d594e70fe6.tar.bz2 | |
Refactor: Shelf Widget
Refactor the classes related with displaying the shelf (background behind the launcher/status area widget) to be a separate class. Removing background delegates from the launcher and status area widget (represented on tray views).
TBR=ben@chromium.org
BUG=163002
Review URL: https://chromiumcodereview.appspot.com/12313118
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index f23b398..3c34984 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(); |