AppListController refactoring part 3: Switching over to use AppListShower in Ash.

ash/shell/shell_delegate_impl.h

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..6c3956798b88d5be563ab5971901e8b8da13933f 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -5,12 +5,18 @@
 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_
 
+#include <memory>
 #include <string>

[sky, 2016/04/07 21:43:27]

include <utility>

[mfomitchev, 2016/04/08 15:50:44]

I believe unique_ptr is in <memory>:
http://en.cppreference.com/w/cpp/memory/unique_ptr

 
 #include "ash/shell_delegate.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 
+namespace app_list {
+class AppListShowerDelegateFactory;
+class AppListShowerImpl;
+}
+
 namespace keyboard {
 class KeyboardUI;
 }
@@ -41,7 +47,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 +63,9 @@ class ShellDelegateImpl : public ash::ShellDelegate {
 
  private:
   ShelfDelegateImpl* shelf_delegate_;
-  scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
+  std::unique_ptr<app_list::AppListShowerDelegateFactory>
+      app_list_shower_delegate_factory_;
+  std::unique_ptr<app_list::AppListShowerImpl> app_list_shower_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
 };