| 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 b5f272e0f97ac27ea8c3e7f1b406109fd18d6b7d..2ef0580b6c2c51930587a52150084438fbf976b8 100644
|
| --- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| @@ -675,7 +675,8 @@ void BrowserOptionsHandler::CheckAutoLaunchCallback(
|
|
|
| void BrowserOptionsHandler::UpdateDefaultBrowserState() {
|
| // Check for side-by-side first.
|
| - if (!ShellIntegration::CanSetAsDefaultBrowser()) {
|
| + if (ShellIntegration::CanSetAsDefaultBrowser() ==
|
| + ShellIntegration::SET_DEFAULT_NOT_ALLOWED) {
|
| SetDefaultBrowserUIString(IDS_OPTIONS_DEFAULTBROWSER_SXS);
|
| return;
|
| }
|
| @@ -742,6 +743,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,
|
|
|