Welcome page changes for Windows 10 and over.

chrome/browser/first_run/first_run.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 533 matching lines @@
 
   out_prefs->compressed_variations_seed =
       install_prefs.GetCompressedVariationsSeed();
   out_prefs->variations_seed = install_prefs.GetVariationsSeed();
   out_prefs->variations_seed_signature =
       install_prefs.GetVariationsSeedSignature();
 
   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) {
   base::FilePath user_data_dir;
   if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
     return false;
   *path = user_data_dir.Append(chrome::kFirstRunSentinel);
   return true;
 }
 
@@ skipping 14 matching lines @@
 #endif
 
 }  // namespace internal
 
 MasterPrefs::MasterPrefs()
     : ping_delay(0),
       homepage_defined(false),
       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() {}
 
 bool IsChromeFirstRun() {
   if (internal::g_first_run == internal::FIRST_RUN_UNKNOWN) {
     internal::g_first_run = internal::FIRST_RUN_FALSE;
     const base::CommandLine* command_line =
         base::CommandLine::ForCurrentProcess();
     if (command_line->HasSwitch(switches::kForceFirstRun) ||
@@ skipping 205 matching lines @@
   SetShouldDoPersonalDataManagerFirstRun();
 
   internal::DoPostImportPlatformSpecificTasks(profile);
 }
 
 uint16 auto_import_state() {
   return g_auto_import_state;
 }
 
 }  // namespace first_run