DefaultBrowserWorker now fully supports opening the settings for Win10

chrome/browser/shell_integration.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/shell_integration.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/policy/policy_path_parser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/prefs/pref_service.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#include "chrome/browser/shell_integration_win.h"
+#endif
+
 #if !defined(OS_WIN)
 #include "chrome/common/channel_info.h"
 #include "chrome/grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #endif
 
 using content::BrowserThread;
 
 namespace shell_integration {
 
 namespace {
 
 const struct AppModeInfo* gAppModeInfo = nullptr;
 
 }  // namespace
 
-#if !defined(OS_WIN)
-bool SetAsDefaultBrowserInteractive() {
-  return false;
-}
-
-bool SetAsDefaultProtocolClientInteractive(const std::string& protocol) {
-  return false;
-}
-#endif  // !defined(OS_WIN)
-
-DefaultWebClientSetPermission CanSetAsDefaultProtocolClient() {
-  // Allowed as long as the browser can become the operating system default
-  // browser.
-  return CanSetAsDefaultBrowser();
+bool CanSetAsDefaultBrowser() {
+  return GetDefaultWebClientSetPermission() != SET_DEFAULT_NOT_ALLOWED;
 }
 
 #if !defined(OS_WIN)
 bool IsElevationNeededForSettingDefaultProtocolClient() {
   return false;
 }
 #endif  // !defined(OS_WIN)
 
 void SetAppModeInfo(const struct AppModeInfo* info) {
   gAppModeInfo = info;
@@ skipping 113 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DefaultWebClientState state = CheckIsDefaultImpl();
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&DefaultBrowserWorker::OnCheckIsDefaultComplete, this, state,
                  is_following_set_as_default));
 }
 
 void DefaultWebClientWorker::SetAsDefault() {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-  SetAsDefaultImpl();
-  CheckIsDefault(true);
+
+  // SetAsDefaultImpl will make sure the callback is executed exactly once.
+  SetAsDefaultImpl(
+      base::Bind(&DefaultWebClientWorker::CheckIsDefault, this, true));
 }
 
 void DefaultWebClientWorker::ReportSetDefaultResult(
     DefaultWebClientState state) {
   base::LinearHistogram::FactoryGet(
       base::StringPrintf("%s.SetDefaultResult2", worker_name_), 1,
       DefaultWebClientState::NUM_DEFAULT_STATES,
       DefaultWebClientState::NUM_DEFAULT_STATES + 1,
       base::HistogramBase::kUmaTargetedHistogramFlag)
       ->Add(state);
@@ skipping 28 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultBrowserWorker, private:
 
 DefaultBrowserWorker::~DefaultBrowserWorker() = default;
 
 DefaultWebClientState DefaultBrowserWorker::CheckIsDefaultImpl() {
   return GetDefaultBrowser();
 }
 
-void DefaultBrowserWorker::SetAsDefaultImpl() {
-  switch (CanSetAsDefaultBrowser()) {
+void DefaultBrowserWorker::SetAsDefaultImpl(
+    const base::Closure& on_finished_callback) {
+  switch (GetDefaultWebClientSetPermission()) {
     case SET_DEFAULT_NOT_ALLOWED:
       NOTREACHED();
       break;
     case SET_DEFAULT_UNATTENDED:
       SetAsDefaultBrowser();
       break;
     case SET_DEFAULT_INTERACTIVE:
-      if (interactive_permitted_)
-        SetAsDefaultBrowserInteractive();
+#if defined(OS_WIN)
+      if (interactive_permitted_) {
+        // The Windows 8 API for choosing the default browser was deprecated on
+        // Windows 10.
+        if (base::win::GetVersion() >= base::win::VERSION_WIN10) {
+          win::SetAsDefaultBrowserUsingSystemSettings(on_finished_callback);
+          return;
+        } else {

[grt (UTC plus 2), 2016/04/12 13:36:44]

nit for the future: omit "else" when the "if" clause ends with "return;":
  if (foo) {
    blorf();
    return;
  }
  // don't put this in an "else" clause:
  spam();

+          win::SetAsDefaultBrowserUsingIntentPicker();
+        }
+      }
+#endif  // defined(OS_WIN)
       break;
   }
+  on_finished_callback.Run();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultProtocolClientWorker
 //
 
 DefaultProtocolClientWorker::DefaultProtocolClientWorker(
     const DefaultWebClientWorkerCallback& callback,
     const std::string& protocol)
     : DefaultWebClientWorker(callback, "DefaultProtocolClient"),
       protocol_(protocol) {}
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultProtocolClientWorker, protected:
 
 DefaultProtocolClientWorker::~DefaultProtocolClientWorker() = default;
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultProtocolClientWorker, private:
 
 DefaultWebClientState DefaultProtocolClientWorker::CheckIsDefaultImpl() {
   return IsDefaultProtocolClient(protocol_);
 }
 
-void DefaultProtocolClientWorker::SetAsDefaultImpl() {
-  switch (CanSetAsDefaultProtocolClient()) {
+void DefaultProtocolClientWorker::SetAsDefaultImpl(
+    const base::Closure& on_finished_callback) {
+  switch (GetDefaultWebClientSetPermission()) {
     case SET_DEFAULT_NOT_ALLOWED:
       // Not allowed, do nothing.
       break;
     case SET_DEFAULT_UNATTENDED:
       SetAsDefaultProtocolClient(protocol_);
       break;
     case SET_DEFAULT_INTERACTIVE:
-      if (interactive_permitted_) {
-        SetAsDefaultProtocolClientInteractive(protocol_);
-      }
+#if defined(OS_WIN)
+      // TODO(pmonette): Implement a working flow for Windows 10.
+      if (interactive_permitted_)
+        win::SetAsDefaultProtocolClientUsingIntentPicker(protocol_);
+#endif  // defined(OS_WIN)
       break;
   }
+  on_finished_callback.Run();
 }
 
 }  // namespace shell_integration