sync/engine/model_type_sync_proxy_impl.cc - Issue 452283003: sync: Finish non-blocking type encryption support

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/engine/model_type_sync_proxy_impl.cc

Issue 452283003: sync: Finish non-blocking type encryption support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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/engine/model_type_sync_proxy_impl.cc

diff --git a/sync/engine/model_type_sync_proxy_impl.cc b/sync/engine/model_type_sync_proxy_impl.cc

index 7ea5d526214411fa504fb60767b137c325ee1553..8c5ea5da9b9e429c1d97d0d9e4b5bc608227e22b 100644

--- a/sync/engine/model_type_sync_proxy_impl.cc

+++ b/sync/engine/model_type_sync_proxy_impl.cc

@@ -240,6 +240,9 @@ void ModelTypeSyncProxyImpl::OnUpdateReceived(

// commit to fix it.

if (data_type_state_.encryption_key_name !=

response_data.encryption_key_name) {

+ DVLOG(1) << ModelTypeToString(type_) << ": Requesting re-encrypt commit "

+ << response_data.encryption_key_name << " -> "

+ << data_type_state_.encryption_key_name;

EntityMap::iterator it2 = entities_.find(client_tag_hash);

it2->second->UpdateDesiredEncryptionKey(

data_type_state_.encryption_key_name);