diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 15:58:08 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 15:58:08 +0000 |
| commit | c9b19949487f406436c9f5cdfdf35ce3bd805d67 (patch) | |
| tree | 0de3a25b34c84b1dcdbd84ae7205ca3a514fec7f /chrome/browser/browser_init.h | |
| parent | fdeb7ac65e407aa5334b6f5308f15be3dae70dd6 (diff) | |
| download | chromium_src-c9b19949487f406436c9f5cdfdf35ce3bd805d67.zip chromium_src-c9b19949487f406436c9f5cdfdf35ce3bd805d67.tar.gz chromium_src-c9b19949487f406436c9f5cdfdf35ce3bd805d67.tar.bz2 | |
Fixes bug where triggering session restore while the browser was
already running would end up creating an extra tab.
BUG=11594
TEST=open chrome with a single tabbed browser, turn on session
restore, navigate to a page with a popup, close the tabbed browser,
create a new window ala control-n (or double click on the desktop),
and make the restored window doesn't end upw
Review URL: http://codereview.chromium.org/1371002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.h')
| -rw-r--r-- | chrome/browser/browser_init.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/browser_init.h b/chrome/browser/browser_init.h index 65d2ca9..2ed6bc7 100644 --- a/chrome/browser/browser_init.h +++ b/chrome/browser/browser_init.h @@ -142,6 +142,14 @@ class BrowserInit { // 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 @@ -153,7 +161,7 @@ class BrowserInit { // // 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. |