Welcome page changes for Windows 10 and over.

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 970 matching lines @@
       if (!master_prefs_->variations_seed_signature.empty()) {
         local_state_->SetString(prefs::kVariationsSeedSignature,
                                 master_prefs_->variations_seed_signature);
       }
       // Set the variation seed date to the current system time. If the user's
       // clock is incorrect, this may cause some field trial expiry checks to
       // not do the right thing until the next seed update from the server,
       // when this value will be updated.
       local_state_->SetInt64(prefs::kVariationsSeedDate,
                              base::Time::Now().ToInternalValue());
+
+#if defined(OS_WIN)
+      if (!master_prefs_->welcome_page_on_os_upgrade_enabled)
+        local_state_->SetBoolean(prefs::kWelcomePageOnOSUpgradeEnabled, false);

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

Should be outside the |variations_seed| if (i.e. up one scope level from here).

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

Absolutely. Nice catch.

+#endif
     }
 
     if (!master_prefs_->suppress_default_browser_prompt_for_version.empty()) {
       local_state_->SetString(
           prefs::kBrowserSuppressDefaultBrowserPrompt,
           master_prefs_->suppress_default_browser_prompt_for_version);
     }
   }
 #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 
@@ skipping 779 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }