Enable profile switching for standalone App Launcher via the Settings App.

chrome/browser/ui/startup/startup_browser_creator.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 649 matching lines @@
   AutomationProviderList* list = g_browser_process->GetAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 #endif  // defined(ENABLE_AUTOMATION)
 
   return true;
 }
 
 // static
 void StartupBrowserCreator::ProcessCommandLineOnProfileCreated(
-    const CommandLine& cmd_line,
+    const CommandLine& command_line,
     const FilePath& cur_dir,
     Profile* profile,
     Profile::CreateStatus status) {
   if (status == Profile::CREATE_STATUS_INITIALIZED)
-    ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL,
+    ProcessCmdLineImpl(command_line, cur_dir, false, profile, Profiles(), NULL,
                        NULL);
 }
 
 // static
 void StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
-    const CommandLine& cmd_line,
-    const FilePath& cur_dir) {
-  if (cmd_line.HasSwitch(switches::kProfileDirectory)) {
-    ProfileManager* profile_manager = g_browser_process->profile_manager();
-    FilePath path = cmd_line.GetSwitchValuePath(switches::kProfileDirectory);
-    path = profile_manager->user_data_dir().Append(path);
-    profile_manager->CreateProfileAsync(path,
+    const CommandLine& command_line,
+    const FilePath& cur_dir,
+    const FilePath& profile_path) {
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  Profile* profile = profile_manager->GetProfileByPath(profile_path);
+
+  // The profile isn't loaded yet and so needs to be loaded asynchronously.
+  if (!profile) {
+    profile_manager->CreateProfileAsync(profile_path,
         base::Bind(&StartupBrowserCreator::ProcessCommandLineOnProfileCreated,
-                   cmd_line, cur_dir), string16(), string16(), false);
+                   command_line, cur_dir), string16(), string16(), false);
     return;
   }
 
-  Profile* profile = ProfileManager::GetLastUsedProfile();
-  if (!profile) {
-    // We should only be able to get here if the profile already exists and
-    // has been created.
-    NOTREACHED();
-    return;
-  }
-  ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
+  ProcessCmdLineImpl(command_line, cur_dir, false, profile, Profiles(), NULL,
+                     NULL);
 }
 
 // static
 bool StartupBrowserCreator::ActivatedProfile() {
   return profile_launch_observer.Get().activated_profile();
 }
 
 bool HasPendingUncleanExit(Profile* profile) {
   return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
       !profile_launch_observer.Get().HasBeenLaunched(profile);
 }