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 85c97b1169cf524429c20105a7a201271ef32e33..2824012b015d45daef58f833b54bfc6aff305afe 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; |
@@ -212,6 +214,11 @@ 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'); |
+ } |
xiyuan
2013/08/15 18:19:42
nit: Remove enclosing {} for one liner.
Tim Song
2013/08/16 19:07:59
Done.
|
} |
if (!this.forceKeyboardFlow_) |
@@ -462,6 +469,11 @@ cr.define('cr.ui.login', function() { |
* @param {!HTMLElement} screen Screen that is being shown. |
*/ |
updateScreenSize: function(screen) { |
+ if (screen.classList.contains('fullscreen')) { |
+ this.setFullScreen_(screen); |
+ return; |
+ } |
+ |
// Have to reset any previously predefined screen size first |
// so that screen contents would define it instead (offsetHeight/width). |
// http://crbug.com/146539 |
@@ -488,6 +500,23 @@ cr.define('cr.ui.login', function() { |
}, |
/** |
+ * Resizes a screen to be fullscreen. |
+ */ |
+ setFullScreen_: function(screen) { |
xiyuan
2013/08/15 18:19:42
This could be done via CSS.
In oobe_screen.css:
.
Tim Song
2013/08/16 19:07:59
Good call. #outer-container is the parent of the #
|
+ var outerContainer = $('outer-container'); |
+ var oobe = $('oobe'); |
+ var innerContainer = $('inner-container'); |
+ outerContainer.style.width = '100%'; |
+ outerContainer.style.height = '100%'; |
+ oobe.style.width = '100%'; |
+ oobe.style.height = '100%'; |
+ innerContainer.style.width = '100%'; |
+ innerContainer.style.height = '100%'; |
+ screen.style.width = '100%'; |
+ screen.style.height = '100%'; |
+ }, |
+ |
+ /** |
* Updates localized content of the screens like headers, buttons and links. |
* Should be executed on language change. |
*/ |