| Index: chrome/browser/ui/webui/options/browser_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| index a9045fff5b0b8ab7fbd54011913c56e0dbdfe3bf..b24e9166caa2b080447d55605c1e9cc91bc7a431 100644
|
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
|
| @@ -186,7 +186,8 @@ BrowserOptionsHandler::BrowserOptionsHandler()
|
| #endif // defined(OS_CHROMEOS)
|
| signin_observer_(this),
|
| weak_ptr_factory_(this) {
|
| - default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(this);
|
| + default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(
|
| + this, /*delete_observer=*/false);
|
|
|
| #if defined(ENABLE_SERVICE_DISCOVERY)
|
| cloud_print_mdns_ui_enabled_ = true;
|
| @@ -1144,10 +1145,6 @@ 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) {
|
| base::StringValue status_string(
|
| l10n_util::GetStringFUTF16(status_string_id,
|
|
|