chrome/browser/sync/glue/session_model_associator.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/sync/glue/session_model_associator.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/sync/glue/session_model_associator.cc

diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc

index d737d99d7f86cab3548728b9d6e49b5269bde17e..1244508d25521150968969c56df884e99340d82d 100644

--- a/chrome/browser/sync/glue/session_model_associator.cc

+++ b/chrome/browser/sync/glue/session_model_associator.cc

@@ -10,6 +10,7 @@

#include "base/logging.h"

#include "chrome/browser/extensions/extension_tab_helper.h"

#include "chrome/browser/profiles/profile.h"

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

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

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

#include "chrome/browser/tabs/tab_strip_model.h"

@@ -851,7 +852,8 @@ SessionService* SessionModelAssociator::GetSessionService() {

DCHECK(sync_service_);

Profile* profile = sync_service_->profile();

DCHECK(profile);

- SessionService* sessions_service = profile->GetSessionService();

+ SessionService* sessions_service =

+ SessionServiceFactory::GetForProfile(profile);

DCHECK(sessions_service);

return sessions_service;

}