DefaultBrowserWorker now fully supports opening the settings for Win10

chrome/browser/shell_integration.h

 // 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.
 
 #ifndef CHROME_BROWSER_SHELL_INTEGRATION_H_
 #define CHROME_BROWSER_SHELL_INTEGRATION_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 16 matching lines @@
 bool SetAsDefaultBrowser();
 
 // Initiates an OS shell flow which (if followed by the user) should set
 // Chrome as the default browser. Returns false if the flow cannot be
 // initialized, if it is not supported (introduced for Windows 8) or if the
 // user cancels the operation. This is a blocking call and requires a FILE
 // thread. If Chrome is already default browser, no interactive dialog will be
 // shown and this method returns true.
 bool SetAsDefaultBrowserInteractive();
 
+// Initiates the interaction with the system settings for the default browser.
+// The function takes care of making sure |on_finished_callback| will get called
+// exactly once when the interaction is finished.
+void SetAsDefaultBrowserUsingSystemSettings(base::Closure on_finished_callback);

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

nit: pass callbacks by const-ref

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

Done.

+
 // Sets Chrome as the default client application for the given protocol
 // (only for the current user). Returns false if this operation fails.
 bool SetAsDefaultProtocolClient(const std::string& protocol);
 
 // Initiates an OS shell flow which (if followed by the user) should set
 // Chrome as the default handler for |protocol|. Returns false if the flow
 // cannot be initialized, if it is not supported (introduced for Windows 8)
 // or if the user cancels the operation. This is a blocking call and requires
 // a FILE thread. If Chrome is already default for |protocol|, no interactive
 // dialog will be shown and this method returns true.
 bool SetAsDefaultProtocolClientInteractive(const std::string& protocol);
 
 // Windows 8 and Windows 10 introduced different ways to set the default
 // browser.
 enum DefaultWebClientSetPermission {
   // The browser distribution is not permitted to be made default.
   SET_DEFAULT_NOT_ALLOWED,
   // No special permission or interaction is required to set the default
   // browser. This is used in Linux, Mac and Windows 7 and under.
   SET_DEFAULT_UNATTENDED,
   // On Windows 8, a browser can be made default only in an interactive flow.
   SET_DEFAULT_INTERACTIVE,
+  // On Windows 10+, the system settings page for default apps is opened.
+  SET_DEFAULT_OPEN_SETTINGS,
 };
 
 // Returns requirements for making the running browser the user's default.
 DefaultWebClientSetPermission CanSetAsDefaultBrowser();
 
 // Returns requirements for making the running browser the user's default
 // client application for specific protocols.
 DefaultWebClientSetPermission CanSetAsDefaultProtocolClient();
 
 // Returns true if making the running browser the default client for any
@@ skipping 156 matching lines @@
   // Checks whether Chrome is the default web client. Always called on the
   // FILE thread. When |is_following_set_as_default| is true, The default state
   // will be reported to UMA as the result of the set-as-default operation.
   void CheckIsDefault(bool is_following_set_as_default);
 
   // Sets Chrome as the default web client. Always called on the FILE thread.
   void SetAsDefault();
 
   // Implementation of CheckIsDefault() and SetAsDefault() for subclasses.
   virtual DefaultWebClientState CheckIsDefaultImpl() = 0;
-  virtual void SetAsDefaultImpl() = 0;
+
+  // Subclasses MUST make sure the callback is executed.
+  virtual void SetAsDefaultImpl(base::Closure on_finished_callback) = 0;
 
   // Reports the result for the set-as-default operation.
   void ReportSetDefaultResult(DefaultWebClientState state);
 
   // Updates the UI in our associated view with the current default web
   // client state.
   void UpdateUI(DefaultWebClientState state);
 
   // Called with the default state after the worker is done.
   DefaultWebClientWorkerCallback callback_;
@@ skipping 15 matching lines @@
  public:
   explicit DefaultBrowserWorker(const DefaultWebClientWorkerCallback& callback);
 
  private:
   ~DefaultBrowserWorker() override;
 
   // Check if Chrome is the default browser.
   DefaultWebClientState CheckIsDefaultImpl() override;
 
   // Set Chrome as the default browser.
-  void SetAsDefaultImpl() override;
+  void SetAsDefaultImpl(base::Closure on_finished_callback) override;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultBrowserWorker);
 };
 
 // Worker for checking and setting the default client application
 // for a given protocol. A different worker instance is needed for each
 // protocol you are interested in, so to check or set the default for
 // multiple protocols you should use multiple worker objects.
 class DefaultProtocolClientWorker : public DefaultWebClientWorker {
  public:
   DefaultProtocolClientWorker(const DefaultWebClientWorkerCallback& callback,
                               const std::string& protocol);
 
   const std::string& protocol() const { return protocol_; }
 
  protected:
   ~DefaultProtocolClientWorker() override;
 
  private:
   // Check if Chrome is the default handler for this protocol.
   DefaultWebClientState CheckIsDefaultImpl() override;
 
   // Set Chrome as the default handler for this protocol.
-  void SetAsDefaultImpl() override;
+  void SetAsDefaultImpl(base::Closure on_finished_callback) override;
 
   std::string protocol_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultProtocolClientWorker);
 };
 
 }  // namespace shell_integration
 
 #endif  // CHROME_BROWSER_SHELL_INTEGRATION_H_