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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/internal_api/debug_info_event_listener.cc

Issue 10878015: [Sync] Move keystore key handling to SyncEncryptionHandlerImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « sync/internal_api/debug_info_event_listener.h ('k') | sync/internal_api/js_sync_encryption_handler_observer.h » ('j') | sync/internal_api/js_sync_encryption_handler_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/debug_info_event_listener.cc
diff --git a/sync/internal_api/debug_info_event_listener.cc b/sync/internal_api/debug_info_event_listener.cc
index b5ceaa73ea8639a6a3028430f758112e7cd1fa01..dac5945c126054986418edec607b6d538e889b29 100644
--- a/sync/internal_api/debug_info_event_listener.cc
+++ b/sync/internal_api/debug_info_event_listener.cc
@@ -68,8 +68,13 @@ void DebugInfoEventListener::OnPassphraseAccepted() {
}
void DebugInfoEventListener::OnBootstrapTokenUpdated(
- const std::string& bootstrap_token) {
- CreateAndAddEvent(sync_pb::DebugEventInfo::BOOTSTRAP_TOKEN_UPDATED);
+ const std::string& bootstrap_token, BootstrapTokenType type) {
+ if (type == PASSPHRASE_BOOTSTRAP_TOKEN) {
+ CreateAndAddEvent(sync_pb::DebugEventInfo::BOOTSTRAP_TOKEN_UPDATED);
+ return;
+ }
+ DCHECK_EQ(type, KEYSTORE_BOOTSTRAP_TOKEN);
+ CreateAndAddEvent(sync_pb::DebugEventInfo::KEYSTORE_TOKEN_UPDATED);
}
void DebugInfoEventListener::OnStopSyncingPermanently() {
« no previous file with comments | « sync/internal_api/debug_info_event_listener.h ('k') | sync/internal_api/js_sync_encryption_handler_observer.h » ('j') | sync/internal_api/js_sync_encryption_handler_observer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698