chrome/browser/sessions/tab_restore_service_factory.cc - Issue 1309363007: [sessions] Remove most knowledge of //chrome from core tab restore code

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/sessions/tab_restore_service_factory.cc

Issue 1309363007: [sessions] Remove most knowledge of //chrome from core tab restore code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tab_restore_service_client

Patch Set: Self-review Created 5 years, 3 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/sessions/chrome_tab_restore_service_client.h ('K') | « chrome/browser/sessions/persistent_tab_restore_service.cc ('k') | chrome/browser/sessions/tab_restore_service_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/tab_restore_service_factory.cc

diff --git a/chrome/browser/sessions/tab_restore_service_factory.cc b/chrome/browser/sessions/tab_restore_service_factory.cc

index a0d5db400d9353f16cf4023697bbf0c1584fda28..6d3e4c4f20d5d9ed2183e43419b1a9c359d88a3f 100644

--- a/chrome/browser/sessions/tab_restore_service_factory.cc

+++ b/chrome/browser/sessions/tab_restore_service_factory.cc

@@ -54,11 +54,12 @@ bool TabRestoreServiceFactory::ServiceIsNULLWhileTesting() const {

KeyedService* TabRestoreServiceFactory::BuildServiceInstanceFor(

content::BrowserContext* browser_context) const {

Profile* profile = Profile::FromBrowserContext(browser_context);

+ DCHECK(!profile->IsOffTheRecord());

scoped_ptr<sessions::TabRestoreServiceClient> client(

new ChromeTabRestoreServiceClient(profile));

#if defined(OS_ANDROID)

- return new InMemoryTabRestoreService(profile, nullptr);

+ return new InMemoryTabRestoreService(profile, client.Pass(), nullptr);

#else

return new PersistentTabRestoreService(profile, client.Pass(), nullptr);

#endif