Chromium Code Reviews| 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 ea2eb7612b3f8fbbc3de910fe4e757c7c823c31a..10fce61e5d536634710ced98ea7b27582f390989 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 shell_integration::DefaultBrowserWorker(this); |
| + default_browser_worker_ = new shell_integration::DefaultBrowserWorker( |
| + this, /*delete_observer=*/false); |
|
Nico
2016/02/10 17:33:58
ditto
Patrick Monette
2016/02/10 20:44:42
Done.
|
| #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, |