Inactive toast ux changes

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 1541 matching lines @@
     // Setup.exe has determined that we need to run a retention experiment
     // and has lauched chrome to show the experiment UI. It is guaranteed that
     // no other Chrome is currently running as the process singleton was
     // successfully grabbed above.
     int try_chrome_int;
     base::StringToInt(try_chrome, &try_chrome_int);
     TryChromeDialogView::Result answer = TryChromeDialogView::Show(
         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.
     return content::RESULT_CODE_NORMAL_EXIT;
 #endif  // defined(OS_WIN)
   }
 
 #if defined(OS_WIN)
   // Do the tasks if chrome has been upgraded while it was last running.
   if (!already_running && upgrade_util::DoUpgradeTasks(parsed_command_line()))
@@ skipping 471 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }