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

ash/test/test_shell_delegate.h

Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index c27879dd3be8ca2af081a8dc37fe8bbac0e8a84b..2d50804a515def368ee01d527f4d929148d8a811 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -15,6 +15,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 
+namespace app_list {
+class AppListShowerDelegateFactory;
+class AppListShowerImpl;
+}
+
 namespace keyboard {
 class KeyboardUI;
 }
@@ -31,6 +36,10 @@ class TestShellDelegate : public ShellDelegate {
     multi_profiles_enabled_ = multi_profiles_enabled;
   }
 
+  app_list::AppListShowerImpl* app_list_shower() {

[xiyuan, 2016/04/07 18:45:09]

nit: move accessors to the end of declarations

[mfomitchev, 2016/04/07 19:46:40]

Done, but.. is there a style guide for this? Should set_multi_profiles_enabled
also be moved? 

FWIW, I actually like it to have all the non-overriden methods (including the
accessors) before the overridden ones - this way it is clear where the
overridden block begins and where it ends, since every block ends with either
the comment for the next overridden block or the begginning of the next section
('private:' in this case).

[xiyuan, 2016/04/07 20:08:28]

The style guide does not call this out explicitly. My impression comes from
existing code the sample in the style guide [1]. But I think keeping
non-overridden ones before overridden ones also makes sense. 

This is just a nit. So you can ignore my comment. If we move, let's move
set_multi_profiles_enabled as well to be consistent.

[1] https://google.github.io/styleguide/cppguide.html#Class_Format

+    return app_list_shower_.get();
+  }
+
   // Overridden from ShellDelegate:
   bool IsFirstRunAfterBoot() const override;
   bool IsIncognitoAllowed() const override;
@@ -48,7 +57,7 @@ class TestShellDelegate : public 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;
   SystemTrayDelegate* CreateSystemTrayDelegate() override;
   UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
@@ -74,7 +83,9 @@ class TestShellDelegate : public ShellDelegate {
   bool multi_profiles_enabled_;
   bool force_maximize_on_first_run_;
 
-  scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
+  scoped_ptr<app_list::AppListShowerDelegateFactory>

[xiyuan, 2016/04/07 18:45:09]

nit: std::unqiue_ptr in new code

[mfomitchev, 2016/04/07 19:46:40]

Done.

+      app_list_shower_delegate_factory_;
+  scoped_ptr<app_list::AppListShowerImpl> app_list_shower_;
 
   base::ObserverList<ash::VirtualKeyboardStateObserver>
       keyboard_state_observer_list_;