chrome/browser/resources/chromeos/login/display_manager.js - Issue 188243003: Merge 254685 "Fixed handling of 'oem_device_requisition' VPD value."

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: chrome/browser/resources/chromeos/login/display_manager.js

Issue 188243003: Merge 254685 "Fixed handling of 'oem_device_requisition' VPD value." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/

Patch Set: Created 6 years, 9 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/login/display_manager.js

===================================================================

--- chrome/browser/resources/chromeos/login/display_manager.js (revision 255205)

+++ chrome/browser/resources/chromeos/login/display_manager.js (working copy)

@@ -596,7 +596,7 @@

onConfirmDeviceRequisitionPrompt_: function(value) {

this.deviceRequisition_ = value;

- chrome.send('setDeviceRequisition', [value]);

+ chrome.send('setDeviceRequisition', [value == '' ? 'none' : value]);

/**

@@ -633,8 +633,11 @@

}

this.deviceRequisitionRemoraDialog_.show(

loadTimeData.getString('deviceRequisitionRemoraPromptText'),

- function() {

+ function() { // onShow

chrome.send('setDeviceRequisition', ['remora']);

+ },

+ function() { // onCancel

+ chrome.send('setDeviceRequisition', ['none']);

});