summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 17:23:43 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 17:23:43 +0000
commiteec3bcfa9e92a62fef68293ccbef32b6ef98eea7 (patch)
tree0935285f90235f0303659055197f179fb5d7c23b /chrome/browser/profile.cc
parentfc701137f192ee798ee6d9a41cf11fcb34d218bb (diff)
downloadchromium_src-eec3bcfa9e92a62fef68293ccbef32b6ef98eea7.zip
chromium_src-eec3bcfa9e92a62fef68293ccbef32b6ef98eea7.tar.gz
chromium_src-eec3bcfa9e92a62fef68293ccbef32b6ef98eea7.tar.bz2
Turn on sync for OS X (behind an --enable-sync switch).
Added ProfileSyncService::IsSyncEnabled(). BUG=23073 TEST=manually (OS X),trybot Review URL: http://codereview.chromium.org/389019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
-rw-r--r--chrome/browser/profile.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 59010e6..dd2835e 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -1439,14 +1439,12 @@ void ProfileImpl::StopCreateSessionServiceTimer() {
}
ProfileSyncService* ProfileImpl::GetProfileSyncService() {
-#if !defined(OS_POSIX)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
- if (!sync_service_.get())
- InitSyncService();
- return sync_service_.get();
+ if (!ProfileSyncService::IsSyncEnabled()) {
+ return NULL;
}
-#endif
- return NULL;
+ if (!sync_service_.get())
+ InitSyncService();
+ return sync_service_.get();
}
void ProfileImpl::InitSyncService() {