Chromium Code Reviews| 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..cb5891fe36cfe2d5107f0508e0af12ec2ca2cf01 100644 |
| --- a/chrome/browser/ui/browser_init.h |
| +++ b/chrome/browser/ui/browser_init.h |
| @@ -44,9 +44,10 @@ 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, |
|
Peter Kasting
2012/01/10 02:20:12
Nit: One arg per line on declarations (2 places)
marja
2012/01/10 14:12:03
Done.
|
| - Profile* profile, int* return_code) { |
| - return ProcessCmdLineImpl(cmd_line, cur_dir, true, profile, return_code, |
| - this); |
| + Profile* last_active_profile, |
| + const std::vector<Profile*>& other_profiles, int* return_code) { |
|
Peter Kasting
2012/01/10 02:20:12
Nit: I suggest typedefing "std::vector<Profile*>"
marja
2012/01/10 14:12:03
Done.
|
| + return ProcessCmdLineImpl(cmd_line, cur_dir, true, last_active_profile, |
| + other_profiles, return_code, this); |
| } |
| // This function performs command-line handling and is invoked only after |
| @@ -249,8 +250,9 @@ class BrowserInit { |
| static bool ProcessCmdLineImpl(const CommandLine& command_line, |
| const FilePath& cur_dir, bool process_startup, |
| - Profile* profile, int* return_code, |
| - BrowserInit* browser_init); |
| + Profile* last_active_profile, |
| + const std::vector<Profile*>& other_profiles, |
| + int* return_code, BrowserInit* browser_init); |
| // Callback after a profile has been created. |
| static void ProcessCommandLineOnProfileCreated( |