Remove redundant handling of the default_browser_setting_enabled policy.

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 <string>
 
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 226 matching lines @@
 }  // 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:
+  // Do not check if Chrome is the default browser if there is a policy in
+  // control of this setting.
+  if (g_browser_process->local_state()->IsManagedPreference(
+      prefs::kDefaultBrowserSettingEnabled)) {
+    // Handling of the browser.default_browser_setting_enabled policy setting is
+    // taken care of in BrowserProcessImpl.
+    return;
+  }
+
+  // Check if Chrome is the default browser but do not prompt if:
   // - The user said "don't ask me again" on the infobar earlier.
   // - The "suppress_default_browser_prompt_for_version" master preference is
   //     set to the current version.
   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;
-  }
-
   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()) {
       if (disable_version.Equals(Version(version_info::GetVersionNumber())))
         show_prompt = false;
     }
   }
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&CheckDefaultBrowserOnFileThread, profile->GetPath(),
                  show_prompt, desktop_type));
 }
 
 #if !defined(OS_WIN)
 bool ShowFirstRunDefaultBrowserPrompt(Profile* profile) {
   return false;
 }
 #endif
 
 }  // namespace chrome