Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index efc1b8e338b7120a7913baba562751e3699a6976..321587590786190595e27fcc50fe053f1ee0eef2 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -1555,22 +1555,17 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { |
// successfully grabbed above. |
int try_chrome_int; |
base::StringToInt(try_chrome, &try_chrome_int); |
+ StartupBrowserCreator::WelcomeBackPage welcome_page = |
+ StartupBrowserCreator::WelcomeBackPage::kNone; |
TryChromeDialogView::Result answer = TryChromeDialogView::Show( |
try_chrome_int, |
base::Bind(&ChromeProcessSingleton::SetActiveModalDialog, |
- base::Unretained(process_singleton_.get()))); |
- if (answer == TryChromeDialogView::NOT_NOW) |
+ base::Unretained(process_singleton_.get())), |
+ &welcome_page); |
+ if (answer != TryChromeDialogView::OPEN_CHROME) |
return chrome::RESULT_CODE_NORMAL_EXIT_CANCEL; |
- if (answer == TryChromeDialogView::UNINSTALL_CHROME) |
- return chrome::RESULT_CODE_NORMAL_EXIT_EXP2; |
- // At this point the user is willing to try chrome again. |
- if (answer == TryChromeDialogView::TRY_CHROME_AS_DEFAULT) { |
- // Only set in the unattended case. This is not true on Windows 8+. |
- if (shell_integration::GetDefaultWebClientSetPermission() == |
- shell_integration::SET_DEFAULT_UNATTENDED) { |
- shell_integration::SetAsDefaultBrowser(); |
- } |
- } |
+ if (welcome_page != StartupBrowserCreator::WelcomeBackPage::kNone) |
+ browser_creator_->set_welcome_back_page(welcome_page); |
#else |
// We don't support retention experiments on Mac or Linux. |
return content::RESULT_CODE_NORMAL_EXIT; |