Changes to "launch with multiple profiles" behavior.

chrome/browser/ui/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1685 matching lines @@
       CommandLine command_line_without_urls(command_line.GetProgram());
       const CommandLine::SwitchMap& switches = command_line.GetSwitches();
       for (CommandLine::SwitchMap::const_iterator switch_it = switches.begin();
            switch_it != switches.end(); ++switch_it) {
         command_line_without_urls.AppendSwitchNative(switch_it->first,
                                                      switch_it->second);
       }
       // Launch the profiles in the order they became active.
       for (Profiles::const_iterator it = last_opened_profiles.begin();
            it != last_opened_profiles.end(); ++it) {
+        // Don't launch additional profiles which would only open a new tab
+        // page. When restarting after an update, all profiles will reopen last
+        // open pages.
+        SessionStartupPref startup_pref =
+            GetSessionStartupPref(command_line, *it);
+        if (*it != last_used_profile &&
+            startup_pref.type != SessionStartupPref::LAST &&
+            startup_pref.type != SessionStartupPref::URLS)
+          continue;
         if (!browser_init->LaunchBrowser((*it == last_used_profile) ?
             command_line : command_line_without_urls, *it, cur_dir,
             is_process_startup, is_first_run, return_code))
           return false;
         // We've launched at least one browser.
         is_process_startup = BrowserInit::IS_NOT_PROCESS_STARTUP;
       }
     }
   }
   return true;
@@ skipping 43 matching lines @@
 
   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);
 }