Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/display_manager.js |
| diff --git a/chrome/browser/resources/chromeos/login/display_manager.js b/chrome/browser/resources/chromeos/login/display_manager.js |
| index 73edc31cbf83e15fd40930f8a2a987631dcd414f..85b8376e5c406a5aa13f27a9c132bd86a3f6749f 100644 |
| --- a/chrome/browser/resources/chromeos/login/display_manager.js |
| +++ b/chrome/browser/resources/chromeos/login/display_manager.js |
| @@ -229,10 +229,8 @@ cr.define('cr.ui.login', function() { |
| if (this.isOobeUI()) |
| this.showDeviceRequisitionPrompt_(); |
| } else if (name == ACCELERATOR_DEVICE_REQUISITION_REMORA) { |
| - if (this.isOobeUI()) { |
| - this.deviceRequisition_ = 'remora'; |
| - this.showDeviceRequisitionPrompt_(); |
| - } |
| + if (this.isOobeUI()) |
| + this.showDeviceRequisitionRemoraPrompt_(); |
| } else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) { |
| var currentStepId = this.screens_[this.currentStep_]; |
| if (currentStepId == SCREEN_APP_LAUNCH_SPLASH) |
| @@ -590,6 +588,23 @@ cr.define('cr.ui.login', function() { |
| }, |
| /** |
| + * Shows the special remora device requisition prompt. |
|
Dan Beam
2013/11/07 00:12:37
@private
xiyuan
2013/11/07 00:25:56
Done. Only changed this one since I want to keep t
|
| + */ |
| + showDeviceRequisitionRemoraPrompt_: function() { |
| + if (!this.deviceRequisitionRemoraDialog_) { |
| + this.deviceRequisitionRemoraDialog_ = |
| + new cr.ui.dialogs.AlertDialog(document.body); |
| + this.deviceRequisitionRemoraDialog_.setOkLabel( |
| + loadTimeData.getString('deviceRequisitionPromptOk')); |
| + } |
| + this.deviceRequisitionRemoraDialog_.show( |
| + loadTimeData.getString('deviceRequisitionRemoraPromptText'), |
| + function() { |
| + chrome.send('setDeviceRequisition', ['remora']); |
| + }); |
| + }, |
| + |
| + /** |
| * Returns true if Oobe UI is shown. |
| */ |
| isOobeUI: function() { |