Changes to "launch with multiple profiles" behavior.

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 43 matching lines @@
 #include "chrome/browser/metrics/tracking_synchronizer.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_value_store.h"
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
@@ skipping 311 matching lines @@
 // should not continue.
 Profile* CreateProfile(const content::MainFunctionParams& parameters,
                        const FilePath& user_data_dir,
                        const CommandLine& parsed_command_line) {
   Profile* profile;
   if (ProfileManager::IsMultipleProfilesEnabled() &&
       parsed_command_line.HasSwitch(switches::kProfileDirectory)) {
     g_browser_process->local_state()->SetString(prefs::kProfileLastUsed,
         parsed_command_line.GetSwitchValueASCII(
             switches::kProfileDirectory));
+    // Reset kProfilesLastActive to an empty list to prevent launching the last

[sail, 2012/01/24 15:09:24]

I don't understand why you need to clear this locate state pref when creating a
new profile.

What I would expect to happen is that non-active (front most) profiles only get
added to kProfilesLastActive list if setting is to re-open their last tabs.

Can you test that the following works:
  - Create two profiles, both with "reopen last tabs" set
  - Open a window for each profile with multiple tabs open
  - Exit chrome
Result: launching chrome should open both profiles. Does this work?

[marja, 2012/01/24 15:29:34]

This is not the code for creating a new profile :)
The kProfilesLastActive needs to be kept up to date (so that it contains all
active profiles, not only those which have the "reopen pages" setting), so that
we can recover from crashes and launch the correct profiles after restarting
because of an update.
Works. It doesn't hit this code path since switches::kProfileDirectory is not
passed.

Reformulated the comment to "Clear kProfilesLastActive since the user only wants
to launch a specific profile."

+    // active profiles.
+    ListPrefUpdate update(g_browser_process->local_state(),
+                          prefs::kProfilesLastActive);
+    ListValue* profile_list = update.Get();
+    profile_list->Clear();
   }
 #if defined(OS_CHROMEOS)
   // TODO(ivankr): http://crbug.com/83792
   profile = g_browser_process->profile_manager()->GetDefaultProfile(
       user_data_dir);
 #else
   profile = g_browser_process->profile_manager()->GetLastUsedProfile(
       user_data_dir);
 #endif
   if (profile)
@@ skipping 1548 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }