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

chrome/browser/ui/app_list/app_list_service_mac.mm

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/app_list/app_list_service_mac.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/bind.h"
@@ skipping 30 matching lines @@
 #include "grit/chrome_unscaled_resources.h"
 #include "net/base/url_util.h"
 #import "ui/app_list/cocoa/app_list_view_controller.h"
 #import "ui/app_list/cocoa/app_list_window_controller.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #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;
 }
 
 // Controller for animations that show or hide the app list.
 @interface AppListAnimationController : NSObject<NSAnimationDelegate> {
  @private
   // When closing, the window to close. Retained until the animation ends.
   base::scoped_nsobject<NSWindow> window_;
   // The animation started and owned by |self|. Reset when the animation ends.
@@ skipping 461 matching lines @@
                                closing:NO];
   [window makeKeyAndOrderFront:nil];
   [NSApp activateIgnoringOtherApps:YES];
   RecordAppListLaunch();
 }
 
 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
 
 - (BOOL)isClosing {
   return !!window_;
 }
 
 - (void)animateWindow:(NSWindow*)window
          targetOrigin:(NSPoint)targetOrigin
@@ skipping 51 matching lines @@
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&AppListServiceMac::WindowAnimationDidEnd,
                  base::Unretained(AppListServiceMac::GetInstance())));
 }
 
 @end