chrome/browser/resources/sync_setup_overlay.js - Issue 665223007: Add a flag to ProfileSyncService that says whether encrypting all data is allowed.

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/resources/sync_setup_overlay.js

Issue 665223007: Add a flag to ProfileSyncService that says whether encrypting all data is allowed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 6 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java ('k') | chrome/browser/supervised_user/supervised_user_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/sync_setup_overlay.js

diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js

index 4e866ca2dd4c1059f58606ca05e9b15db9c05ed7..976d7a3da060ac99857e950d7c78fd846cc31c87 100644

--- a/chrome/browser/resources/sync_setup_overlay.js

+++ b/chrome/browser/resources/sync_setup_overlay.js

@@ -14,13 +14,13 @@ cr.exportPath('options');

* bookmarksRegistered: boolean,

* bookmarksSynced: boolean,

* encryptAllData: boolean,

+ * encryptAllDataAllowed: boolean,

* enterGooglePassphraseBody: (string|undefined),

* enterPassphraseBody: (string|undefined),

* extensionsEnforced: boolean,

* extensionsRegistered: boolean,

* extensionsSynced: boolean,

* fullEncryptionBody: string,

- * isSupervised: boolean,

* passphraseFailed: boolean,

* passwordsEnforced: boolean,

* passwordsRegistered: boolean,

@@ -668,7 +668,7 @@ cr.define('options', function() {

$('sync-custom-passphrase-container').hidden = false;

$('sync-new-encryption-section-container').hidden = false;

- $('customize-sync-encryption-new').hidden = args.isSupervised;

+ $('customize-sync-encryption-new').hidden = !args.encryptAllDataAllowed;

$('sync-existing-passphrase-container').hidden = true;