| Index: chrome/browser/first_run/first_run.cc
|
| diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
|
| index 671799c6b63f690b39e5e9dae48132fa14d70025..9c739e9fde61a46c7c1b4aefe40a5f6e4de32582 100644
|
| --- a/chrome/browser/first_run/first_run.cc
|
| +++ b/chrome/browser/first_run/first_run.cc
|
| @@ -551,6 +551,13 @@ void SetupMasterPrefsFromInstallPrefs(
|
| install_prefs.GetString(
|
| installer::master_preferences::kDistroSuppressDefaultBrowserPromptPref,
|
| &out_prefs->suppress_default_browser_prompt_for_version);
|
| +
|
| + if (install_prefs.GetBool(
|
| + installer::master_preferences::kDistroWelcomePageOnOSUpgradeEnabled,
|
| + &value) &&
|
| + !value) {
|
| + out_prefs->welcome_page_on_os_upgrade_enabled = false;
|
| + }
|
| }
|
|
|
| bool GetFirstRunSentinelFilePath(base::FilePath* path) {
|
| @@ -585,7 +592,8 @@ MasterPrefs::MasterPrefs()
|
| do_import_items(0),
|
| dont_import_items(0),
|
| make_chrome_default_for_user(false),
|
| - suppress_first_run_default_browser_prompt(false) {
|
| + suppress_first_run_default_browser_prompt(false),
|
| + welcome_page_on_os_upgrade_enabled(true) {
|
| }
|
|
|
| MasterPrefs::~MasterPrefs() {}
|
|
|