Fix the logic that determines when to show the Win 10 promo page.

chrome/browser/ui/startup/startup_tab_provider.cc

 // Copyright 2016 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/ui/startup/startup_tab_provider.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "net/base/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_integration.h"
 #endif
 
+namespace {
+
+// The set default browser operation can be disabled by the browser distribution
+// (e.g. SxS Canary), or by enterprise policy. In these cases, the Win 10 promo
+// page should not be displayed.
+bool IsSetDefaultBrowserAllowed(PrefService* local_state) {
+  bool disabled_by_enterprise_policy =
+      local_state &&
+      local_state->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled) &&
+      !local_state->GetBoolean(prefs::kDefaultBrowserSettingEnabled);
+  bool allowed_by_distribution = shell_integration::CanSetAsDefaultBrowser();

[Peter Kasting, 2017/01/11 01:06:09]

Nit: I'd just inline this below

[Patrick Monette, 2017/01/11 16:41:20]

I inlined the whole function below.

+  return !disabled_by_enterprise_policy && allowed_by_distribution;
+}
+
+}  // namespace
+
 StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
   if (!profile)
     return StartupTabs();
 
   bool is_first_run = first_run::IsChromeFirstRun();
   PrefService* prefs = profile->GetPrefs();
   bool has_seen_welcome_page =
       prefs && prefs->GetBoolean(prefs::kHasSeenWelcomePage);
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
   bool is_signed_in = signin_manager && signin_manager->IsAuthenticated();
 
 #if defined(OS_WIN)
   // Windows 10 has unique onboarding policies and content.
   if (base::win::GetVersion() >= base::win::VERSION_WIN10) {
     PrefService* local_state = g_browser_process->local_state();
     bool has_seen_win10_promo =
         local_state && local_state->GetBoolean(prefs::kHasSeenWin10PromoPage);
+    bool set_default_browser_allowed = IsSetDefaultBrowserAllowed(local_state);

[Peter Kasting, 2017/01/11 01:06:09]

Nit: I'd just inline this below, or else I'd inline IsSetDefaultBrowserAllowed
to here (and probably keep this temp)

[Patrick Monette, 2017/01/11 16:41:20]

Done.

     bool is_default_browser =
         g_browser_process->CachedDefaultWebClientState() ==
         shell_integration::IS_DEFAULT;
-    return CheckWin10OnboardingTabPolicy(is_first_run, has_seen_welcome_page,
-                                         has_seen_win10_promo, is_signed_in,
-                                         is_default_browser);
+    return CheckWin10OnboardingTabPolicy(
+        is_first_run, has_seen_welcome_page, has_seen_win10_promo, is_signed_in,
+        set_default_browser_allowed, is_default_browser);
   }
 #endif
 
   return CheckStandardOnboardingTabPolicy(is_first_run, has_seen_welcome_page,
                                           is_signed_in);
 }
 
 StartupTabs StartupTabProviderImpl::GetDistributionFirstRunTabs(
     StartupBrowserCreator* browser_creator) const {
   if (!browser_creator)
@@ skipping 46 matching lines @@
   return tabs;
 }
 
 #if defined(OS_WIN)
 // static
 StartupTabs StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
     bool is_first_run,
     bool has_seen_welcome_page,
     bool has_seen_win10_promo,
     bool is_signed_in,
+    bool set_default_browser_allowed,
     bool is_default_browser) {
   StartupTabs tabs;
-  if (!has_seen_win10_promo && !is_default_browser)
+  if (set_default_browser_allowed && !has_seen_win10_promo &&
+      !is_default_browser)
     tabs.emplace_back(GetWin10WelcomePageUrl(!is_first_run), false);
   else if (!has_seen_welcome_page && !is_signed_in)
     tabs.emplace_back(GetWelcomePageUrl(!is_first_run), false);
   return tabs;
 }
 #endif
 
 // static
 StartupTabs StartupTabProviderImpl::CheckMasterPrefsTabPolicy(
     bool is_first_run,
@@ skipping 71 matching lines @@
              ? net::AppendQueryParameter(url, "text", "faster")
              : url;
 }
 #endif
 
 // static
 GURL StartupTabProviderImpl::GetTriggeredResetSettingsUrl() {
   return GURL(
       chrome::GetSettingsUrl(chrome::kTriggeredResetProfileSettingsSubPage));
 }