Welcome page changes for Windows 10 and over.

chrome/browser/first_run/first_run.cc

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) &&

[gab, 2015/07/09 18:05:11]

|value| is unchanged if this returns false (i.e. the pref is not there), so
having it default to true on 596 and calling the getter without interpreting the
return value is sufficient -- though I realize now that the way you wrote it is
also the way it's written for other bool prefs above so I guess this is fine..

tl;dr; I'm okay with this, but there's room for clean up..

[grt (UTC plus 2), 2015/07/10 15:43:24]

I don't understand. The default value is used if the pref is not present by
design. What do you think could be cleaned up?

+      !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() {}