[win] Set the profile path when enabling the app launcher.

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.
 
 #include <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 #include "apps/app_shim/app_shim_handler_mac.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 45 matching lines @@
   }
 
   void CreateAppList(Profile* profile);
   void ShowWindowNearDock();
 
   // AppListService overrides:
   virtual void Init(Profile* initial_profile) OVERRIDE;
   virtual void ShowAppList(Profile* requested_profile) OVERRIDE;
   virtual void DismissAppList() OVERRIDE;
   virtual bool IsAppListVisible() const OVERRIDE;
-  virtual void EnableAppList() OVERRIDE;
   virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
 
+  // AppListServiceImpl override:
+  virtual void CreateShortcut() OVERRIDE;
+
   // AppShimHandler overrides:
   virtual void OnShimLaunch(apps::AppShimHandler::Host* host,
                             apps::AppShimLaunchType launch_type) OVERRIDE;
   virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE;
   virtual void OnShimFocus(apps::AppShimHandler::Host* host,
                            apps::AppShimFocusType focus_type) OVERRIDE;
   virtual void OnShimSetHidden(apps::AppShimHandler::Host* host,
                                bool hidden) OVERRIDE;
   virtual void OnShimQuit(apps::AppShimHandler::Host* host) OVERRIDE;
 
@@ skipping 84 matching lines @@
     shortcut_info.favicon.Add(
         *resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_256));
   }
 
   // TODO(tapted): Create a dock icon using chrome/browser/mac/dock.h .
   web_app::CreateShortcuts(shortcut_info,
                            ShellIntegration::ShortcutLocations(),
                            web_app::ALLOW_DUPLICATE_SHORTCUTS);
 }
 
-// Check that there is an app list shim. If enabling and there is not, make one.
-// If disabling with --enable-app-list-shim=0, and there is one, delete it.
-void CheckAppListShimOnFileThread(const base::FilePath& profile_path) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
-  const bool enable =
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppListShim);
-  base::FilePath install_path = web_app::GetAppInstallPath(
-      GetAppListShortcutInfo(profile_path));
-  if (enable == file_util::PathExists(install_path))
-    return;
-
-  if (enable) {
-    content::BrowserThread::PostTask(
-        content::BrowserThread::UI, FROM_HERE,
-        base::Bind(&CreateAppListShim, profile_path));
-    return;
-  }
-
-  // Sanity check because deleting things recursively is scary.
-  CHECK(install_path.MatchesExtension(".app"));
-  base::Delete(install_path, true /* recursive */);
-}
-
 void CreateShortcutsInDefaultLocation(
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   web_app::CreateShortcuts(shortcut_info,
                            ShellIntegration::ShortcutLocations(),
                            web_app::ALLOW_DUPLICATE_SHORTCUTS);
 }
 
 AppListControllerDelegateCocoa::AppListControllerDelegateCocoa() {}
 
 AppListControllerDelegateCocoa::~AppListControllerDelegateCocoa() {}
@@ skipping 54 matching lines @@
       new AppListViewDelegate(new AppListControllerDelegateCocoa(), profile()));
   window_controller_.reset([[AppListWindowController alloc] init]);
   [[window_controller_ appListViewController] setDelegate:delegate.Pass()];
 }
 
 void AppListServiceMac::Init(Profile* initial_profile) {
   // On Mac, Init() is called multiple times for a process: any time there is no
   // browser window open and a new window is opened, and during process startup
   // to handle the silent launch case (e.g. for app shims). In the startup case,
   // a profile has not yet been determined so |initial_profile| will be NULL.
-  if (initial_profile) {
-    static bool checked_shim = false;
-    if (!checked_shim) {
-      checked_shim = true;
-      content::BrowserThread::PostTask(
-          content::BrowserThread::FILE, FROM_HERE,
-          base::Bind(&CheckAppListShimOnFileThread,
-                     initial_profile->GetPath()));
-    }
+  static bool init_called_with_profile = false;
+  if (initial_profile && !init_called_with_profile) {
+    init_called_with_profile = true;
+    SharedDesktopInit(initial_profile);
   }
 
   static bool init_called = false;
   if (init_called)
     return;
 
   init_called = true;
   apps::AppShimHandler::RegisterHandler(app_mode::kAppListModeId,
                                         AppListServiceMac::GetInstance());
 }
 
 void AppListServiceMac::ShowAppList(Profile* requested_profile) {
   InvalidatePendingProfileLoads();
 
   if (IsAppListVisible() && (requested_profile == profile())) {
     ShowWindowNearDock();
     return;
   }
 
-  SaveProfilePathToLocalState(requested_profile->GetPath());
+  SetProfilePath(requested_profile->GetPath());
 
   DismissAppList();
   CreateAppList(requested_profile);
   ShowWindowNearDock();
 }
 
 void AppListServiceMac::DismissAppList() {
   if (!IsAppListVisible())
     return;
 
   [[window_controller_ window] close];
 
   FOR_EACH_OBSERVER(apps::AppShimHandler::Host,
                     observers_,
                     OnAppClosed());
 }
 
 bool AppListServiceMac::IsAppListVisible() const {
   return [[window_controller_ window] isVisible];
 }
 
-void AppListServiceMac::EnableAppList() {
-  // TODO(tapted): Implement enable logic here for OSX.
+void AppListServiceMac::CreateShortcut() {
+  CreateAppListShim(GetProfilePath(base::FilePath()));
 }
 
 NSWindow* AppListServiceMac::GetAppListWindow() {
   return [window_controller_ window];
 }
 
 void AppListServiceMac::OnShimLaunch(apps::AppShimHandler::Host* host,
                                      apps::AppShimLaunchType launch_type) {
   ShowForSavedProfile();
   observers_.AddObserver(host);
@@ skipping 126 matching lines @@
 
 // static
 AppListService* AppListService::Get() {
   return AppListServiceMac::GetInstance();
 }
 
 // static
 void AppListService::InitAll(Profile* initial_profile) {
   Get()->Init(initial_profile);
 }