chrome/browser/profiles/off_the_record_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/off_the_record_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: Fixing ChromeOS and Linux compilation 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

Index: chrome/browser/profiles/off_the_record_profile_impl.cc

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

index 6ef47040465b1fcb5841fffc7cbe2b0507c604e9..ed8dbfb0652f14df170fddaad06485f650a7887c 100644

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

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

@@ -29,6 +29,7 @@

#include "chrome/browser/plugins/plugin_prefs.h"

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

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

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

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

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

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

@@ -111,7 +112,7 @@ void NotifyOTRProfileDestroyedOnIOThread(void* original_profile,

OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile)

: profile_(real_profile),

- prefs_(PrefServiceSyncable::IncognitoFromProfile(real_profile)),

+ prefs_(PrefServiceSyncableIncognitoFromProfile(real_profile)),

start_time_(Time::Now()) {

// Register on BrowserContext.

user_prefs::UserPrefs::Set(this, prefs_);

« no previous file with comments | « chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc ('k') | chrome/browser/sync/chrome_sync_client.cc » ('j') | no next file with comments »