Merge 254685 "Fixed handling of 'oem_device_requisition' VPD value."

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Display manager for WebUI OOBE and login.
  */
 
 // TODO(xiyuan): Find a better to share those constants.
 /** @const */ var SCREEN_OOBE_NETWORK = 'connect';
@@ skipping 578 matching lines @@
           this.onConfirmDeviceRequisitionPrompt_.bind(this));
     },
 
     /**
      * Confirmation handle for the device requisition prompt.
      * @param {string} value The value entered by the user.
      * @private
      */
     onConfirmDeviceRequisitionPrompt_: function(value) {
       this.deviceRequisition_ = value;
-      chrome.send('setDeviceRequisition', [value]);
+      chrome.send('setDeviceRequisition', [value == '' ? 'none' : value]);
     },
 
     /**
      * Called when window size changed. Notifies current screen about change.
      * @private
      */
     onWindowResize_: function() {
       var currentScreenId = this.screens_[this.currentStep_];
       var currentScreen = $(currentScreenId);
       if (currentScreen)
@@ skipping 16 matching lines @@
       if (!this.deviceRequisitionRemoraDialog_) {
         this.deviceRequisitionRemoraDialog_ =
             new cr.ui.dialogs.ConfirmDialog(document.body);
         this.deviceRequisitionRemoraDialog_.setOkLabel(
             loadTimeData.getString('deviceRequisitionRemoraPromptOk'));
         this.deviceRequisitionRemoraDialog_.setCancelLabel(
             loadTimeData.getString('deviceRequisitionRemoraPromptCancel'));
       }
       this.deviceRequisitionRemoraDialog_.show(
           loadTimeData.getString('deviceRequisitionRemoraPromptText'),
-          function() {
+          function() {  // onShow
             chrome.send('setDeviceRequisition', ['remora']);
+          },
+          function() {  // onCancel
+             chrome.send('setDeviceRequisition', ['none']);
           });
     },
 
     /**
      * Returns true if Oobe UI is shown.
      */
     isOobeUI: function() {
       return document.body.classList.contains('oobe-display');
     },
 
@@ skipping 214 matching lines @@
    */
   DisplayManager.refocusCurrentPod = function() {
     $('pod-row').refocusCurrentPod();
   };
 
   // Export
   return {
     DisplayManager: DisplayManager
   };
 });