Chromium Code Reviews| 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 55fed3bbfc7b0fdde766b7281e554ca23884a91f..c43af6f6dd81f5622fc0760f30587d4207953c69 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( |
| shell_integration::DefaultWebClientUIState state) override; |
| void OnSetAsDefaultConcluded(bool close_chrome) override; |
| - bool IsInteractiveSetDefaultPermitted() override; |
| private: |
| // Handler for the 'Next' (or 'make Chrome the Metro browser') button. |
| @@ -129,8 +128,9 @@ class SetAsDefaultBrowserHandler |
| SetAsDefaultBrowserHandler::SetAsDefaultBrowserHandler( |
| const base::WeakPtr<ResponseDelegate>& response_delegate) |
| - : 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.
|
| set_default_returned_(false), |
| set_default_result_(false), |
| response_delegate_(response_delegate) {} |
| @@ -171,10 +171,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; |