Fixes bug where triggering session restore while the browser was...

chrome/browser/browser_init.h

 // Copyright (c) 2006-2008 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_BROWSER_INIT_H_
 #define CHROME_BROWSER_BROWSER_INIT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 124 matching lines @@
     // If the process was launched with the web application command line flags,
     // e.g. --app=http://www.google.com/ or --app_id=... return true.
     // In this case |app_url| or |app_id| are populated if they're non-null.
     bool IsAppLaunch(std::string* app_url, std::string* app_id);
 
     // If IsAppLaunch is true, tries to open an application window.
     // If the app is specified to start in a tab, or IsAppLaunch is false,
     // returns false to specify default processing.
     bool OpenApplicationWindow(Profile* profile);
 
+    // Invoked from OpenURLsInBrowser to handle processing of urls. This may
+    // do any of the following:
+    // . Invoke ProcessStartupURLs if |process_startup| is true.
+    // . Restore the last session if necessary.
+    // . Open the urls directly.
+    void ProcessLaunchURLs(bool process_startup,
+                           const std::vector<GURL>& urls_to_open);
+
     // 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, and true is returned.
     // . Attempts to restore any pinned tabs from last run of chrome and:
     //   . If urls_to_open is non-empty, they are opened and true is returned.
     //   . If the user's startup pref is to launch a specific set of URLs they
     //     are opened.
     //
     // Otherwise false is returned, which indicates the caller must create a
     // new browser.
-    bool OpenStartupURLs(const std::vector<GURL>& urls_to_open);
+    bool ProcessStartupURLs(const std::vector<GURL>& urls_to_open);
 
     // If the last session didn't exit cleanly and tab is a web contents tab,
     // an infobar is added allowing the user to restore the last session.
     void AddCrashedInfoBarIfNecessary(TabContents* tab);
 
     // Returns the list of URLs to open from the command line. The returned
     // vector is empty if the user didn't specify any URLs on the command line.
     std::vector<GURL> GetURLsFromCommandLine(Profile* profile);
 
     // Adds additional startup URLs to the specified vector.
@@ skipping 16 matching lines @@
                                  bool process_startup, Profile* profile,
                                  int* return_code, BrowserInit* browser_init);
 
   // Additional tabs to open during first run.
   std::vector<GURL> first_run_tabs_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInit);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_INIT_H_