| Index: chrome/browser/ui/startup/default_browser_prompt.cc
|
| diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc
|
| index b5710ea423076d36e0dc4251987a8857b1303102..390f2387445cb5b59440091d5db0c578e3682def 100644
|
| --- a/chrome/browser/ui/startup/default_browser_prompt.cc
|
| +++ b/chrome/browser/ui/startup/default_browser_prompt.cc
|
| @@ -177,7 +177,7 @@ bool DefaultBrowserInfoBarDelegate::Accept() {
|
| InfoBarUserInteraction::START_SET_AS_DEFAULT,
|
| NUM_INFO_BAR_USER_INTERACTION_TYPES);
|
| scoped_refptr<ShellIntegration::DefaultBrowserWorker>(
|
| - new ShellIntegration::DefaultBrowserWorker(nullptr))
|
| + new ShellIntegration::DefaultBrowserWorker(nullptr, false, true))
|
| ->StartSetAsDefault();
|
| return true;
|
| }
|
| @@ -209,7 +209,6 @@ class CheckDefaultBrowserObserver
|
| private:
|
| void SetDefaultWebClientUIState(
|
| ShellIntegration::DefaultWebClientUIState state) override;
|
| - bool IsOwnedByWorker() override;
|
|
|
| void ResetCheckDefaultBrowserPref();
|
| void ShowPrompt();
|
| @@ -247,11 +246,6 @@ void CheckDefaultBrowserObserver::SetDefaultWebClientUIState(
|
| }
|
| }
|
|
|
| -bool CheckDefaultBrowserObserver::IsOwnedByWorker() {
|
| - // Instruct the DefaultBrowserWorker to delete this instance when it is done.
|
| - return true;
|
| -}
|
| -
|
| void CheckDefaultBrowserObserver::ResetCheckDefaultBrowserPref() {
|
| Profile* profile =
|
| g_browser_process->profile_manager()->GetProfileByPath(profile_path_);
|
| @@ -323,7 +317,8 @@ void ShowDefaultBrowserPrompt(Profile* profile, HostDesktopType desktop_type) {
|
| scoped_refptr<ShellIntegration::DefaultBrowserWorker>(
|
| new ShellIntegration::DefaultBrowserWorker(
|
| new CheckDefaultBrowserObserver(profile->GetPath(), show_prompt,
|
| - desktop_type)))
|
| + desktop_type),
|
| + true, false))
|
| ->StartCheckIsDefault();
|
| }
|
|
|
|
|