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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 1177853002: [Sync] Add ability to save/restore Nigori to SyncEncryptionHandlerImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename in backend as well Created 5 years, 6 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 | « chrome/browser/sync/profile_sync_service.h ('k') | components/sync_driver/sync_frontend.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 68be69afb571f54c1943fe7921a764555b153282..6593bd533dec8d8402f0c04aa4f49b83ee24a650 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1412,6 +1412,18 @@ void ProfileSyncService::OnActionableError(const SyncProtocolError& error) {
}
}
+void ProfileSyncService::OnLocalSetPassphraseEncryption(
+ const syncer::SyncEncryptionHandler::NigoriState& nigori_state) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ // TODO(maniscalco): At this point the user has set a custom passphrase and we
+ // have received the updated nigori state. Time to cache the nigori state,
+ // shutdown sync, then restart it and restore the cached nigori state.
+ //
+ // We should also clear the bootstrap keystore key from the pref before
+ // restarting sync to ensure we obtain a new, valid one when we perform the
+ // configuration sync cycle (crbug.com/490836).
+}
+
void ProfileSyncService::OnConfigureDone(
const DataTypeManager::ConfigureResult& result) {
configure_status_ = result.status;
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | components/sync_driver/sync_frontend.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698