Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7336)

Unified Diff: chrome/browser/sync/internal_api/sync_manager.cc

Issue 7747001: Call bootstrapencryption before sending initialization complete. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Upload before commit. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/internal_api/sync_manager.cc
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc
index c0b9cb35ff7e9c075139b36b90fff849a036970b..3d8ab3bd1557a75044a9b4cc6ed521d7813d3c59 100644
--- a/chrome/browser/sync/internal_api/sync_manager.cc
+++ b/chrome/browser/sync/internal_api/sync_manager.cc
@@ -787,6 +787,9 @@ bool SyncManager::SyncInternal::Init(
initialized_ = true;
+ // The following calls check that initialized_ is true.
+ BootstrapEncryption(restored_key_for_bootstrapping);
+
// Notify that initialization is complete.
ObserverList<SyncManager::Observer> temp_obs_list;
CopyObservers(&temp_obs_list);
@@ -794,10 +797,6 @@ bool SyncManager::SyncInternal::Init(
OnInitializationComplete(
WeakHandle<JsBackend>(weak_ptr_factory_.GetWeakPtr())));
- // The following calls check that initialized_ is true.
-
- BootstrapEncryption(restored_key_for_bootstrapping);
-
sync_notifier_->AddObserver(this);
return signed_in;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698