Mac: Make ui/base/cocoa WindowAnimator

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 25 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/google_chrome_strings.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/manifest_handlers/file_handler_info.h"
 #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"
+#import "ui/base/cocoa/window_animator.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"
 
 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.
-  base::scoped_nsobject<NSViewAnimation> animation_;
-}
-
-// Returns whether |window_| is scheduled to be closed when the animation ends.
-- (BOOL)isClosing;
-
-// Animate |window| to show or close it, after cancelling any current animation.
-// Translates from the current location to |targetOrigin| and fades in or out.
-- (void)animateWindow:(NSWindow*)window
-         targetOrigin:(NSPoint)targetOrigin
-              closing:(BOOL)closing;
-
-// Called on the UI thread once the animation has completed to reset the
-// animation state, close the window (if it is a close animation), and possibly
-// terminate Chrome.
-- (void)cleanupOnUIThread;
-
-@end
-
 namespace {
 
 // Version of the app list shortcut version installed.
 const int kShortcutVersion = 2;
 
-// Duration of show and hide animations.
-const NSTimeInterval kAnimationDuration = 0.2;
-
 // Distance towards the screen edge that the app list moves from when showing.
 const CGFloat kDistanceMovedOnShow = 20;
 
 web_app::ShortcutInfo GetAppListShortcutInfo(
     const base::FilePath& profile_path) {
   web_app::ShortcutInfo shortcut_info;
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_CANARY) {
     shortcut_info.title =
         l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME_CANARY);
@@ skipping 160 matching lines @@
                                      cursor,
                                      target_origin,
                                      start_origin);
 }
 
 }  // namespace
 
 AppListServiceMac::AppListServiceMac()
     : profile_(NULL),
       controller_delegate_(new AppListControllerDelegateImpl(this)) {
-  animation_controller_.reset([[AppListAnimationController alloc] init]);
+  animation_controller_.reset([[WindowAnimationController alloc] init]);
 }
 
 AppListServiceMac::~AppListServiceMac() {}
 
 // static
 AppListServiceMac* AppListServiceMac::GetInstance() {
   return Singleton<AppListServiceMac,
                    LeakySingletonTraits<AppListServiceMac> >::get();
 }
 
@@ skipping 134 matching lines @@
   else
     previously_active_application_.reset();
 
   // If activation is successful, the app list will lose main status and try to
   // close itself again. It can't be closed in this runloop iteration without
   // OSX deciding to raise the next Chrome window, and _then_ activating the
   // application on top. This also occurs if no activation option is given.
   if ([prior_app activateWithOptions:NSApplicationActivateIgnoringOtherApps])
     return;
 
+  base::Closure callback(base::Bind(&apps::AppShimHandler::MaybeTerminate));
   [animation_controller_ animateWindow:[window_controller_ window]
                           targetOrigin:last_start_origin_
-                               closing:YES];
+                               closing:YES
+                              callback:callback];
 }
 
 void AppListServiceMac::ShowForCustomLauncherPage(Profile* profile) {
   NOTIMPLEMENTED();
 }
 
 bool AppListServiceMac::IsAppListVisible() const {
   return [[window_controller_ window] isVisible] &&
       ![animation_controller_ isClosing];
 }
@@ skipping 87 matching lines @@
   NSPoint target_origin;
   GetAppListWindowOrigins(window, &target_origin, &last_start_origin_);
   [window setFrameOrigin:last_start_origin_];
 
   // Before activating, see if an application other than Chrome is currently the
   // active application, so that it can be reactivated when dismissing.
   previously_active_application_.reset([ActiveApplicationNotChrome() retain]);
 
   [animation_controller_ animateWindow:[window_controller_ window]
                           targetOrigin:target_origin
-                               closing:NO];
+                               closing:NO
+                              callback:base::Closure()];
   [window makeKeyAndOrderFront:nil];
   [NSApp activateIgnoringOtherApps:YES];
   RecordAppListLaunch();
 }
 
-void AppListServiceMac::WindowAnimationDidEnd() {
-  [animation_controller_ cleanupOnUIThread];
-}
-
 // static
 AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
   return AppListServiceMac::GetInstance();
 }
 
 // static
 void AppListService::InitAll(Profile* initial_profile,
                              const base::FilePath& profile_path) {
   AppListServiceMac::GetInstance()->InitWithProfilePath(initial_profile,
                                                         profile_path);
 }
-
-@implementation AppListAnimationController
-
-- (BOOL)isClosing {
-  return !!window_;
-}
-
-- (void)animateWindow:(NSWindow*)window
-         targetOrigin:(NSPoint)targetOrigin
-              closing:(BOOL)closing {
-  // First, stop the existing animation, if there is one.
-  [animation_ stopAnimation];
-
-  NSRect targetFrame = [window frame];
-  targetFrame.origin = targetOrigin;
-
-  // NSViewAnimation has a quirk when setting the curve to NSAnimationEaseOut
-  // where it attempts to auto-reverse the animation. FadeOut becomes FadeIn
-  // (good), but FrameKey is also switched (bad). So |targetFrame| needs to be
-  // put on the StartFrameKey when using NSAnimationEaseOut for showing.
-  NSArray* animationArray = @[
-    @{
-      NSViewAnimationTargetKey : window,
-      NSViewAnimationEffectKey : NSViewAnimationFadeOutEffect,
-      (closing ? NSViewAnimationEndFrameKey : NSViewAnimationStartFrameKey) :
-          [NSValue valueWithRect:targetFrame]
-    }
-  ];
-  animation_.reset(
-      [[NSViewAnimation alloc] initWithViewAnimations:animationArray]);
-  [animation_ setDuration:kAnimationDuration];
-  [animation_ setDelegate:self];
-
-  if (closing) {
-    [animation_ setAnimationCurve:NSAnimationEaseIn];
-    window_.reset([window retain]);
-  } else {
-    [window setAlphaValue:0.0f];
-    [animation_ setAnimationCurve:NSAnimationEaseOut];
-    window_.reset();
-  }
-  // This once used a threaded animation, but AppKit would too often ignore
-  // -[NSView canDrawConcurrently:] and just redraw whole view hierarchies on
-  // the animation thread anyway, creating a minefield of race conditions.
-  // Non-threaded means the animation isn't as smooth and doesn't begin unless
-  // the UI runloop has spun up (after profile loading).
-  [animation_ setAnimationBlockingMode:NSAnimationNonblocking];
-
-  [animation_ startAnimation];
-}
-
-- (void)cleanupOnUIThread {
-  bool closing = [self isClosing];
-  [window_ close];
-  window_.reset();
-  animation_.reset();
-
-  if (closing)
-    apps::AppShimHandler::MaybeTerminate();
-}
-
-- (void)animationDidEnd:(NSAnimation*)animation {
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&AppListServiceMac::WindowAnimationDidEnd,
-                 base::Unretained(AppListServiceMac::GetInstance())));
-}
-
-@end