| Index: ash/shell/shell_delegate_impl.h
|
| diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
|
| index 5e511e0cfa4c9235e14a864c0413f05423d99838..9dbba58d2e1741648c8af1cca973b51665df1e5c 100644
|
| --- a/ash/shell/shell_delegate_impl.h
|
| +++ b/ash/shell/shell_delegate_impl.h
|
| @@ -11,6 +11,11 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
|
|
| +namespace app_list {
|
| +class AppListShowerDelegateFactory;
|
| +class AppListShowerImpl;
|
| +}
|
| +
|
| namespace keyboard {
|
| class KeyboardUI;
|
| }
|
| @@ -41,7 +46,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| void RemoveVirtualKeyboardStateObserver(
|
| VirtualKeyboardStateObserver* observer) override;
|
| void OpenUrl(const GURL& url) override;
|
| - app_list::AppListViewDelegate* GetAppListViewDelegate() override;
|
| + app_list::AppListShower* GetAppListShower() override;
|
| ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
|
| ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
|
| ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
|
| @@ -57,7 +62,9 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
|
|
| private:
|
| ShelfDelegateImpl* shelf_delegate_;
|
| - scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
|
| + scoped_ptr<app_list::AppListShowerDelegateFactory>
|
| + app_list_shower_delegate_factory_;
|
| + scoped_ptr<app_list::AppListShowerImpl> app_list_shower_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
|
| };
|
|
|