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

Unified Diff: chrome/browser/resources/sync_setup_overlay.js

Issue 702323002: Change default button on delete user confirmation page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: shaving 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/sync_setup_overlay.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 e2dab12bbb5c8859de1fbdbf9ce21c3d08115702..24a77d76df7f6a240121c2b268e0fb8e87bbf18b 100644
--- a/chrome/browser/resources/sync_setup_overlay.js
+++ b/chrome/browser/resources/sync_setup_overlay.js
@@ -62,6 +62,8 @@ cr.define('options', function() {
/** @const */ var Page = cr.ui.pageManager.Page;
/** @const */ var PageManager = cr.ui.pageManager.PageManager;
+ // TODO(dbeam): none of these variables are used. This is not Java.
+
// True if the synced account uses a custom passphrase.
var usePassphrase_ = false;
@@ -89,11 +91,6 @@ cr.define('options', function() {
// reset when the dialog is closed.
var dataTypeBoxesDisabled_ = {};
- // Used to determine whether to bring the OK button / passphrase field into
- // focus.
- var confirmPageVisible_ = false;
- var customizePageVisible_ = false;
-
/**
* SyncSetupOverlay class
* Encapsulated handling of the 'Sync Setup' overlay page.
@@ -503,11 +500,6 @@ cr.define('options', function() {
if (args)
this.syncConfigureArgs_ = args;
- // Required in order to determine whether to give focus to the OK button
- // or passphrase field. See crbug.com/310555 and crbug.com/306353.
- this.confirmPageVisible_ = false;
- this.customizePageVisible_ = false;
-
// Once the advanced sync settings dialog is visible, we transition
// between its drop-down menu items as follows:
// "Sync everything": Show encryption and passphrase sections, and disable
@@ -574,11 +566,6 @@ cr.define('options', function() {
chrome.send('coreOptionsUserMetricsAction',
['Options_SyncSetDefault']);
- // Determine whether to bring the OK button into focus.
- var wasConfirmPageHidden = !this.confirmPageVisible_;
- this.confirmPageVisible_ = true;
- this.customizePageVisible_ = false;
-
$('confirm-sync-preferences').hidden = false;
$('customize-sync-preferences').hidden = true;
@@ -593,10 +580,6 @@ cr.define('options', function() {
if (!this.useEncryptEverything_ && !this.usePassphrase_)
$('basic-encryption-option').checked = true;
-
- // Give the OK button focus only when the dialog wasn't already visible.
- if (wasConfirmPageHidden)
- $('confirm-everything-ok').focus();
},
/**
@@ -673,11 +656,6 @@ cr.define('options', function() {
* @private
*/
showCustomizePage_: function(args, index) {
- // Determine whether to bring the OK button field into focus.
- var wasCustomizePageHidden = !this.customizePageVisible_;
- this.customizePageVisible_ = true;
- this.confirmPageVisible_ = false;
-
$('confirm-sync-preferences').hidden = true;
$('customize-sync-preferences').hidden = false;
@@ -691,16 +669,8 @@ cr.define('options', function() {
this.setDataTypeCheckboxesEnabled_(
index == options.DataTypeSelection.CHOOSE_WHAT_TO_SYNC);
- // Give the OK button focus only when the dialog wasn't already visible.
- if (wasCustomizePageHidden)
- $('choose-datatypes-ok').focus();
-
if (args.showPassphrase) {
this.showPassphraseContainer_(args);
- // Give the passphrase field focus only when the dialog wasn't already
- // visible.
- if (wasCustomizePageHidden)
- $('passphrase').focus();
} else {
// We only show the 'Use Default' link if we're not prompting for an
// existing passphrase.
@@ -820,7 +790,6 @@ cr.define('options', function() {
this.visible = true;
$('sync-setup-stop-syncing').hidden = false;
- $('stop-syncing-cancel').focus();
},
/**
« no previous file with comments | « chrome/browser/resources/sync_setup_overlay.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698