| Index: chrome/browser/ui/webui/set_as_default_browser_ui.cc
|
| diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
|
| index 0512b99cde1131b19f99b3e05a183fdc85961b0b..fdf5b7b641ec4162781a111df45ef4171c04e763 100644
|
| --- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc
|
| +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
|
| @@ -109,7 +109,6 @@ class SetAsDefaultBrowserHandler
|
| void SetDefaultWebClientUIState(
|
| ShellIntegration::DefaultWebClientUIState state) override;
|
| void OnSetAsDefaultConcluded(bool close_chrome) override;
|
| - bool IsInteractiveSetDefaultPermitted() override;
|
|
|
| private:
|
| // Handler for the 'Next' (or 'make Chrome the Metro browser') button.
|
| @@ -128,10 +127,11 @@ class SetAsDefaultBrowserHandler
|
|
|
| SetAsDefaultBrowserHandler::SetAsDefaultBrowserHandler(
|
| const base::WeakPtr<ResponseDelegate>& response_delegate)
|
| - : default_browser_worker_(new ShellIntegration::DefaultBrowserWorker(this)),
|
| - set_default_returned_(false), set_default_result_(false),
|
| - response_delegate_(response_delegate) {
|
| -}
|
| + : default_browser_worker_(
|
| + new ShellIntegration::DefaultBrowserWorker(this, false, true)),
|
| + set_default_returned_(false),
|
| + set_default_result_(false),
|
| + response_delegate_(response_delegate) {}
|
|
|
| SetAsDefaultBrowserHandler::~SetAsDefaultBrowserHandler() {
|
| default_browser_worker_->ObserverDestroyed();
|
| @@ -169,10 +169,6 @@ void SetAsDefaultBrowserHandler::OnSetAsDefaultConcluded(bool call_result) {
|
| set_default_result_ = call_result;
|
| }
|
|
|
| -bool SetAsDefaultBrowserHandler::IsInteractiveSetDefaultPermitted() {
|
| - return true;
|
| -}
|
| -
|
| void SetAsDefaultBrowserHandler::HandleLaunchSetDefaultBrowserFlow(
|
| const base::ListValue* args) {
|
| set_default_returned_ = false;
|
|
|