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

Unified Diff: components/browser_sync/browser/profile_sync_service.cc

Issue 1414203016: [Sync] Introduce GmsCoreSyncListener. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 5 years, 1 month 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
Index: components/browser_sync/browser/profile_sync_service.cc
diff --git a/components/browser_sync/browser/profile_sync_service.cc b/components/browser_sync/browser/profile_sync_service.cc
index f24df73a3587d31b1fa39bfd0641858035982980..af23c06042bcdfa85eb2e82b3021ae29e3b764ef 100644
--- a/components/browser_sync/browser/profile_sync_service.cc
+++ b/components/browser_sync/browser/profile_sync_service.cc
@@ -1863,6 +1863,13 @@ bool ProfileSyncService::IsUsingSecondaryPassphrase() const {
passphrase_type == syncer::CUSTOM_PASSPHRASE;
}
+std::string ProfileSyncService::GetCustomPassphraseKey() const {
+ sync_driver::SystemEncryptor encryptor;
Nicolas Zea 2015/11/17 22:47:45 DCHECK that GetEncryptionBootstrapToken() isn't em
maxbogue 2015/11/17 23:25:31 It actually is empty here sometimes. That's why Gm
+ syncer::Cryptographer cryptographer(&encryptor);
+ cryptographer.Bootstrap(sync_prefs_.GetEncryptionBootstrapToken());
+ return cryptographer.GetDefaultNigoriKeyData();
+}
+
syncer::PassphraseType ProfileSyncService::GetPassphraseType() const {
return backend_->GetPassphraseType();
}

Powered by Google App Engine
This is Rietveld 408576698