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.cc | |
| 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.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index bde1736..0f7b25f 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1007,7 +1007,12 @@ void Browser::Stop() { void Browser::NewWindow() { UserMetrics::RecordAction(UserMetricsAction("NewWindow"), profile_); - Browser::OpenEmptyWindow(profile_->GetOriginalProfile()); + SessionService* session_service = + profile_->GetOriginalProfile()->GetSessionService(); + if (!session_service || + !session_service->RestoreIfNecessary(std::vector<GURL>())) { + Browser::OpenEmptyWindow(profile_->GetOriginalProfile()); + } } void Browser::NewIncognitoWindow() { |