sync/internal_api/js_sync_encryption_handler_observer.h - Issue 10878015: [Sync] Move keystore key handling to SyncEncryptionHandlerImpl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/internal_api/js_sync_encryption_handler_observer.h

Issue 10878015: [Sync] Move keystore key handling to SyncEncryptionHandlerImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase 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:

Index: sync/internal_api/js_sync_encryption_handler_observer.h

diff --git a/sync/internal_api/js_sync_encryption_handler_observer.h b/sync/internal_api/js_sync_encryption_handler_observer.h

index 60995176ed5ff6c8057089e98412171d85c94afd..9fe458e889c4392b30bffec087cdb838e437f077 100644

--- a/sync/internal_api/js_sync_encryption_handler_observer.h

+++ b/sync/internal_api/js_sync_encryption_handler_observer.h

@@ -36,7 +36,8 @@ class JsSyncEncryptionHandlerObserver : public SyncEncryptionHandler::Observer {

const sync_pb::EncryptedData& pending_keys) OVERRIDE;

virtual void OnPassphraseAccepted() OVERRIDE;

virtual void OnBootstrapTokenUpdated(

- const std::string& bootstrap_token) OVERRIDE;

+ const std::string& bootstrap_token,

+ BootstrapTokenType type) OVERRIDE;

virtual void OnEncryptedTypesChanged(

ModelTypeSet encrypted_types,

bool encrypt_everything) OVERRIDE;