Index: ash/shell.h |
=================================================================== |
--- ash/shell.h (revision 135932) |
+++ ash/shell.h (working copy) |
@@ -62,9 +62,9 @@ |
class WindowCycleController; |
namespace internal { |
+class AcceleratorFilter; |
class ActivationController; |
-class AcceleratorFilter; |
-class AppList; |
+class AppListController; |
class DragDropController; |
class EventClientImpl; |
class FocusCycler; |
@@ -323,7 +323,7 @@ |
scoped_ptr<Launcher> launcher_; |
- scoped_ptr<internal::AppList> app_list_; |
+ scoped_ptr<internal::AppListController> app_list_controller_; |
scoped_ptr<internal::ShellContextMenu> shell_context_menu_; |
scoped_ptr<internal::StackingController> stacking_controller_; |