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
-  // future, so explicitly clear references to C++ objects.
-  [[window_controller_ appListViewController]
-      setDelegate:scoped_ptr<app_list::AppListViewDelegate>()];
+  SetProfile(requested_profile);
 
-  SetProfile(requested_profile);
+  if (window_controller_) {
+    // Clear the search box.
+    [[window_controller_ appListViewController] searchBoxModel]
+        ->SetText(base::string16());
+  } else {
+    window_controller_.reset([[AppListWindowController alloc] init]);
+  }
+
   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())) {
+  if (requested_profile == profile()) {
     ShowWindowNearDock();
     return;
   }
 
   SetProfilePath(requested_profile->GetPath());
-
-  DismissAppList();
   CreateForProfile(requested_profile);
   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
@@ skipping 49 matching lines @@
 
 void AppListServiceMac::OnShimFocus(apps::AppShimHandler::Host* host,
                                     apps::AppShimFocusType focus_type) {}
 
 void AppListServiceMac::OnShimSetHidden(apps::AppShimHandler::Host* host,
                                         bool hidden) {}
 
 void AppListServiceMac::OnShimQuit(apps::AppShimHandler::Host* host) {}
 
 void AppListServiceMac::ShowWindowNearDock() {
+  if (IsAppListVisible())
+    return;

[tapted, 2013/09/16 20:46:44]

nit: blank line after early return

[calamity, 2013/09/17 00:09:26]

Done.

   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]);
 
@@ skipping 57 matching lines @@
   [animation_ startAnimation];
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   [window_ close];
   window_.reset();
   animation_.reset();
 }
 
 @end