Commit 39e1410e authored by xiyuan's avatar xiyuan Committed by Commit bot

Revert of EasyUnlock: Work around the ghost overlay from CSS animation....

Revert of EasyUnlock: Work around the ghost overlay from CSS animation. (patchset #3 id:40001 of https://codereview.chromium.org/487373002/)

Reason for revert:
No longer needed since underlying blink issue http://crbug.com/405250 is fixed.

Original issue's description:
> EasyUnlock: Work around the ghost overlay from CSS animation.
>
> BUG=404779
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=290743

TBR=tbarzic@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=404779

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

Cr-Commit-Position: refs/heads/master@{#292816}
parent 7dc2bfbf
...@@ -92,13 +92,6 @@ cr.define('options', function() { ...@@ -92,13 +92,6 @@ 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.
...@@ -182,12 +175,7 @@ cr.define('options', function() { ...@@ -182,12 +175,7 @@ cr.define('options', function() {
* Closes the Easy unlock turn off overlay. * Closes the Easy unlock turn off overlay.
*/ */
EasyUnlockTurnOffOverlay.dismiss = function() { EasyUnlockTurnOffOverlay.dismiss = function() {
// TODO(xiyuan): Remove the workaround and call closeOverly directly. PageManager.closeOverlay();
// 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