diff options
| author | jonross <jonross@chromium.org> | 2015-02-13 09:46:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-13 17:46:46 +0000 |
| commit | 7a1787ede410d121a4e998cc270de8c7a191a829 (patch) | |
| tree | 1f4d08bf1b2e313bea61cafea524610c10b04fa3 /ui/login | |
| parent | 8c700e2511ed9c93b7245a525238086b88c2ee34 (diff) | |
| download | chromium_src-7a1787ede410d121a4e998cc270de8c7a191a829.zip chromium_src-7a1787ede410d121a4e998cc270de8c7a191a829.tar.gz chromium_src-7a1787ede410d121a4e998cc270de8c7a191a829.tar.bz2 | |
Revert of Reset Screen moved to ScreenContext. (patchset #7 id:120001 of https://codereview.chromium.org/904163003/)
Reason for revert:
This is faling a compile on ChromeOS bots:
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/77470
Original issue's description:
> Reset Screen moved to ScreenContext.
>
> BUG=456778
>
> Committed: https://crrev.com/4b77f613917020e58b31975355e4ca2347f216e2
> Cr-Commit-Position: refs/heads/master@{#316212}
>
> Committed: https://crrev.com/ba85904895874b5d82d78bcb499c3c5ee7388e34
> Cr-Commit-Position: refs/heads/master@{#316232}
TBR=dzhioev@chromium.org,merkulova@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=456778
Review URL: https://codereview.chromium.org/928513002
Cr-Commit-Position: refs/heads/master@{#316237}
Diffstat (limited to 'ui/login')
| -rw-r--r-- | ui/login/display_manager.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ui/login/display_manager.js b/ui/login/display_manager.js index f73a13f..5befe79 100644 --- a/ui/login/display_manager.js +++ b/ui/login/display_manager.js @@ -86,8 +86,6 @@ DESKTOP_USER_MANAGER: 'login-add-user' }; -/** @const */ var USER_ACTION_ROLLBACK_TOGGLED = 'rollback-toggled'; - cr.define('cr.ui.login', function() { var Bubble = cr.ui.Bubble; @@ -380,8 +378,7 @@ cr.define('cr.ui.login', function() { $('version-labels').hidden = !$('version-labels').hidden; } else if (name == ACCELERATOR_RESET) { if (currentStepId == SCREEN_OOBE_RESET) - $('reset').send(login.Screen.CALLBACK_USER_ACTED, - USER_ACTION_ROLLBACK_TOGGLED); + chrome.send('toggleRollbackOnResetScreen'); else if (RESET_AVAILABLE_SCREEN_GROUP.indexOf(currentStepId) != -1) chrome.send('toggleResetScreen'); } else if (name == ACCELERATOR_DEVICE_REQUISITION) { |