summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/session_service.cc
diff options
context:
space:
mode:
authormarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 20:16:19 +0000
committermarja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 20:16:19 +0000
commit70599542bb4ee6d0182a2d8ab2a7878a8f56bb39 (patch)
treefb70ae8164d3680623a21845e3b555c012f901f4 /chrome/browser/sessions/session_service.cc
parent9c06e96528535ed6717aaece0144d92da7311e0c (diff)
downloadchromium_src-70599542bb4ee6d0182a2d8ab2a7878a8f56bb39.zip
chromium_src-70599542bb4ee6d0182a2d8ab2a7878a8f56bb39.tar.gz
chromium_src-70599542bb4ee6d0182a2d8ab2a7878a8f56bb39.tar.bz2
Fix: enable restoring multiple profiles asynchronously on startup.
Restoring multiple profiles asynchronously at the same time was not possible. This resulted in only some of the needed profiles getting restored when relaunching Chromium after update. BUG=99088 TEST=See bug. Review URL: http://codereview.chromium.org/9141013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/session_service.cc')
-rw-r--r--chrome/browser/sessions/session_service.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index 68c7d67..aad8ae9 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -462,7 +462,7 @@ void SessionService::Init() {
bool SessionService::ShouldNewWindowStartSession() {
if (!has_open_trackable_browsers_ && !BrowserInit::InProcessStartup() &&
- !SessionRestore::IsRestoring()
+ !SessionRestore::IsRestoring(profile())
#if defined(OS_MACOSX)
// OSX has a fairly different idea of application lifetime than the
// other platforms. We need to check that we aren't opening a window