Add profile selector menu to app list.

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_launcher.h"
@@ skipping 19 matching lines @@
 #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/mac/app_mode_common.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "grit/google_chrome_strings.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"
 
 namespace gfx {
 class ImageSkia;
 }
 
 // Controller for animations that show or hide the app list.
@@ skipping 40 matching lines @@
   virtual bool CanDoCreateShortcutsFlow(bool is_platform_app) OVERRIDE;
   virtual void CreateNewWindow(Profile* profile, bool incognito) OVERRIDE;
   virtual void DoCreateShortcutsFlow(Profile* profile,
                                      const std::string& extension_id) OVERRIDE;
   virtual void ActivateApp(Profile* profile,
                            const extensions::Extension* extension,
                            int event_flags) OVERRIDE;
   virtual void LaunchApp(Profile* profile,
                          const extensions::Extension* extension,
                          int event_flags) OVERRIDE;
+  virtual void ShowForProfileByPath(
+      const base::FilePath& profile_path) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateCocoa);
 };
 
 ShellIntegration::ShortcutInfo GetAppListShortcutInfo(
     const base::FilePath& profile_path) {
   ShellIntegration::ShortcutInfo shortcut_info;
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_CANARY) {
     shortcut_info.title =
@@ skipping 151 matching lines @@
     Profile* profile, const extensions::Extension* extension, int event_flags) {
   LaunchApp(profile, extension, event_flags);
 }
 
 void AppListControllerDelegateCocoa::LaunchApp(
     Profile* profile, const extensions::Extension* extension, int event_flags) {
   chrome::OpenApplication(chrome::AppLaunchParams(
       profile, extension, NEW_FOREGROUND_TAB));
 }
 
+void AppListControllerDelegateCocoa::ShowForProfileByPath(
+    const base::FilePath& profile_path) {
+  AppListService* service = AppListServiceMac::GetInstance();
+  service->SetProfilePath(profile_path);
+  service->Show();
+}
+
 enum DockLocation {
   DockLocationOtherDisplay,
   DockLocationBottom,
   DockLocationLeft,
   DockLocationRight,
 };
 
 DockLocation DockLocationInDisplay(const gfx::Display& display) {
   // Assume the dock occupies part of the work area either on the left, right or
   // bottom of the display. Note in the autohide case, it is always 4 pixels.
@@ skipping 151 matching lines @@
 
   init_called = true;
   apps::AppShimHandler::RegisterHandler(app_mode::kAppListModeId,
                                         AppListServiceMac::GetInstance());
 }
 
 void AppListServiceMac::CreateForProfile(Profile* requested_profile) {
   if (profile() == requested_profile)
     return;
 
   // The Objective C objects might be released at some unknown point in the

[tapted, 2013/09/13 23:12:17]

I think here, just do

if (window_controller_) {
  // Clear the search box... 
  [[window_controller_ appListViewController]
searchBoxModel]->SetText(base::string16());
} else {
  window_controller_.reset([[AppListWindowController alloc] init]);
}

then you don't need to change ShowForProfile() at all (after the
ShowWindowNearDock change below), and you avoid repeating some logic.

I'm pretty sure you can also just delete the lines:

  // The Objective C objects might...
  [[window_controller_ appListViewController]
        setDelegate:scoped_ptr<app_list::AppListViewDelegate>()];

Since the maybe-non-nil window_controller_ is no longer getting "fake-destroyed"
by Objective-C by the .reset(), there's no danger of it holding on to C++
objects in the case it doesn't actually get destroyed. You're probably relying
on this in the code added to ShowForProfile anyway, since you don't have that
and now in most cases CreateForProfile is called with a nil window_controller_
anyway.

[calamity, 2013/09/16 19:45:26]

Done.

   // future, so explicitly clear references to C++ objects.
   [[window_controller_ appListViewController]
       setDelegate:scoped_ptr<app_list::AppListViewDelegate>()];
 
   SetProfile(requested_profile);
   scoped_ptr<app_list::AppListViewDelegate> delegate(
       new AppListViewDelegate(new AppListControllerDelegateCocoa(), profile()));
   window_controller_.reset([[AppListWindowController alloc] init]);
   [[window_controller_ appListViewController] setDelegate:delegate.Pass()];
 }
 
 void AppListServiceMac::ShowForProfile(Profile* requested_profile) {
   if (requested_profile->IsManaged())
     return;
 
   InvalidatePendingProfileLoads();
 
   if (IsAppListVisible() && (requested_profile == profile())) {
     ShowWindowNearDock();
     return;
   }
 
   SetProfilePath(requested_profile->GetPath());
+  if (!window_controller_) {
+    DismissAppList();

[tapted, 2013/09/13 23:12:17]

this will always be a no-op with the condition above

[calamity, 2013/09/16 19:45:26]

Removed.

+    CreateForProfile(requested_profile);
+  } else if (requested_profile != profile()) {
+    // Clear the search box text when switching profiles.
+    [[window_controller_ appListViewController] searchBoxModel]
+        ->SetText(base::string16());
 
-  DismissAppList();
-  CreateForProfile(requested_profile);
-  ShowWindowNearDock();
+    SetProfile(requested_profile);
+    scoped_ptr<app_list::AppListViewDelegate> delegate(
+        new AppListViewDelegate(new AppListControllerDelegateCocoa(),
+                                requested_profile));
+    [[window_controller_ appListViewController] setDelegate:delegate.Pass()];
+  }
+  if (!IsAppListVisible())

[tapted, 2013/09/13 23:12:17]

I think this check can just go at the start of ShowWindowNearDock() (i.e. return
early if visible), and it will fix http://crbug.com/289872 as well. Not sure if
it should re-show if it is in the 200ms window when it is fading out... I'd say
initially "no"

[calamity, 2013/09/16 19:45:26]

Done.

+    ShowWindowNearDock();
 }
 
 void AppListServiceMac::DismissAppList() {
   if (!IsAppListVisible())
     return;
 
   // If the app list is currently the main window, it will activate the next
   // Chrome window when dismissed. But if a different application was active
   // when the app list was shown, activate that instead.
   base::scoped_nsobject<NSRunningApplication> prior_app;
@@ skipping 124 matching lines @@
   [animation_ startAnimation];
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   [window_ close];
   window_.reset();
   animation_.reset();
 }
 
 @end