Fix registerProtocolHandler implementation on Windows 8 and 10.

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"
+#include "chrome/installer/util/shell_util.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;
 
@@ skipping 197 matching lines @@
   switch (GetDefaultWebClientSetPermission()) {
     case SET_DEFAULT_NOT_ALLOWED:
       NOTREACHED();
       break;
     case SET_DEFAULT_UNATTENDED:
       SetAsDefaultBrowser();
       break;
     case SET_DEFAULT_INTERACTIVE:
 #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 {
-          win::SetAsDefaultBrowserUsingIntentPicker();
+        switch (ShellUtil::GetInteractiveSetDefaultMode()) {
+          case ShellUtil::INTENT_PICKER:
+            win::SetAsDefaultBrowserUsingIntentPicker();
+            break;
+          case ShellUtil::SYSTEM_SETTINGS:
+            win::SetAsDefaultBrowserUsingSystemSettings(on_finished_callback);
+            // Early return because the function above takes care of calling
+            // |on_finished_callback|.
+            return;
         }
       }
 #endif  // defined(OS_WIN)
       break;
   }
   on_finished_callback.Run();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultProtocolClientWorker
@@ skipping 21 matching lines @@
     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 defined(OS_WIN)
-      // TODO(pmonette): Implement a working flow for Windows 10.
-      if (interactive_permitted_)
-        win::SetAsDefaultProtocolClientUsingIntentPicker(protocol_);
+      if (interactive_permitted_) {
+        switch (ShellUtil::GetInteractiveSetDefaultMode()) {
+          case ShellUtil::INTENT_PICKER:
+            win::SetAsDefaultProtocolClientUsingIntentPicker(protocol_);
+            break;
+          case ShellUtil::SYSTEM_SETTINGS:
+            win::SetAsDefaultProtocolClientUsingSystemSettings(
+                protocol_, on_finished_callback);
+            // Early return because the function above takes care of calling
+            // |on_finished_callback|.
+            return;
+        }
+      }
 #endif  // defined(OS_WIN)
       break;
   }
   on_finished_callback.Run();
 }
 
 }  // namespace shell_integration