summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.cc
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-10 01:09:44 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-10 01:09:44 +0000
commit7367f1a6c69a9305795d3ab953ac197d43b58d52 (patch)
tree76326f0c19a4dde6d4a09a1735d5ffab83f7b6be /chrome/browser/profile.cc
parent0a93894b92023e9ef211f106aa1080ad96fc12ca (diff)
downloadchromium_src-7367f1a6c69a9305795d3ab953ac197d43b58d52.zip
chromium_src-7367f1a6c69a9305795d3ab953ac197d43b58d52.tar.gz
chromium_src-7367f1a6c69a9305795d3ab953ac197d43b58d52.tar.bz2
Revert r28645 - "Render sync code inactive..."
Vive le sync! Review URL: http://codereview.chromium.org/269044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
-rw-r--r--chrome/browser/profile.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 3cf0025..4508644 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -1382,6 +1382,13 @@ void ProfileImpl::StopCreateSessionServiceTimer() {
}
ProfileSyncService* ProfileImpl::GetProfileSyncService() {
+#ifdef CHROME_PERSONALIZATION
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
+ if (!sync_service_.get())
+ InitSyncService();
+ return sync_service_.get();
+ }
+#endif
return NULL;
}