diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 15:30:13 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 15:30:13 +0000 |
| commit | 9c9b01e6b1a25d15dd905446e43d232e668a9b89 (patch) | |
| tree | 3c772ee455c96dbf2459422ddc68aca70b8dca26 | |
| parent | 3659dcb674859d6451e42bbdb141f38dba202edb (diff) | |
| download | chromium_src-9c9b01e6b1a25d15dd905446e43d232e668a9b89.zip chromium_src-9c9b01e6b1a25d15dd905446e43d232e668a9b89.tar.gz chromium_src-9c9b01e6b1a25d15dd905446e43d232e668a9b89.tar.bz2 | |
Merge 256718 "Fix wallpaper revert to the first user's wallpaper after focus on the second user at login screen"
> Fix wallpaper revert to the first user's wallpaper after focus on the second user at login screen
>
>BUG=350079
>
>Review URL: https://codereview.chromium.org/197343004
R=nkostylev@chromium.org
Review URL: https://codereview.chromium.org/217053002
git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@260129 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/chromeos/login/user_pod_row.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.js b/chrome/browser/resources/chromeos/login/user_pod_row.js index fa340d6..0e4b5c6 100644 --- a/chrome/browser/resources/chromeos/login/user_pod_row.js +++ b/chrome/browser/resources/chromeos/login/user_pod_row.js @@ -1985,7 +1985,7 @@ cr.define('login', function() { focusedPod.reset(true); // Notify screen that it is ready. screen.onShow(); - if (!focusedPod.user.isApp) + if (!focusedPod.user.isApp && self.focusedPod_ == focusedPod) chrome.send('loadWallpaper', [focusedPod.user.username]); }); // Guard timer for 1 second -- it would conver all possible animations. |