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

Unified Diff: chrome/browser/ui/webui/options/sync_setup_handler.cc

Issue 7056021: Sync: Add encryption customization radio. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix. Created 9 years, 7 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 | « chrome/browser/sync/sync_setup_flow.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
index aeb58d854d045dce972ebcba419af3b22002f6f2..001429651f005c7bd70fded5188fcd4a4ab80315 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
@@ -121,6 +121,10 @@ bool GetConfiguration(const std::string& json, SyncConfiguration* config) {
config->data_types.insert(syncable::APPS);
// Encryption settings.
+ if (!result->GetBoolean("encryptAllData", &config->encrypt_all))
+ return false;
+
+ // Passphrase settings.
if (!result->GetBoolean("usePassphrase", &config->use_secondary_passphrase))
return false;
if (config->use_secondary_passphrase &&
@@ -244,6 +248,9 @@ void SyncSetupHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
{ "sectionExplicitMessagePrefix", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX },
{ "sectionExplicitMessagePostfix",
IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX },
+ { "encryptedDataTypesTitle", IDS_SYNC_ENCRYPTION_DATA_TYPES_TITLE },
+ { "encryptSensitiveOption", IDS_SYNC_ENCRYPT_SENSITIVE_DATA },
+ { "encryptAllOption", IDS_SYNC_ENCRYPT_ALL_DATA },
};
RegisterStrings(localized_strings, resources, arraysize(resources));
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698