Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2146)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/login/display_manager.js

Issue 183923008: Fixed handling of 'oem_device_requisition' VPD value. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc ('K') | « 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') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/login/display_manager.js
diff --git a/chrome/browser/resources/login/display_manager.js b/chrome/browser/resources/login/display_manager.js
index ff5ba8bb4f04781781cf0bcc746456e47f9a2fd0..9d97f65b383c73d8a46be0656da2caf4035aa2ce 100644
--- a/chrome/browser/resources/login/display_manager.js
+++ b/chrome/browser/resources/login/display_manager.js
@@ -596,7 +596,7 @@ cr.define('cr.ui.login', function() {
*/
onConfirmDeviceRequisitionPrompt_: function(value) {
this.deviceRequisition_ = value;
- chrome.send('setDeviceRequisition', [value]);
+ chrome.send('setDeviceRequisition', [value == '' ? 'none' : value]);
},
/**
@@ -633,8 +633,11 @@ cr.define('cr.ui.login', function() {
}
this.deviceRequisitionRemoraDialog_.show(
loadTimeData.getString('deviceRequisitionRemoraPromptText'),
- function() {
+ function() { // onShow
chrome.send('setDeviceRequisition', ['remora']);
+ },
+ function() { // onCancel
+ chrome.send('setDeviceRequisition', ['none']);
});
},
« chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc ('K') | « 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 »

Powered by Google App Engine
This is Rietveld 408576698