chrome/browser/content_settings/cookie_settings.cc - Issue 12330073: Disable ProfileKeyedServices on import process by default.

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/content_settings/cookie_settings.cc

Issue 12330073: Disable ProfileKeyedServices on import process by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to ToT Created 7 years, 9 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/content_settings/cookie_settings.cc

diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc

index e34a56e9a1922a7fb0e6c7dd18394459eef7740c..66d3b6a66ea42e2694f01cda81933cf816752aac 100644

--- a/chrome/browser/content_settings/cookie_settings.cc

+++ b/chrome/browser/content_settings/cookie_settings.cc

@@ -76,6 +76,10 @@ bool CookieSettings::Factory::ServiceRedirectedInIncognito() const {

return true;

}

+bool CookieSettings::Factory::ServiceIsNULLOnImportProcess() const {

+ return false;

scoped_refptr<RefcountedProfileKeyedService>

CookieSettings::Factory::BuildServiceInstanceFor(Profile* profile) const {

return new CookieSettings(profile->GetHostContentSettingsMap(),