diff options
author | tengs <tengs@chromium.org> | 2014-09-09 21:51:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-10 04:56:19 +0000 |
commit | 668c5c10fd476546fc7d6c22b64c1460dd61b247 (patch) | |
tree | 8448ba3a92f0b89d445ad586e33f85666dc6cca3 /ui/login | |
parent | 227733e374f946b4335ffd55938da4296057bedf (diff) | |
download | chromium_src-668c5c10fd476546fc7d6c22b64c1460dd61b247.zip chromium_src-668c5c10fd476546fc7d6c22b64c1460dd61b247.tar.gz chromium_src-668c5c10fd476546fc7d6c22b64c1460dd61b247.tar.bz2 |
Unload Easy Unlock app when ChromeOS suspends and reload on wake up.
When the system wakes up, it takes a few seconds for the correct
Bluetooth state to propogate to the app. A bad sync state allows
the lock screen to be unlocked even though the phone is not connected
in reality.
BUG=410082
TEST=manual
Review URL: https://codereview.chromium.org/528423002
Cr-Commit-Position: refs/heads/master@{#294104}
Diffstat (limited to 'ui/login')
-rw-r--r-- | ui/login/account_picker/user_pod_row.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/login/account_picker/user_pod_row.js b/ui/login/account_picker/user_pod_row.js index 356a1a6..f3b9ed5 100644 --- a/ui/login/account_picker/user_pod_row.js +++ b/ui/login/account_picker/user_pod_row.js @@ -345,7 +345,7 @@ cr.define('login', function() { this.hideTooltip_(true); this.iconElement.classList.add('faded'); - this.hideTransitionListener_ = this.hide_.bind(this); + this.hideTransitionListener_ = this.hide.bind(this); this.iconElement.addEventListener('webkitTransitionEnd', this.hideTransitionListener_); ensureTransitionEndEvent(this.iconElement, 200); @@ -467,9 +467,8 @@ cr.define('login', function() { /** * Hides the icon. Makes sure the tooltip is hidden and animation reset. - * @private */ - hide_: function() { + hide: function() { this.hideTooltip_(true); this.hidden = true; this.setAnimation(null); @@ -2358,7 +2357,8 @@ cr.define('login', function() { return; } - pod.customIconElement.fadeOut(); + // TODO(tengs): Allow option for a fading transition. + pod.customIconElement.hide(); }, /** |