diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/sync/glue/sync_backend_host.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/sync/glue/sync_backend_host.cc')
| -rw-r--r-- | chrome/browser/sync/glue/sync_backend_host.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index 0637850..7d833bd 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -120,8 +120,8 @@ 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. - bool enable_encryption = !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableSyncPasswords) || types.count(syncable::PASSWORDS) > 0; + bool enable_encryption = CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableSyncPasswords) || types.count(syncable::PASSWORDS); if (enable_encryption) registrar_.routing_info[syncable::NIGORI] = GROUP_PASSIVE; |