Refactoring startup logic for upcoming FRE changes (non-Win 10).

chrome/browser/ui/startup/startup_browser_creator_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_
 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "chrome/browser/ui/startup/startup_tab.h"
+#include "chrome/browser/ui/startup/startup_tab_provider.h"
 #include "chrome/browser/ui/startup/startup_types.h"
 #include "url/gurl.h"
 
 class Browser;
 class Profile;
 class StartupBrowserCreator;
 
 namespace base {
 class CommandLine;
 class FilePath;
@@ skipping 35 matching lines @@
 
   // Convenience for OpenTabsInBrowser that converts |urls| into a set of
   // Tabs.
   Browser* OpenURLsInBrowser(Browser* browser,
                              bool process_startup,
                              const std::vector<GURL>& urls);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorImplTest, DetermineStartupTabs);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorImplTest,
+                           DetermineStartupTabs_IncognitoOrCrash);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorImplTest,
+                           DetermineStartupTabs_MasterPrefs);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorImplTest,
+                           DetermineStartupTabs_CommandLine);
+  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorImplTest,
+                           DetermineStartupTabs_NewTabPage);
 
   enum class WelcomeRunType {
     NONE,                // Do not inject the welcome page for this run.
     FIRST_TAB,           // Inject the welcome page as the first tab.
     FIRST_RUN_LAST_TAB,  // Inject the welcome page as the last first-run tab.
   };
 
   // Creates a tab for each of the Tabs in |tabs|. If browser is non-null
   // and a tabbed browser, the tabs are added to it. Otherwise a new tabbed
   // browser is created and the tabs are added to it. The browser the tabs
@@ skipping 19 matching lines @@
 
   // Invoked from Launch to handle processing of urls. This may do any of the
   // following:
   // . Invoke ProcessStartupURLs if |process_startup| is true.
   // . If |process_startup| is false, restore the last session if necessary,
   //   or invoke ProcessSpecifiedURLs.
   // . Open the urls directly.
   void ProcessLaunchURLs(bool process_startup,
                          const std::vector<GURL>& urls_to_open);
 
+  // Determines the URLs to be shown at startup by way of various policies
+  // (onboarding, pinned tabs, etc.), determines whether a session restore
+  // is necessary, and opens the URLs in a new or restored browser accordingly.
+  // This method is a refactoring of ProcessLaunchURLs above, and will replace
+  // that code path entirely once kUseConsolidatedStartupFlow is on by default.

[Peter Kasting, 2016/09/29 07:23:34]

Nit: For this last sentence, consider instead putting a TODO at the end of the
ProcessLaunchURLs comment saying something like: "Under the
kUseConsolidatedStartupFlow feature, this is replaced by
ProcessLaunchUrlsUsingConsolidatedFlow() below.  TODO(...): Enable that feature
by default and remove this."

+  void ProcessLaunchUrlsUsingConsolidatedFlow(
+      bool process_startup,
+      const std::vector<GURL>& cmd_line_urls);
+
+  // Returns the tabs to be shown on startup, based on the policy functions in
+  // the given StartupTabProvider, the given tabs passed by the command line,
+  // and the interactions between those policies.
+  StartupTabs DetermineStartupTabs(const StartupTabProvider& provider,
+                                   const StartupTabs& cmd_line_tabs,
+                                   bool is_incognito,
+                                   bool is_post_crash_launch);
+
+  // Opens the given tabs in a new browser.

[Peter Kasting, 2016/09/29 07:23:34]

Nit: It's not clear from this comment how this is intended to be different than
OpenTabsInBrowser().

Maybe for now don't add it, until later you have more functionality to put in
which makes the need for a new function clear?

+  // TODO(tmartino): Add the ability to restore a session, and an additional
+  // argument which indicates which behavior (new or restored) should be used.
+  Browser* RestoreOrCreateBrowser(bool process_startup,
+                                  const StartupTabs& tabs);
+
   // Does the following:
   // . If the user's startup pref is to restore the last session (or the
   //   command line flag is present to force using last session), it is
   //   restored.
   // . Otherwise invoke ProcessSpecifiedURLs
   // If a browser was created, true is returned.  Otherwise returns false and
   // the caller must create a new browser.
   bool ProcessStartupURLs(const std::vector<GURL>& urls_to_open);
 
   // Invoked from either ProcessLaunchURLs or ProcessStartupURLs to handle
@@ skipping 39 matching lines @@
   const base::FilePath cur_dir_;
   const base::CommandLine& command_line_;
   Profile* profile_;
   StartupBrowserCreator* browser_creator_;
   bool is_first_run_;
   WelcomeRunType welcome_run_type_;
   DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreatorImpl);
 };
 
 #endif  // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_