| 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..daead2658fd60fc2601b28db0264f4d8ea98ac8d 100644
|
| --- a/ash/shell/shell_delegate_impl.h
|
| +++ b/ash/shell/shell_delegate_impl.h
|
| @@ -13,8 +13,8 @@
|
| #include "base/macros.h"
|
|
|
| namespace app_list {
|
| -class AppListShowerDelegateFactory;
|
| -class AppListShowerImpl;
|
| +class AppListPresenterDelegateFactory;
|
| +class AppListPresenterImpl;
|
| }
|
|
|
| namespace keyboard {
|
| @@ -47,7 +47,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| void RemoveVirtualKeyboardStateObserver(
|
| VirtualKeyboardStateObserver* observer) override;
|
| void OpenUrl(const GURL& url) override;
|
| - app_list::AppListShower* GetAppListShower() override;
|
| + app_list::AppListPresenter* GetAppListPresenter() override;
|
| ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
|
| ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
|
| ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
|
| @@ -63,9 +63,9 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
|
|
| 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::AppListPresenterDelegateFactory>
|
| + app_list_presenter_delegate_factory_;
|
| + std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
|
| };
|
|
|