| Index: ash/shell/shell_delegate_impl.cc
|
| diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
|
| index 0671bf6127a44c63770e1637c717ac388ef29887..0ebe950b9397983813a13e0658c7288dd9fc252f 100644
|
| --- a/ash/shell/shell_delegate_impl.cc
|
| +++ b/ash/shell/shell_delegate_impl.cc
|
| @@ -5,7 +5,7 @@
|
| #include "ash/shell/shell_delegate_impl.h"
|
|
|
| #include "ash/accessibility_delegate.h"
|
| -#include "ash/app_list/app_list_shower_delegate_factory.h"
|
| +#include "ash/app_list/app_list_presenter_delegate_factory.h"
|
| #include "ash/app_list/app_list_view_delegate_factory.h"
|
| #include "ash/default_accessibility_delegate.h"
|
| #include "ash/default_user_wallpaper_delegate.h"
|
| @@ -26,7 +26,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "components/user_manager/user_info_impl.h"
|
| #include "ui/app_list/app_list_view_delegate.h"
|
| -#include "ui/app_list/shower/app_list_shower_impl.h"
|
| +#include "ui/app_list/presenter/app_list_presenter_impl.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/gfx/image/image.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| @@ -160,7 +160,7 @@ class AppListViewDelegateFactoryImpl : public ash::AppListViewDelegateFactory {
|
|
|
| ShellDelegateImpl::ShellDelegateImpl()
|
| : shelf_delegate_(nullptr),
|
| - app_list_shower_delegate_factory_(new AppListShowerDelegateFactory(
|
| + app_list_presenter_delegate_factory_(new AppListPresenterDelegateFactory(
|
| base::WrapUnique(new AppListViewDelegateFactoryImpl))) {}
|
|
|
| ShellDelegateImpl::~ShellDelegateImpl() {}
|
| @@ -216,12 +216,12 @@ void ShellDelegateImpl::RemoveVirtualKeyboardStateObserver(
|
|
|
| void ShellDelegateImpl::OpenUrl(const GURL& url) {}
|
|
|
| -app_list::AppListShower* ShellDelegateImpl::GetAppListShower() {
|
| - if (!app_list_shower_) {
|
| - app_list_shower_.reset(new app_list::AppListShowerImpl(
|
| - app_list_shower_delegate_factory_.get()));
|
| +app_list::AppListPresenter* ShellDelegateImpl::GetAppListPresenter() {
|
| + if (!app_list_presenter_) {
|
| + app_list_presenter_.reset(new app_list::AppListPresenterImpl(
|
| + app_list_presenter_delegate_factory_.get()));
|
| }
|
| - return app_list_shower_.get();
|
| + return app_list_presenter_.get();
|
| }
|
|
|
| ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) {
|
|
|