ui/login/display_manager.js - Issue 904163003: Reset Screen moved to ScreenContext.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/login/display_manager.js

Issue 904163003: Reset Screen moved to ScreenContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Include for GetNativeWindow added. Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/login/display_manager.js

diff --git a/ui/login/display_manager.js b/ui/login/display_manager.js

index 5befe79b7b1e31d1494d9a65ed095295a136961f..f73a13f3e4788322191ee58213cec02c90f604cd 100644

--- a/ui/login/display_manager.js

+++ b/ui/login/display_manager.js

@@ -86,6 +86,8 @@

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;

@@ -378,7 +380,8 @@ cr.define('cr.ui.login', function() {

$('version-labels').hidden = !$('version-labels').hidden;

} else if (name == ACCELERATOR_RESET) {

if (currentStepId == SCREEN_OOBE_RESET)

- chrome.send('toggleRollbackOnResetScreen');

+ $('reset').send(login.Screen.CALLBACK_USER_ACTED,

+ USER_ACTION_ROLLBACK_TOGGLED);

else if (RESET_AVAILABLE_SCREEN_GROUP.indexOf(currentStepId) != -1)

chrome.send('toggleResetScreen');

} else if (name == ACCELERATOR_DEVICE_REQUISITION) {

« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | no next file » | no next file with comments »