diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 05:31:03 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 05:31:03 +0000 |
| commit | c8d49475e2a972b8e13b55c20b5dae210ce65911 (patch) | |
| tree | 8e0ebb841d952798d19d10e42347a10ec3fff0d2 | |
| parent | 30341c20470cd561674d066f2cb6f7241d0c07af (diff) | |
| download | chromium_src-c8d49475e2a972b8e13b55c20b5dae210ce65911.zip chromium_src-c8d49475e2a972b8e13b55c20b5dae210ce65911.tar.gz chromium_src-c8d49475e2a972b8e13b55c20b5dae210ce65911.tar.bz2 | |
Linux: fix compile due to merging r76336 to 648 branch.
Patch is from patchset 1 of http://codereview.chromium.org/6577022/
BUG=70658,72474,72499
TBR=kerz@chromium.org
Review URL: http://codereview.chromium.org/6602030
git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@76359 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/glue/sync_backend_host.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index acbed77..d4865fb 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -127,8 +127,13 @@ void SyncBackendHost::Initialize( // TODO(tim): Remove this special case once NIGORI is populated by // default. We piggy back off of the passwords flag for now to not // require both encryption and passwords flags. +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) + bool enable_encryption = CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableSyncPasswords) || types.count(syncable::PASSWORDS); +#else bool enable_encryption = !CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableSyncPasswords) || types.count(syncable::PASSWORDS); +#endif if (enable_encryption) registrar_.routing_info[syncable::NIGORI] = GROUP_PASSIVE; |