chrome/browser/profiles/profile_impl.h - Issue 9232011: sync: Make ProfileSyncService a ProfileKeyedService.

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 9232011: sync: Make ProfileSyncService a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: init Created 8 years, 11 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/profiles/profile.h ('K') | « chrome/browser/profiles/profile_dependency_manager.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | chrome/browser/sync/profile_sync_service.h » ('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 1879aacfc18c376f664370deb1d767a5f29e184c..8f6247de578b9fbe239481af345cdcd35ee02f70 100644

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

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

@@ -25,7 +25,7 @@ class ExtensionPrefs;

class ExtensionPrefValueMap;

class NetPrefObserver;

class PrefService;

-class ProfileSyncComponentsFactory;

+class ProfileSyncService;

class PromoResourceService;

class SpeechInputPreferences;

class SpellCheckProfile;

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

virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;

virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() OVERRIDE;

virtual FindBarState* GetFindBarState() OVERRIDE;

- virtual bool HasProfileSyncService() const OVERRIDE;

+ virtual bool HasProfileSyncService() OVERRIDE;

virtual bool DidLastSessionExitCleanly() OVERRIDE;

virtual BookmarkModel* GetBookmarkModel() OVERRIDE;

virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() OVERRIDE;

@@ -128,7 +128,6 @@ class ProfileImpl : public Profile,

virtual ProfileSyncService* GetProfileSyncService() OVERRIDE;

virtual SigninManager* GetSigninManager() OVERRIDE;

virtual TokenService* GetTokenService() OVERRIDE;

- void InitSyncService();

virtual ExtensionInfoMap* GetExtensionInfoMap() OVERRIDE;

virtual PromoCounter* GetInstantPromoCounter() OVERRIDE;

virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;

@@ -248,8 +247,6 @@ class ProfileImpl : public Profile,

scoped_ptr<SigninManager> signin_manager_;

scoped_ptr<TokenService> token_service_;

- scoped_ptr<ProfileSyncComponentsFactory> profile_sync_factory_;

- scoped_ptr<ProfileSyncService> sync_service_;

scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;

@@ -270,7 +267,6 @@ class ProfileImpl : public Profile,

scoped_refptr<WebKitContext> webkit_context_;

scoped_refptr<fileapi::FileSystemContext> file_system_context_;

scoped_refptr<quota::QuotaManager> quota_manager_;

- bool profile_sync_service_created_;

bool history_service_created_;

bool favicon_service_created_;

bool created_web_data_service_;