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"
@@ skipping 27 matching lines @@
 
 const struct AppModeInfo* gAppModeInfo = nullptr;
 
 }  // namespace
 
 #if !defined(OS_WIN)
 bool SetAsDefaultBrowserInteractive() {
   return false;
 }
 
+void SetAsDefaultBrowserUsingSystemSettings(
+    base::Closure on_finished_callback) {
+  NOTREACHED();
+}

[grt (UTC plus 2), 2016/03/29 16:45:02]

should this also:
  on_finished_callback.Run();
since the fn is described as unconditionally running the callback once?

[Patrick Monette, 2016/03/29 17:43:08]

Done.

+
 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();
 }
@@ skipping 122 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() {
+void DefaultBrowserWorker::SetAsDefaultImpl(
+    base::Closure on_finished_callback) {
   switch (CanSetAsDefaultBrowser()) {
     case SET_DEFAULT_NOT_ALLOWED:
       NOTREACHED();
       break;
     case SET_DEFAULT_UNATTENDED:
       SetAsDefaultBrowser();
       break;
     case SET_DEFAULT_INTERACTIVE:
       if (interactive_permitted_)
         SetAsDefaultBrowserInteractive();
       break;
+#if defined(OS_WIN)

[grt (UTC plus 2), 2016/03/29 16:45:02]

can this not be removed? i think it's nice to reduce the compile-time
conditionals to the extent possible.

[Patrick Monette, 2016/03/29 17:43:08]

Done.

+    case SET_DEFAULT_OPEN_SETTINGS:
+      if (interactive_permitted_) {
+        SetAsDefaultBrowserUsingSystemSettings(on_finished_callback);
+        return;
+      }
+#endif  // defined(OS_WIN)
   }
+  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() {
+void DefaultProtocolClientWorker::SetAsDefaultImpl(
+    base::Closure on_finished_callback) {
   switch (CanSetAsDefaultProtocolClient()) {
     case SET_DEFAULT_NOT_ALLOWED:
       // Not allowed, do nothing.
       break;
     case SET_DEFAULT_UNATTENDED:
       SetAsDefaultProtocolClient(protocol_);
       break;
     case SET_DEFAULT_INTERACTIVE:
-      if (interactive_permitted_) {
+#if defined(OS_WIN)
+    case SET_DEFAULT_OPEN_SETTINGS:
+// TODO(pmonette): Implement this for Windows 10.
+#endif  // defined(OS_WIN)
+      if (interactive_permitted_)
         SetAsDefaultProtocolClientInteractive(protocol_);
-      }
       break;
   }
+  on_finished_callback.Run();
 }
 
 }  // namespace shell_integration