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

chrome/browser/ui/startup/startup_browser_creator.cc

Index: chrome/browser/ui/startup/startup_browser_creator.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 2b715b80453ef6671771570dd3fa1f5f308b1654..5ac6870332d2711c2b71821d5420e15229549d23 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -667,37 +667,33 @@ bool StartupBrowserCreator::CreateAutomationProvider(
 
 // 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,
-        base::Bind(&StartupBrowserCreator::ProcessCommandLineOnProfileCreated,
-                   cmd_line, cur_dir), string16(), string16(), false);
-    return;
-  }
+    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);
 
-  Profile* profile = ProfileManager::GetLastUsedProfile();
+  // The profile isn't loaded yet and so needs to be loaded asynchronously.
   if (!profile) {
-    // We should only be able to get here if the profile already exists and
-    // has been created.
-    NOTREACHED();
+    profile_manager->CreateProfileAsync(profile_path,
+        base::Bind(&StartupBrowserCreator::ProcessCommandLineOnProfileCreated,
+                   command_line, cur_dir), string16(), string16(), false);
     return;
   }
-  ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
+
+  ProcessCmdLineImpl(command_line, cur_dir, false, profile, Profiles(), NULL,
+                     NULL);
 }
 
 // static