| Index: chrome/browser/profiles/profile_manager.cc
|
| ===================================================================
|
| --- chrome/browser/profiles/profile_manager.cc (revision 136345)
|
| +++ chrome/browser/profiles/profile_manager.cc (working copy)
|
| @@ -150,8 +150,8 @@
|
| if (status == Profile::CREATE_STATUS_INITIALIZED) {
|
| ProfileManager::FindOrCreateNewWindowForProfile(
|
| profile,
|
| - BrowserInit::IS_PROCESS_STARTUP,
|
| - BrowserInit::IS_FIRST_RUN,
|
| + StartupBrowserCreator::IS_PROCESS_STARTUP,
|
| + StartupBrowserCreator::IS_FIRST_RUN,
|
| false);
|
| }
|
| }
|
| @@ -469,8 +469,8 @@
|
| // static
|
| void ProfileManager::FindOrCreateNewWindowForProfile(
|
| Profile* profile,
|
| - BrowserInit::IsProcessStartup process_startup,
|
| - BrowserInit::IsFirstRun is_first_run,
|
| + StartupBrowserCreator::IsProcessStartup process_startup,
|
| + StartupBrowserCreator::IsFirstRun is_first_run,
|
| bool always_create) {
|
| DCHECK(profile);
|
|
|
| @@ -485,9 +485,9 @@
|
| content::RecordAction(UserMetricsAction("NewWindow"));
|
| CommandLine command_line(CommandLine::NO_PROGRAM);
|
| int return_code;
|
| - BrowserInit browser_init;
|
| - browser_init.LaunchBrowser(command_line, profile, FilePath(),
|
| - process_startup, is_first_run, &return_code);
|
| + StartupBrowserCreator browser_creator;
|
| + browser_creator.LaunchBrowser(command_line, profile, FilePath(),
|
| + process_startup, is_first_run, &return_code);
|
| }
|
|
|
| void ProfileManager::Observe(
|
|
|