chrome/browser/profiles/off_the_record_profile_impl.h - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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.h

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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/profiles/off_the_record_profile_impl.h

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

index 0bc937e1d8402cb4d499182a91d0eaf30115f584..c26b3d3aabf66ebdce7e64cc4df613fc1e08a106 100644

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

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

@@ -16,6 +16,8 @@

using base::Time;

using base::TimeDelta;

+class PrefServiceSyncable;

////////////////////////////////////////////////////////////////////////////////

// OffTheRecordProfileImpl is a profile subclass that wraps an existing profile

@@ -43,8 +45,8 @@ class OffTheRecordProfileImpl : public Profile {

virtual policy::ManagedModePolicyProvider*

GetManagedModePolicyProvider() OVERRIDE;

virtual policy::PolicyService* GetPolicyService() OVERRIDE;

- virtual PrefServiceSyncable* GetPrefs() OVERRIDE;

- virtual PrefServiceSyncable* GetOffTheRecordPrefs() OVERRIDE;

+ virtual PrefService* GetPrefs() OVERRIDE;

+ virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;

virtual net::URLRequestContextGetter*

GetRequestContextForExtensions() OVERRIDE;

virtual net::URLRequestContextGetter* CreateRequestContext(