diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 04:27:58 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 04:27:58 +0000 |
| commit | 41f41e42a5e31d5be78bb0bf96357c677857ba74 (patch) | |
| tree | 080626b3dba4d589265b7e8fd0e3e25366ae9060 /chrome/browser/sync/engine/syncapi.cc | |
| parent | cdd0d448a7a82e7824c3ef84c9705cadc4d0a8bc (diff) | |
| download | chromium_src-41f41e42a5e31d5be78bb0bf96357c677857ba74.zip chromium_src-41f41e42a5e31d5be78bb0bf96357c677857ba74.tar.gz chromium_src-41f41e42a5e31d5be78bb0bf96357c677857ba74.tar.bz2 | |
[Sync] Support receiving early passphrase required information in Sync UI.
We now always send the configure command, even when it's just a passphrase
being entered. This works because the datatypemanager now is smart enough
to not reconfigure if the datatypes are the same and we were already in a
configured state. The configure command now also supports using the explicit
passphrase prompted when one is already required.
BUG=87797,87572
TEST=First time sync on an account that already had an explicit passphrase. Also all other passphrase prompt scenarios.
Review URL: http://codereview.chromium.org/7466024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncapi.cc')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index c946303..1b085e4 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -1966,7 +1966,7 @@ void SyncManager::SyncInternal::SetPassphrase( const std::string& passphrase, bool is_explicit) { // We do not accept empty passphrases. if (passphrase.empty()) { - VLOG(1) << "Rejecting empty passphrase."; + NOTREACHED() << "Rejecting empty passphrase."; ObserverList<SyncManager::Observer> temp_obs_list; CopyObservers(&temp_obs_list); FOR_EACH_OBSERVER(SyncManager::Observer, temp_obs_list, |