chrome/browser/profiles/profile_impl.cc - Issue 1326353002: Remove dependency of PrefSyncableService on Profile.

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 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator

Patch Set: Move files back to //chrome/browser/prefs & //chrome/test/base 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.h ('K') | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/sync/chrome_sync_client.cc » ('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 e33838499534168fe9ff238dda5412f7403ebae3..23e5722ab661e73b0f4e8d713e748c4203e885cd 100644

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

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

@@ -68,6 +68,7 @@

#include "chrome/browser/signin/signin_ui_util.h"

#include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"

#include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"

+#include "chrome/browser/ui/prefs/prefs_tab_helper.h"

#include "chrome/browser/ui/startup/startup_browser_creator.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths_internal.h"

@@ -909,7 +910,8 @@ PrefService* ProfileImpl::GetOffTheRecordPrefs() {

// 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)));

+ CreateExtensionPrefStore(this, true),

+ base::Bind(&PrefsTabHelper::InitIncognitoUserPrefStore)));

}

return otr_prefs_.get();

}