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

Unified Diff: chrome/browser/resources/options/easy_unlock_turn_off_overlay.js

Issue 487373002: EasyUnlock: Work around the ghost overlay from CSS animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ESC and click-close-button path Created 6 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/easy_unlock_turn_off_overlay.js
diff --git a/chrome/browser/resources/options/easy_unlock_turn_off_overlay.js b/chrome/browser/resources/options/easy_unlock_turn_off_overlay.js
index 8b2a589843b659ecc5806e1e5778eb4af49adbfe..b4d0a290829d73658e7460f8abf08c289aa48827 100644
--- a/chrome/browser/resources/options/easy_unlock_turn_off_overlay.js
+++ b/chrome/browser/resources/options/easy_unlock_turn_off_overlay.js
@@ -92,6 +92,13 @@ cr.define('options', function() {
chrome.send('easyUnlockTurnOffOverlayDismissed');
},
+ /** @override */
+ handleCancel: function() {
+ // Make sure keyboard dismiss uses the word around as well.
+ // TODO(xiyuan): Remove the workaround. See http://crbug.com/405250
+ EasyUnlockTurnOffOverlay.dismiss();
+ },
+
/**
* Returns the button strip element.
* @return {HTMLDivElement} The container div of action buttons.
@@ -175,7 +182,12 @@ cr.define('options', function() {
* Closes the Easy unlock turn off overlay.
*/
EasyUnlockTurnOffOverlay.dismiss = function() {
- PageManager.closeOverlay();
+ // TODO(xiyuan): Remove the workaround and call closeOverly directly.
+ // See http://crbug.com/405250
+ $('easy-unlock-turn-off-spinner').hidden = true;
+ window.setTimeout(function() {
+ PageManager.closeOverlay();
+ }, 100);
};
/**
« 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