Commit 5e9fa15d authored by xiyuan@chromium.org's avatar xiyuan@chromium.org

EasyUnlock: Work around the ghost overlay from CSS animation.

BUG=404779

Review URL: https://codereview.chromium.org/487373002

Cr-Commit-Position: refs/heads/master@{#290743}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290743 0039d316-1c4b-4281-b951-d872f2087c98
parent 2d5c5c49
...@@ -92,6 +92,13 @@ cr.define('options', function() { ...@@ -92,6 +92,13 @@ cr.define('options', function() {
chrome.send('easyUnlockTurnOffOverlayDismissed'); 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. * Returns the button strip element.
* @return {HTMLDivElement} The container div of action buttons. * @return {HTMLDivElement} The container div of action buttons.
...@@ -175,7 +182,12 @@ cr.define('options', function() { ...@@ -175,7 +182,12 @@ cr.define('options', function() {
* Closes the Easy unlock turn off overlay. * Closes the Easy unlock turn off overlay.
*/ */
EasyUnlockTurnOffOverlay.dismiss = function() { 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);
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment