chrome/browser/sync/util/cryptographer.cc - Issue 8375047: Separate the syncing of extension settings and app settings into separate data

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: chrome/browser/sync/util/cryptographer.cc

Issue 8375047: Separate the syncing of extension settings and app settings into separate data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 years, 2 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

« chrome/browser/sync/protocol/app_setting_specifics.proto ('K') | « chrome/browser/sync/syncable/model_type.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/util/cryptographer.cc

diff --git a/chrome/browser/sync/util/cryptographer.cc b/chrome/browser/sync/util/cryptographer.cc

index 9b78901cdfec9a91b6bd730ce0eb204de16d9e51..f7ac50e334f10a1360b740cde4bfcdb7a463c0ab 100644

--- a/chrome/browser/sync/util/cryptographer.cc

+++ b/chrome/browser/sync/util/cryptographer.cc

@@ -310,6 +310,8 @@ void Cryptographer::UpdateEncryptedTypesFromNigori(

encrypted_types.insert(syncable::SEARCH_ENGINES);

if (nigori.encrypt_sessions())

encrypted_types.insert(syncable::SESSIONS);

+ if (nigori.encrypt_app_settings())

+ encrypted_types.insert(syncable::APP_SETTINGS);

if (nigori.encrypt_apps())

encrypted_types.insert(syncable::APPS);

if (nigori.encrypt_app_notifications())

@@ -347,6 +349,8 @@ void Cryptographer::UpdateNigoriFromEncryptedTypes(

nigori->set_encrypt_search_engines(

encrypted_types_.count(syncable::SEARCH_ENGINES) > 0);

nigori->set_encrypt_sessions(encrypted_types_.count(syncable::SESSIONS) > 0);

+ nigori->set_encrypt_app_settings(

+ encrypted_types_.count(syncable::APP_SETTINGS) > 0);

nigori->set_encrypt_apps(encrypted_types_.count(syncable::APPS) > 0);

nigori->set_encrypt_app_notifications(

encrypted_types_.count(syncable::APP_NOTIFICATIONS) > 0);