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); |
}; |
/** |