chrome/browser/profiles/profile_impl.cc - Issue 1332283003: Remove dependency of PrefSyncableService on PrefsTabHelper.

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_impl.cc

Issue 1332283003: Remove dependency of PrefSyncableService on PrefsTabHelper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_service_syncable_util

Patch Set: Pass a list of preferences instead of a callback 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/prefs/pref_service_syncable_util.h ('K') | « chrome/browser/prefs/pref_service_syncable_util.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.cc

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

index 9ee9a804212c0e234fb56b3e86f53960d37a069e..296751fd5c2def5ea57da4783ead8d17d285e0dd 100644

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

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

@@ -52,6 +52,7 @@

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

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

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

+#include "chrome/browser/prefs/pref_service_syncable_util.h"

#include "chrome/browser/prerender/prerender_manager_factory.h"

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

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

@@ -905,8 +906,8 @@ PrefService* ProfileImpl::GetOffTheRecordPrefs() {

if (!otr_prefs_) {

// The new ExtensionPrefStore is ref_counted and the new PrefService

// stores a reference so that we do not leak memory here.

- otr_prefs_.reset(prefs_->CreateIncognitoPrefService(

- CreateExtensionPrefStore(this, true)));

+ otr_prefs_.reset(CreateIncognitoPrefServiceSyncable(

+ prefs_.get(), CreateExtensionPrefStore(this, true)));

}

return otr_prefs_.get();

}