Reset browser.check_default_browser to true when Chrome is the user's default browser

chrome/browser/ui/startup/default_browser_prompt.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/ui/startup/default_browser_prompt.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
@@ skipping 160 matching lines @@
     return;
 
   DefaultBrowserInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents),
       Profile::FromBrowserContext(
           web_contents->GetBrowserContext())->GetPrefs(),
       (ShellIntegration::CanSetAsDefaultBrowser() ==
           ShellIntegration::SET_DEFAULT_INTERACTIVE));
 }
 
-void CheckDefaultBrowserCallback(chrome::HostDesktopType desktop_type) {
-  if (ShellIntegration::GetDefaultBrowser() == ShellIntegration::NOT_DEFAULT) {
+void ResetCheckDefaultBrowserPrefOnUIThread() {

[msw, 2015/06/16 20:29:49]

nit: maybe DCHECK_CURRENTLY_ON(BrowserThread::UI); ?

[grt (UTC plus 2), 2015/06/16 21:04:09]

Done.

+  PrefService* prefs = ProfileManager::GetLastUsedProfile()->GetPrefs();
+  prefs->SetBoolean(prefs::kCheckDefaultBrowser, true);
+}
+
+void CheckDefaultBrowserOnFileThread(bool show_prompt,

[msw, 2015/06/16 20:29:49]

nit: maybe DCHECK_CURRENTLY_ON(BrowserThread::FILE); ?

[grt (UTC plus 2), 2015/06/16 21:04:09]

Done.

+                                     chrome::HostDesktopType desktop_type) {
+  ShellIntegration::DefaultWebClientState state =
+      ShellIntegration::GetDefaultBrowser();
+  if (state == ShellIntegration::IS_DEFAULT) {
+    // Notify the user in the future if Chrome ceases to be the user's chosen
+    // default browser.
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI, FROM_HERE,
+        base::Bind(&ResetCheckDefaultBrowserPrefOnUIThread));
+  } else if (show_prompt && state == ShellIntegration::NOT_DEFAULT) {
     ShellIntegration::DefaultWebClientSetPermission default_change_mode =
         ShellIntegration::CanSetAsDefaultBrowser();
 
     if (default_change_mode != ShellIntegration::SET_DEFAULT_NOT_ALLOWED) {
       content::BrowserThread::PostTask(
           content::BrowserThread::UI, FROM_HERE,
           base::Bind(&NotifyNotDefaultBrowserCallback, desktop_type));
     }
   }
 }
 
 }  // namespace
 
 namespace chrome {
 
 void RegisterDefaultBrowserPromptPrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(
       prefs::kBrowserSuppressDefaultBrowserPrompt, std::string());
 }
 
 void ShowDefaultBrowserPrompt(Profile* profile, HostDesktopType desktop_type) {
   // We do not check if we are the default browser if:
+  // - There is a policy in control of this setting.
+  // We check if we are the default browser but do not prompt if:
   // - The user said "don't ask me again" on the infobar earlier.
-  // - There is a policy in control of this setting.
   // - The "suppress_default_browser_prompt_for_version" master preference is
   //     set to the current version.
-  if (!profile->GetPrefs()->GetBoolean(prefs::kCheckDefaultBrowser))
-    return;
+  bool show_prompt =
+      profile->GetPrefs()->GetBoolean(prefs::kCheckDefaultBrowser);
 
   if (g_browser_process->local_state()->IsManagedPreference(
       prefs::kDefaultBrowserSettingEnabled)) {
     if (g_browser_process->local_state()->GetBoolean(
         prefs::kDefaultBrowserSettingEnabled)) {
       content::BrowserThread::PostTask(
           content::BrowserThread::FILE, FROM_HERE,
           base::Bind(
               base::IgnoreResult(&ShellIntegration::SetAsDefaultBrowser)));
     } else {
       // TODO(pastarmovj): We can't really do anything meaningful here yet but
       // just prevent showing the infobar.
     }
     return;
   }
 
-  const std::string disable_version_string =
-      g_browser_process->local_state()->GetString(
-          prefs::kBrowserSuppressDefaultBrowserPrompt);
-  const Version disable_version(disable_version_string);
-  DCHECK(disable_version_string.empty() || disable_version.IsValid());
-  if (disable_version.IsValid()) {
-    const chrome::VersionInfo version_info;
-    if (disable_version.Equals(Version(version_info.Version())))
-      return;
+  if (show_prompt) {
+    const std::string disable_version_string =
+        g_browser_process->local_state()->GetString(
+            prefs::kBrowserSuppressDefaultBrowserPrompt);
+    const Version disable_version(disable_version_string);
+    DCHECK(disable_version_string.empty() || disable_version.IsValid());
+    if (disable_version.IsValid()) {
+      const chrome::VersionInfo version_info;
+      if (disable_version.Equals(Version(version_info.Version())))
+        show_prompt = false;
+    }
   }
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
-      base::Bind(&CheckDefaultBrowserCallback, desktop_type));
+      base::Bind(&CheckDefaultBrowserOnFileThread, show_prompt, desktop_type));
 }
 
 #if !defined(OS_WIN)
 bool ShowFirstRunDefaultBrowserPrompt(Profile* profile) {
   return false;
 }
 #endif
 
 }  // namespace chrome