chrome/browser/profiles/profile_manager.cc - Issue 6901031: Profile shouldn't own Session/TabRestore services.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 6901031: Profile shouldn't own Session/TabRestore services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase again and hope upload works this time Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index 7011e8ef432431ea20ab76dab25db38589257086..48fecbbfc75b86c7f411243a7e8f44daf166e8f7 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -16,6 +16,7 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/prefs/scoped_user_pref_update.h"

+#include "chrome/browser/sessions/session_service_factory.h"

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/common/chrome_constants.h"

@@ -93,7 +94,7 @@ void ProfileManager::ShutdownSessionServices() {

return;

std::vector<Profile*> profiles(pm->GetLoadedProfiles());

for (size_t i = 0; i < profiles.size(); ++i)

- profiles[i]->ShutdownSessionService();

+ SessionServiceFactory::ShutdownForProfile(profiles[i]);

}

// static