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..45e8acbcf33180ffa96bdf9e38a7639292073aed 100644 |
--- a/ash/shell/shell_delegate_impl.cc |
+++ b/ash/shell/shell_delegate_impl.cc |
@@ -5,8 +5,6 @@ |
#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_view_delegate_factory.h" |
#include "ash/default_accessibility_delegate.h" |
#include "ash/default_user_wallpaper_delegate.h" |
#include "ash/gpu_support_stub.h" |
@@ -21,12 +19,10 @@ |
#include "ash/system/tray/default_system_tray_delegate.h" |
#include "ash/test/test_keyboard_ui.h" |
#include "ash/wm/window_state.h" |
-#include "base/memory/ptr_util.h" |
#include "base/message_loop/message_loop.h" |
#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/aura/window.h" |
#include "ui/gfx/image/image.h" |
#include "ui/gfx/image/image_skia.h" |
@@ -138,30 +134,9 @@ |
DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl); |
}; |
-class AppListViewDelegateFactoryImpl : public ash::AppListViewDelegateFactory { |
- public: |
- AppListViewDelegateFactoryImpl() {} |
- ~AppListViewDelegateFactoryImpl() override {} |
- |
- // app_list::AppListViewDelegateFactory: |
- app_list::AppListViewDelegate* GetDelegate() override { |
- if (!app_list_view_delegate_.get()) |
- app_list_view_delegate_.reset(CreateAppListViewDelegate()); |
- return app_list_view_delegate_.get(); |
- } |
- |
- private: |
- std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_; |
- |
- DISALLOW_COPY_AND_ASSIGN(AppListViewDelegateFactoryImpl); |
-}; |
- |
} // namespace |
-ShellDelegateImpl::ShellDelegateImpl() |
- : shelf_delegate_(nullptr), |
- app_list_shower_delegate_factory_(new AppListShowerDelegateFactory( |
- base::WrapUnique(new AppListViewDelegateFactoryImpl))) {} |
+ShellDelegateImpl::ShellDelegateImpl() : shelf_delegate_(nullptr) {} |
ShellDelegateImpl::~ShellDelegateImpl() {} |
@@ -216,12 +191,10 @@ |
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())); |
- } |
- return app_list_shower_.get(); |
+app_list::AppListViewDelegate* ShellDelegateImpl::GetAppListViewDelegate() { |
+ if (!app_list_view_delegate_) |
+ app_list_view_delegate_.reset(ash::shell::CreateAppListViewDelegate()); |
+ return app_list_view_delegate_.get(); |
} |
ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) { |