diff options
Diffstat (limited to 'chrome/browser/first_run.cc')
| -rw-r--r-- | chrome/browser/first_run.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc index df1687c..6304609 100644 --- a/chrome/browser/first_run.cc +++ b/chrome/browser/first_run.cc @@ -209,10 +209,10 @@ bool FirstRun::CreateSentinel() { return true; } -bool FirstRun::ProcessMasterPreferences( - const FilePath& user_data_dir, - const FilePath& master_prefs_path, - int* preference_details) { +bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, + const FilePath& master_prefs_path, + int* preference_details, + std::vector<std::wstring>* new_tabs) { DCHECK(!user_data_dir.empty()); if (preference_details) *preference_details = 0; @@ -236,6 +236,9 @@ bool FirstRun::ProcessMasterPreferences( if (parse_result & installer_util::MASTER_PROFILE_ERROR) return true; + if (new_tabs) + *new_tabs = installer_util::ParseFirstRunTabs(master_prefs); + if (parse_result & installer_util::MASTER_PROFILE_REQUIRE_EULA) { // Show the post-installation EULA. This is done by setup.exe and the // result determines if we continue or not. We wait here until the user |