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

Side by Side Diff: chrome/browser/resources/options/sync_setup_overlay.js

Issue 794943002: sync setup: Restore previous behavior to focus() passphrase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 $('customize-sync-encryption-new').hidden = !args.encryptAllDataAllowed; 695 $('customize-sync-encryption-new').hidden = !args.encryptAllDataAllowed;
696 696
697 $('sync-existing-passphrase-container').hidden = true; 697 $('sync-existing-passphrase-container').hidden = true;
698 698
699 $('sync-select-datatypes').selectedIndex = index; 699 $('sync-select-datatypes').selectedIndex = index;
700 this.setDataTypeCheckboxesEnabled_( 700 this.setDataTypeCheckboxesEnabled_(
701 index == options.DataTypeSelection.CHOOSE_WHAT_TO_SYNC); 701 index == options.DataTypeSelection.CHOOSE_WHAT_TO_SYNC);
702 702
703 if (args.showPassphrase) { 703 if (args.showPassphrase) {
704 this.showPassphraseContainer_(args); 704 this.showPassphraseContainer_(args);
705 // TODO(dbeam): add an #updatePassphrase and only focus with that hash?
Dan Beam 2014/12/11 01:00:11 both the JS and C++ are incredibly hard to grok an
706 $('passphrase').focus();
705 } else { 707 } else {
706 // We only show the 'Use Default' link if we're not prompting for an 708 // We only show the 'Use Default' link if we're not prompting for an
707 // existing passphrase. 709 // existing passphrase.
708 $('use-default-link').hidden = false; 710 $('use-default-link').hidden = false;
709 $('use-default-link').disabled = false; 711 $('use-default-link').disabled = false;
710 $('use-default-link').onclick = function() { 712 $('use-default-link').onclick = function() {
711 SyncSetupOverlay.showSyncEverythingPage(); 713 SyncSetupOverlay.showSyncEverythingPage();
712 return false; 714 return false;
713 }; 715 };
714 } 716 }
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 884
883 SyncSetupOverlay.showStopSyncingUI = function() { 885 SyncSetupOverlay.showStopSyncingUI = function() {
884 SyncSetupOverlay.getInstance().showStopSyncingUI_(); 886 SyncSetupOverlay.getInstance().showStopSyncingUI_();
885 }; 887 };
886 888
887 // Export 889 // Export
888 return { 890 return {
889 SyncSetupOverlay: SyncSetupOverlay 891 SyncSetupOverlay: SyncSetupOverlay
890 }; 892 };
891 }); 893 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698