diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 20:27:35 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 20:27:35 +0000 |
| commit | fecda6f15c2eb26abce8a2dacfb400dbce1d1374 (patch) | |
| tree | 40643cf5940eb368c3be11809e9776b24650b78d /chrome/browser/sync | |
| parent | 467c8f56e084434b74a9c11a45872be6a8f8736e (diff) | |
| download | chromium_src-fecda6f15c2eb26abce8a2dacfb400dbce1d1374.zip chromium_src-fecda6f15c2eb26abce8a2dacfb400dbce1d1374.tar.gz chromium_src-fecda6f15c2eb26abce8a2dacfb400dbce1d1374.tar.bz2 | |
Revert 33318 - Enable sync by default on all platforms.
BUG=23073
TEST=ran without enablesync on OS X, made sure sync UI was still present
Review URL: http://codereview.chromium.org/438005
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/455008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index ca95b97..d380578 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -425,9 +425,11 @@ void ProfileSyncService::SyncEvent(SyncEventCodes code) { } bool ProfileSyncService::IsSyncEnabled() { - // We have switches::kEnableSync just in case we need to change back to - // sync-disabled-by-default on a platform. +#if defined(OS_POSIX) + return CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync); +#else return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync); +#endif } bool ProfileSyncService::ShouldPushChanges() { |