| Index: ash/mus/shell_delegate_mus.h
|
| diff --git a/ash/mus/shell_delegate_mus.h b/ash/mus/shell_delegate_mus.h
|
| index c86349f7fb1b4fdd6c77cf7dfcf97cf0c0d10873..6187493414a266ccb527e0d2a9b58252e399dccd 100644
|
| --- a/ash/mus/shell_delegate_mus.h
|
| +++ b/ash/mus/shell_delegate_mus.h
|
| @@ -40,7 +40,7 @@ class ShellDelegateMus : 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;
|
| @@ -55,7 +55,7 @@ class ShellDelegateMus : public ash::ShellDelegate {
|
| gfx::Image GetDeprecatedAcceleratorImage() const override;
|
|
|
| private:
|
| - std::unique_ptr<app_list::AppListShower> app_list_shower_;
|
| + std::unique_ptr<app_list::AppListPresenter> app_list_presenter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
|
| };
|
|
|