Index: ash/shell/shell_delegate_impl.h |
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h |
index 6c3956798b88d5be563ab5971901e8b8da13933f..c971d80b2b57f8cf841d9d36065576d1f865aaaa 100644 |
--- a/ash/shell/shell_delegate_impl.h |
+++ b/ash/shell/shell_delegate_impl.h |
@@ -11,11 +11,6 @@ |
#include "ash/shell_delegate.h" |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
- |
-namespace app_list { |
-class AppListShowerDelegateFactory; |
-class AppListShowerImpl; |
-} |
namespace keyboard { |
class KeyboardUI; |
@@ -47,7 +42,7 @@ |
void RemoveVirtualKeyboardStateObserver( |
VirtualKeyboardStateObserver* observer) override; |
void OpenUrl(const GURL& url) override; |
- app_list::AppListShower* GetAppListShower() override; |
+ app_list::AppListViewDelegate* GetAppListViewDelegate() override; |
ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override; |
ash::SystemTrayDelegate* CreateSystemTrayDelegate() override; |
ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override; |
@@ -63,9 +58,7 @@ |
private: |
ShelfDelegateImpl* shelf_delegate_; |
- std::unique_ptr<app_list::AppListShowerDelegateFactory> |
- app_list_shower_delegate_factory_; |
- std::unique_ptr<app_list::AppListShowerImpl> app_list_shower_; |
+ std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; |
DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); |
}; |