summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 02:51:10 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 02:51:10 +0000
commita260ebd0c5a4e0d6790c69c93b8557115d1356c9 (patch)
tree234202c0c5af4d255bb3c5a8023cf03bf66a8d00
parentcf7b88ae3d580cdb857b4f515a69dfdbdf4be7ec (diff)
downloadchromium_src-a260ebd0c5a4e0d6790c69c93b8557115d1356c9.zip
chromium_src-a260ebd0c5a4e0d6790c69c93b8557115d1356c9.tar.gz
chromium_src-a260ebd0c5a4e0d6790c69c93b8557115d1356c9.tar.bz2
Merge 32727 - Disable sync. (Will be committed on beta branch only, and this CL will be immediately reverted.)
BUG=26712 TEST=trybot Review URL: http://codereview.chromium.org/425015 TBR=akalin@chromium.org Review URL: http://codereview.chromium.org/429002 git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32729 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/profile_sync_service.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index d380578..02a71f6 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -426,7 +426,7 @@ void ProfileSyncService::SyncEvent(SyncEventCodes code) {
bool ProfileSyncService::IsSyncEnabled() {
#if defined(OS_POSIX)
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync);
+ return false;
#else
return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync);
#endif