| Index: chrome/browser/ui/browser_init.h
|
| diff --git a/chrome/browser/ui/browser_init.h b/chrome/browser/ui/browser_init.h
|
| index 32cd4b7a02f470b7cffaad989037b7dac9c743a2..5b1c339ef4373b6bd3c6e95ae321bf85ac2ce045 100644
|
| --- a/chrome/browser/ui/browser_init.h
|
| +++ b/chrome/browser/ui/browser_init.h
|
| @@ -25,6 +25,8 @@ class TabContentsWrapper;
|
| // initialize the profile.
|
| class BrowserInit {
|
| public:
|
| + typedef std::vector<Profile*> Profiles;
|
| +
|
| enum IsProcessStartup {
|
| IS_NOT_PROCESS_STARTUP,
|
| IS_PROCESS_STARTUP
|
| @@ -43,10 +45,13 @@ class BrowserInit {
|
|
|
| // 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,
|
| + const Profiles& last_opened_profiles,
|
| + int* return_code) {
|
| + return ProcessCmdLineImpl(cmd_line, cur_dir, true, last_used_profile,
|
| + last_opened_profiles, return_code, this);
|
| }
|
|
|
| // This function performs command-line handling and is invoked only after
|
| @@ -248,8 +253,11 @@ class BrowserInit {
|
| 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_opened_profiles,
|
| + int* return_code,
|
| BrowserInit* browser_init);
|
|
|
| // Callback after a profile has been created.
|
|
|