Show the Mac app launcher window with a spinner while loading Chrome.

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 "apps/app_shim/app_shim_mac.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/app_list/app_list_positioner.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_service_impl.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/web_applications/web_app_mac.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/mac/app_mode_common.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "grit/google_chrome_strings.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"
@@ skipping 18 matching lines @@
 
 // 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 = 1;
 
 // Duration of show and hide animations.
 const NSTimeInterval kAnimationDuration = 0.2;
 
@@ skipping 272 matching lines @@
     }
   }
 
   static bool init_called = false;
   if (init_called)
     return;
 
   init_called = true;
   apps::AppShimHandler::RegisterHandler(app_mode::kAppListModeId,
                                         AppListServiceMac::GetInstance());
+
+  // Handle the case where Chrome was not running and was started with the app
+  // launcher shim. The profile has not yet been loaded. To improve response
+  // times, start animating an empty window which will be populated via
+  // OnShimLaunch(). Note that if --silent-launch is not also passed, the window
+  // will instead populate via StartupBrowserCreator::Launch(). Shim-initiated
+  // lanuches will always have --silent-launch.

[jackhou1, 2014/01/17 06:10:53]

lanuches -> launches

[tapted, 2014/01/17 06:21:03]

Done.

+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kShowAppList))
+    ShowWindowNearDock();
 }
 
 Profile* AppListServiceMac::GetCurrentAppListProfile() {
   return profile_;
 }
 
 void AppListServiceMac::CreateForProfile(Profile* requested_profile) {
   if (profile_ == requested_profile)
     return;
 
   profile_ = requested_profile;
 
-  if (window_controller_) {
-    // Clear the search box.
-    [[window_controller_ appListViewController] searchBoxModel]

[tapted, 2014/01/17 04:42:40]

note: this logic is refactored into the view controller itself, since
searchBoxModel is NULL while the spinner is showing.

-        ->SetText(base::string16());
-  } else {
+  if (!window_controller_)
     window_controller_.reset([[AppListWindowController alloc] init]);
-  }
 
   scoped_ptr<app_list::AppListViewDelegate> delegate(
       new AppListViewDelegate(profile_, GetControllerDelegate()));
   [[window_controller_ appListViewController] setDelegate:delegate.Pass()];
 }
 
 void AppListServiceMac::ShowForProfile(Profile* requested_profile) {
   if (requested_profile->IsManaged())
     return;
 
@@ skipping 54 matching lines @@
   return [window_controller_ window];
 }
 
 AppListControllerDelegate* AppListServiceMac::GetControllerDelegate() {
   return controller_delegate_.get();
 }
 
 void AppListServiceMac::OnShimLaunch(apps::AppShimHandler::Host* host,
                                      apps::AppShimLaunchType launch_type,
                                      const std::vector<base::FilePath>& files) {
-  if (IsAppListVisible())
+  if (profile_ && IsAppListVisible()) {
     DismissAppList();
-  else
+  } else {
+    // Start by showing a possibly empty window to handle the case where Chrome
+    // is running, but hasn't yet loaded the app launcher profile.
+    ShowWindowNearDock();
     Show();
+  }
 
   // Always close the shim process immediately.
   host->OnAppLaunchComplete(apps::APP_SHIM_LAUNCH_DUPLICATE_HOST);
 }
 
 void AppListServiceMac::OnShimClose(apps::AppShimHandler::Host* host) {}
 
 void AppListServiceMac::OnShimFocus(apps::AppShimHandler::Host* host,
                                     apps::AppShimFocusType focus_type,
                                     const std::vector<base::FilePath>& files) {}
 
 void AppListServiceMac::OnShimSetHidden(apps::AppShimHandler::Host* host,
                                         bool hidden) {}
 
 void AppListServiceMac::OnShimQuit(apps::AppShimHandler::Host* host) {}
 
 void AppListServiceMac::ShowWindowNearDock() {
   if (IsAppListVisible())
     return;
 
+  if (!window_controller_) {
+    // Note that this will start showing an unpopulated window, the caller needs
+    // to ensure it will be populated later.
+    window_controller_.reset([[AppListWindowController alloc] init]);
+  }
+
   NSWindow* window = GetAppListWindow();
   DCHECK(window);
   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];
   [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) {
   AppListServiceMac::GetInstance()->Init(initial_profile);
 }
 
@@ skipping 30 matching lines @@
   [animation_ setDelegate:self];
 
   if (closing) {
     [animation_ setAnimationCurve:NSAnimationEaseIn];
     window_.reset([window retain]);
   } else {
     [window setAlphaValue:0.0f];
     [animation_ setAnimationCurve:NSAnimationEaseOut];
     window_.reset();
   }
+  [animation_ setAnimationBlockingMode:NSAnimationNonblockingThreaded];
   [animation_ startAnimation];
 }
 
-- (void)animationDidEnd:(NSAnimation*)animation {
+- (void)cleanupOnUIThread {
+  bool closing = [self isClosing];
   [window_ close];
   window_.reset();
   animation_.reset();
 
-  apps::AppShimHandler::MaybeTerminate();
+  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