STASH: Epic Experimental patch for toolkit-views App List on Mac

chrome/browser/ui/app_list/app_list_service_mac.mm

Index: chrome/browser/ui/app_list/app_list_service_mac.mm
diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
index 0dac38473e13d189cc6a2a0caf4647a3b98ddd97..356bdc64c514d3e07c3782299245bf20fdb2a6c3 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
@@ -48,6 +48,9 @@
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
+#include "chrome/browser/ui/app_list/app_list_service_views.h"
+#include "chrome/browser/ui/app_list/app_list_controller_delegate_views.h"
+
 namespace gfx {
 class ImageSkia;
 }
@@ -529,14 +532,41 @@ void AppListServiceMac::WindowAnimationDidEnd() {
   [animation_controller_ cleanupOnUIThread];
 }
 
+class AppListServiceMacViews : public AppListServiceViews {
+ public:
+  virtual ~AppListServiceMacViews() {}
+
+  static AppListServiceMacViews* GetInstance() {
+    return Singleton<AppListServiceMacViews,
+                     LeakySingletonTraits<AppListServiceMacViews> >::get();
+  }
+
+ private:
+  friend struct DefaultSingletonTraits<AppListServiceMacViews>;
+
+  // AppListShowerDelegate overrides:
+  virtual void OnViewCreated() OVERRIDE {}
+  virtual void OnViewBeingDestroyed() OVERRIDE {}
+  virtual void OnViewDismissed() OVERRIDE {}
+  virtual void MoveNearCursor(app_list::AppListView* view) OVERRIDE {}
+
+  AppListServiceMacViews()
+      : AppListServiceViews(scoped_ptr<AppListControllerDelegate>(
+          new AppListControllerDelegateViews(this))) {}
+
+  DISALLOW_COPY_AND_ASSIGN(AppListServiceMacViews);
+};
+
 // static
 AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
-  return AppListServiceMac::GetInstance();
+  return AppListServiceMacViews::GetInstance();
+  //return AppListServiceMac::GetInstance();
 }
 
 // static
 void AppListService::InitAll(Profile* initial_profile) {
-  AppListServiceMac::GetInstance()->Init(initial_profile);
+  AppListServiceMacViews::GetInstance()->Init(initial_profile);
+  //AppListServiceMac::GetInstance()->Init(initial_profile);
 }
 
 @implementation AppListAnimationController