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 638cc5c5207c0607d8e69e1edb5495be13773dd2..a854f28790d1714abb76c9d52b11050d590bf200 100644 |
| --- a/chrome/browser/resources/chromeos/login/display_manager.js |
| +++ b/chrome/browser/resources/chromeos/login/display_manager.js |
| @@ -20,6 +20,7 @@ |
| /** @const */ var SCREEN_PASSWORD_CHANGED = 'password-changed'; |
| /** @const */ var SCREEN_CREATE_MANAGED_USER_FLOW = |
| 'managed-user-creation'; |
| +/** @const */ var SCREEN_APP_LAUNCH_SPLASH = 'app-launch-splash'; |
| /* Accelerator identifiers. Must be kept in sync with webui_login_view.cc. */ |
| /** @const */ var ACCELERATOR_CANCEL = 'cancel'; |
| @@ -32,6 +33,7 @@ |
| /** @const */ var ACCELERATOR_DEVICE_REQUISITION = 'device_requisition'; |
| /** @const */ var ACCELERATOR_DEVICE_REQUISITION_REMORA = |
| 'device_requisition_remora'; |
| +/** @const */ var ACCELERATOR_APP_LAUNCH_BAILOUT = 'app_launch_bailout'; |
| /* Help topic identifiers. */ |
| /** @const */ var HELP_TOPIC_ENTERPRISE_REPORTING = 2535613; |
| @@ -235,6 +237,10 @@ cr.define('cr.ui.login', function() { |
| this.deviceRequisition_ = 'remora'; |
| this.showDeviceRequisitionPrompt_(); |
| } |
| + } else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) { |
| + var currentStepId = this.screens_[this.currentStep_]; |
| + if (currentStepId == SCREEN_APP_LAUNCH_SPLASH) |
| + chrome.send('cancelAppLaunch'); |
| } |
| if (!this.forceKeyboardFlow_) |
| @@ -484,6 +490,11 @@ cr.define('cr.ui.login', function() { |
| * @param {!HTMLElement} screen Screen that is being shown. |
| */ |
| updateScreenSize: function(screen) { |
| + if (screen.classList.contains('fullscreen')) { |
| + $('outer-container').classList.toggle('fullscreen', true); |
| + return; |
| + } |
|
xiyuan
2013/08/19 17:40:29
nit: Although we don't have code to return from a
Tim Song
2013/08/19 20:05:07
Done. The #('inner-container').style is being set
|
| + |
| // Have to reset any previously predefined screen size first |
| // so that screen contents would define it instead (offsetHeight/width). |
| // http://crbug.com/146539 |