summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-30 20:09:39 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-30 20:09:39 +0000
commitcd70bdff829e7587d889824841f808425772a29e (patch)
treecb7e0d65d2eb6b7b05ebee0842a43fe97308f374 /chrome
parent6df3e0f4b3be9010be6f13950bc5846134e8ccc9 (diff)
downloadchromium_src-cd70bdff829e7587d889824841f808425772a29e.zip
chromium_src-cd70bdff829e7587d889824841f808425772a29e.tar.gz
chromium_src-cd70bdff829e7587d889824841f808425772a29e.tar.bz2
Enable sync by default on all platforms.
BUG=23073 TEST=ran without --enable-sync on OS X, made sure sync UI was still present Review URL: http://codereview.chromium.org/438005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/sync/profile_sync_service.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index d380578..ca95b97 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -425,11 +425,9 @@ void ProfileSyncService::SyncEvent(SyncEventCodes code) {
}
bool ProfileSyncService::IsSyncEnabled() {
-#if defined(OS_POSIX)
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync);
-#else
+ // We have switches::kEnableSync just in case we need to change back to
+ // sync-disabled-by-default on a platform.
return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync);
-#endif
}
bool ProfileSyncService::ShouldPushChanges() {