| Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
|
| diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
|
| index ca0e97f30fbaaa825636fa2f1402f35c8b84857b..5c18480453eea743676803b42a11725703969707 100644
|
| --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
|
| +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
|
| @@ -362,8 +362,15 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
|
| if (process_startup) {
|
| if (browser_defaults::kOSSupportsOtherBrowsers &&
|
| !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
|
| - if (!chrome::ShowAutolaunchPrompt(profile))
|
| + // Generally, the default browser prompt should not be shown on first
|
| + // run. However, when the set-as-default dialog has been suppressed, we
|
| + // need to allow it.
|
| + if ((!is_first_run_ ||
|
| + (browser_creator_ &&
|
| + browser_creator_->is_default_browser_dialog_suppressed())) &&
|
| + !chrome::ShowAutolaunchPrompt(profile)) {
|
| chrome::ShowDefaultBrowserPrompt(profile);
|
| + }
|
| }
|
| #if defined(OS_MACOSX)
|
| // Check whether the auto-update system needs to be promoted from user
|
|
|