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

Side by Side 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, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.exportPath('options'); 5 cr.exportPath('options');
6 6
7 /** @typedef {{appsEnforced: boolean, 7 /** @typedef {{appsEnforced: boolean,
8 * appsRegistered: boolean, 8 * appsRegistered: boolean,
9 * appsSynced: boolean, 9 * appsSynced: boolean,
10 * autofillEnforced: boolean, 10 * autofillEnforced: boolean,
11 * autofillRegistered: boolean, 11 * autofillRegistered: boolean,
12 * autofillSynced: boolean, 12 * autofillSynced: boolean,
13 * bookmarksEnforced: boolean, 13 * bookmarksEnforced: boolean,
14 * bookmarksRegistered: boolean, 14 * bookmarksRegistered: boolean,
15 * bookmarksSynced: boolean, 15 * bookmarksSynced: boolean,
16 * encryptAllData: boolean, 16 * encryptAllData: boolean,
17 * encryptAllDataAllowed: boolean,
17 * enterGooglePassphraseBody: (string|undefined), 18 * enterGooglePassphraseBody: (string|undefined),
18 * enterPassphraseBody: (string|undefined), 19 * enterPassphraseBody: (string|undefined),
19 * extensionsEnforced: boolean, 20 * extensionsEnforced: boolean,
20 * extensionsRegistered: boolean, 21 * extensionsRegistered: boolean,
21 * extensionsSynced: boolean, 22 * extensionsSynced: boolean,
22 * fullEncryptionBody: string, 23 * fullEncryptionBody: string,
23 * isSupervised: boolean,
24 * passphraseFailed: boolean, 24 * passphraseFailed: boolean,
25 * passwordsEnforced: boolean, 25 * passwordsEnforced: boolean,
26 * passwordsRegistered: boolean, 26 * passwordsRegistered: boolean,
27 * passwordsSynced: boolean, 27 * passwordsSynced: boolean,
28 * preferencesEnforced: boolean, 28 * preferencesEnforced: boolean,
29 * preferencesRegistered: boolean, 29 * preferencesRegistered: boolean,
30 * preferencesSynced: boolean, 30 * preferencesSynced: boolean,
31 * showPassphrase: boolean, 31 * showPassphrase: boolean,
32 * showSyncEverythingPage: boolean, 32 * showSyncEverythingPage: boolean,
33 * syncAllDataTypes: boolean, 33 * syncAllDataTypes: boolean,
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 // Determine whether to bring the OK button field into focus. 661 // Determine whether to bring the OK button field into focus.
662 var wasCustomizePageHidden = !this.customizePageVisible_; 662 var wasCustomizePageHidden = !this.customizePageVisible_;
663 this.customizePageVisible_ = true; 663 this.customizePageVisible_ = true;
664 this.confirmPageVisible_ = false; 664 this.confirmPageVisible_ = false;
665 665
666 $('confirm-sync-preferences').hidden = true; 666 $('confirm-sync-preferences').hidden = true;
667 $('customize-sync-preferences').hidden = false; 667 $('customize-sync-preferences').hidden = false;
668 668
669 $('sync-custom-passphrase-container').hidden = false; 669 $('sync-custom-passphrase-container').hidden = false;
670 $('sync-new-encryption-section-container').hidden = false; 670 $('sync-new-encryption-section-container').hidden = false;
671 $('customize-sync-encryption-new').hidden = args.isSupervised; 671 $('customize-sync-encryption-new').hidden = !args.encryptAllDataAllowed;
672 672
673 $('sync-existing-passphrase-container').hidden = true; 673 $('sync-existing-passphrase-container').hidden = true;
674 674
675 $('sync-select-datatypes').selectedIndex = index; 675 $('sync-select-datatypes').selectedIndex = index;
676 this.setDataTypeCheckboxesEnabled_( 676 this.setDataTypeCheckboxesEnabled_(
677 index == options.DataTypeSelection.CHOOSE_WHAT_TO_SYNC); 677 index == options.DataTypeSelection.CHOOSE_WHAT_TO_SYNC);
678 678
679 // Give the OK button focus only when the dialog wasn't already visible. 679 // Give the OK button focus only when the dialog wasn't already visible.
680 if (wasCustomizePageHidden) 680 if (wasCustomizePageHidden)
681 $('choose-datatypes-ok').focus(); 681 $('choose-datatypes-ok').focus();
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 867
868 SyncSetupOverlay.showStopSyncingUI = function() { 868 SyncSetupOverlay.showStopSyncingUI = function() {
869 SyncSetupOverlay.getInstance().showStopSyncingUI_(); 869 SyncSetupOverlay.getInstance().showStopSyncingUI_();
870 }; 870 };
871 871
872 // Export 872 // Export
873 return { 873 return {
874 SyncSetupOverlay: SyncSetupOverlay 874 SyncSetupOverlay: SyncSetupOverlay
875 }; 875 };
876 }); 876 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698