Restore all profiles which were active when restoring the last open pages.

chrome/browser/ui/browser_init.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_INIT_H_
 #define CHROME_BROWSER_UI_BROWSER_INIT_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "googleurl/src/gurl.h"
 
 class Browser;
 class CommandLine;
 class GURL;
 class PrefService;
 class TabContentsWrapper;
 
 // class containing helpers for BrowserMain to spin up a new instance and
 // initialize the profile.
 class BrowserInit {
  public:
+  typedef std::vector<Profile*> Profiles;
+
   enum IsProcessStartup {
     IS_NOT_PROCESS_STARTUP,
     IS_PROCESS_STARTUP
   };
   enum IsFirstRun {
     IS_NOT_FIRST_RUN,
     IS_FIRST_RUN
   };
 
   BrowserInit();
   ~BrowserInit();
 
   // Adds a url to be opened during first run. This overrides the standard
   // tabs shown at first run.
   void AddFirstRunTab(const GURL& url);
 
   // This function is equivalent to ProcessCommandLine but should only be
   // called during actual process startup.
-  bool Start(const CommandLine& cmd_line, const FilePath& cur_dir,
-             Profile* profile, int* return_code) {
-    return ProcessCmdLineImpl(cmd_line, cur_dir, true, profile, return_code,
-                              this);
+  bool Start(const CommandLine& cmd_line,
+             const FilePath& cur_dir,
+             Profile* last_used_profile,

[Peter Kasting, 2012/01/11 18:38:01]

Nit: If you're going to mess with the names, I think |last_active_profile| and
|last_opened_profiles| (or |other_opened_profiles|) makes more sense.

[marja, 2012/01/12 09:20:22]

Yes. ProfileManager already had LastUsedProfile() before this CL, so, I changed
"last active profiles" to "last opened profiles", so,
ProfileManager::LastOpenedProfiles() and the corresponding changes in parameter
names in BrowserInit.

+             const Profiles& last_active_profiles,
+             int* return_code) {
+    return ProcessCmdLineImpl(cmd_line, cur_dir, true, last_used_profile,
+                              last_active_profiles, return_code, this);
   }
 
   // This function performs command-line handling and is invoked only after
   // start up (for example when we get a start request for another process).
   // |command_line| holds the command line we need to process
   static void ProcessCommandLineAlreadyRunning(const CommandLine& cmd_line,
                                                const FilePath& cur_dir);
 
   template <class AutomationProviderClass>
   static bool CreateAutomationProvider(const std::string& channel_id,
@@ skipping 181 matching lines @@
 
  private:
   // Returns the list of URLs to open from the command line. The returned
   // vector is empty if the user didn't specify any URLs on the command line.
   static std::vector<GURL> GetURLsFromCommandLine(
       const CommandLine& command_line,
       const FilePath& cur_dir,
       Profile* profile);
 
   static bool ProcessCmdLineImpl(const CommandLine& command_line,
-                                 const FilePath& cur_dir, bool process_startup,
-                                 Profile* profile, int* return_code,
+                                 const FilePath& cur_dir,
+                                 bool process_startup,
+                                 Profile* last_used_profile,
+                                 const Profiles& last_active_profiles,
+                                 int* return_code,
                                  BrowserInit* browser_init);
 
   // Callback after a profile has been created.
   static void ProcessCommandLineOnProfileCreated(
       const CommandLine& cmd_line,
       const FilePath& cur_dir,
       Profile* profile,
       Profile::CreateStatus status);
 
   // Additional tabs to open during first run.
   std::vector<GURL> first_run_tabs_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInit);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_INIT_H_