Inactive toast ux changes

chrome/browser/chrome_browser_main.cc

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..cad98e1e8b2083486921b64d9e58e5d7a416f08e 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1559,17 +1559,16 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
         try_chrome_int,
         base::Bind(&ChromeProcessSingleton::SetActiveModalDialog,
                    base::Unretained(process_singleton_.get())));
-    if (answer == TryChromeDialogView::NOT_NOW)
+    if (answer == TryChromeDialogView::NOT_NOW) {

[grt (UTC plus 2), 2017/06/22 20:34:03]

since the NOT_NOW and !OPEN_CHROME branches are the same, combine them like so:
    if (answer != TryChromeDialogView::OPEN_CHROME)
      return chrome::RESULT_CODE_NORMAL_EXIT_CANCEL;
    StartupBrowserCreator::WelcomeBackPage welcome_page =
        TryChromeDialogView::GetWelcomePageForFlavor(try_chrome_int);
    ....

[skare_, 2017/06/22 23:25:17]

Done.

       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();
+    } else if (answer == TryChromeDialogView::OPEN_CHROME) {
+      StartupBrowserCreator::WelcomeBackPage welcome_page =
+          TryChromeDialogView::GetWelcomePageForFlavor(try_chrome_int);
+      if (welcome_page != StartupBrowserCreator::WelcomeBackPage::kNone) {

[grt (UTC plus 2), 2017/06/22 20:34:03]

nit: omit braces here

[skare_, 2017/06/22 23:25:17]

Done.

+        browser_creator_->set_welcome_back_page(welcome_page);
       }
+    } else {
+      return chrome::RESULT_CODE_NORMAL_EXIT_CANCEL;
     }
 #else
     // We don't support retention experiments on Mac or Linux.