chrome/browser/profiles/profile_impl.h - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and 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/profile_impl.h

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, use pure builder pattern. Created 8 years 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_simple.cc ('K') | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | chrome/browser/ui/browser_ui_prefs.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.h

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

index 88021c03cc1777804f3f388d67d11096ada2009d..e461908c7ec75cd36cccdd5b44e68726c36bce5c 100644

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

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

@@ -21,7 +21,7 @@

#include "content/public/browser/notification_registrar.h"

class NetPrefObserver;

-class PrefService;

+class PrefServiceSyncable;

class PrefServiceBase;

class PromoResourceService;

class SSLConfigServiceManager;

@@ -59,7 +59,7 @@ class ProfileImpl : public Profile,

virtual ~ProfileImpl();

- static void RegisterUserPrefs(PrefService* prefs);

+ static void RegisterUserPrefs(PrefServiceSyncable* prefs);

// content::BrowserContext implementation:

virtual FilePath GetPath() OVERRIDE;

@@ -102,8 +102,8 @@ class ProfileImpl : public Profile,

virtual policy::ManagedModePolicyProvider*

GetManagedModePolicyProvider() OVERRIDE;

virtual policy::PolicyService* GetPolicyService() OVERRIDE;

- virtual PrefService* GetPrefs() OVERRIDE;

- virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;

+ virtual PrefServiceSyncable* GetPrefs() OVERRIDE;

+ virtual PrefServiceSyncable* GetOffTheRecordPrefs() OVERRIDE;

virtual net::URLRequestContextGetter*

GetRequestContextForExtensions() OVERRIDE;

virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;

@@ -222,8 +222,8 @@ class ProfileImpl : public Profile,

// Keep |prefs_| on top for destruction order because |extension_prefs_|,

// |net_pref_observer_|, |promo_resource_service_|, |io_data_| an others store

// pointers to |prefs_| and shall be destructed first.

- scoped_ptr<PrefService> prefs_;

- scoped_ptr<PrefService> otr_prefs_;

+ scoped_ptr<PrefServiceSyncable> prefs_;

+ scoped_ptr<PrefServiceSyncable> otr_prefs_;

ProfileImplIOData::Handle io_data_;

scoped_refptr<ExtensionSpecialStoragePolicy>

extension_special_storage_policy_;

« chrome/browser/prefs/pref_service_simple.cc ('K') | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | chrome/browser/ui/browser_ui_prefs.cc » ('J')