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 b4d0a290829d73658e7460f8abf08c289aa48827..8b2a589843b659ecc5806e1e5778eb4af49adbfe 100644 |
--- a/chrome/browser/resources/options/easy_unlock_turn_off_overlay.js |
+++ b/chrome/browser/resources/options/easy_unlock_turn_off_overlay.js |
@@ -92,13 +92,6 @@ |
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. |
@@ -182,12 +175,7 @@ |
* Closes the Easy unlock turn off overlay. |
*/ |
EasyUnlockTurnOffOverlay.dismiss = function() { |
- // 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); |
+ PageManager.closeOverlay(); |
}; |
/** |