DefaultBrowserWorker now fully supports opening the settings for Win10

chrome/browser/ui/webui/options/browser_options_handler.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/webui/options/browser_options_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 1131 matching lines @@
     shell_integration::DefaultWebClientState state) {
   int status_string_id;
 
   if (state == shell_integration::IS_DEFAULT) {
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
     // Notify the user in the future if Chrome ceases to be the user's chosen
     // default browser.
     PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
     prefs->SetBoolean(prefs::kCheckDefaultBrowser, true);
   } else if (state == shell_integration::NOT_DEFAULT) {
-    if (shell_integration::CanSetAsDefaultBrowser() ==
-        shell_integration::SET_DEFAULT_NOT_ALLOWED) {
+    if (shell_integration::CanSetAsDefaultBrowser()) {
+      status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
+    } else {
       status_string_id = IDS_OPTIONS_DEFAULTBROWSER_SXS;
-    } else {
-      status_string_id = IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
     }
   } else if (state == shell_integration::UNKNOWN_DEFAULT) {
     status_string_id = IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
   } else {
     NOTREACHED();
     return;
   }
 
   SetDefaultBrowserUIString(status_string_id);
 }
@@ skipping 971 matching lines @@
 
 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
 #if defined(OS_CHROMEOS)
   return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
 #else
   return true;
 #endif
 }
 
 }  // namespace options