Support for interactive set-chrome-as-default in Windows.

chrome/browser/ui/webui/options2/browser_options_handler2.cc

Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
index 511af7d71c41dd6e58bee87a65eff60ba406d76a..8810a25b73f9176da2df7a582bc4c76ad4e32691 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
@@ -674,7 +674,8 @@ void BrowserOptionsHandler::CheckAutoLaunchCallback(
 
 void BrowserOptionsHandler::UpdateDefaultBrowserState() {
   // Check for side-by-side first.
-  if (!ShellIntegration::CanSetAsDefaultBrowser()) {
+  if (ShellIntegration::CanSetAsDefaultBrowser() ==
+          ShellIntegration::CHANGE_DEFAULT_NOT_ALLOWED) {
     SetDefaultBrowserUIString(IDS_OPTIONS_DEFAULTBROWSER_SXS);
     return;
   }
@@ -741,6 +742,10 @@ void BrowserOptionsHandler::SetDefaultWebClientUIState(
   SetDefaultBrowserUIString(status_string_id);
 }
 
+bool BrowserOptionsHandler::IsInteractiveSetDefaultPermitted() {
+  return true;  // This is UI so we can allow it.
+}
+
 void BrowserOptionsHandler::SetDefaultBrowserUIString(int status_string_id) {
   scoped_ptr<Value> status_string(Value::CreateStringValue(
       l10n_util::GetStringFUTF16(status_string_id,