Refactor kiosk app launch to be part of login screen UI flow.

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';
 /** @const */ var SCREEN_OOBE_EULA = 'eula';
 /** @const */ var SCREEN_OOBE_UPDATE = 'update';
 /** @const */ var SCREEN_OOBE_ENROLLMENT = 'oauth-enrollment';
 /** @const */ var SCREEN_OOBE_KIOSK_ENABLE = 'kiosk-enable';
 /** @const */ var SCREEN_GAIA_SIGNIN = 'gaia-signin';
 /** @const */ var SCREEN_ACCOUNT_PICKER = 'account-picker';
 /** @const */ var SCREEN_ERROR_MESSAGE = 'error-message';
 /** @const */ var SCREEN_USER_IMAGE_PICKER = 'user-image';
 /** @const */ var SCREEN_TPM_ERROR = 'tpm-error-message';
 /** @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';
 /** @const */ var ACCELERATOR_ENROLLMENT = 'enrollment';
 /** @const */ var ACCELERATOR_KIOSK_ENABLE = 'kiosk_enable';
 /** @const */ var ACCELERATOR_VERSION = 'version';
 /** @const */ var ACCELERATOR_RESET = 'reset';
 /** @const */ var ACCELERATOR_LEFT = 'left';
 /** @const */ var ACCELERATOR_RIGHT = 'right';
 /** @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;
 
 /* Signin UI state constants. Used to control header bar UI. */
 /** @const */ var SIGNIN_UI_STATE = {
   HIDDEN: 0,
   GAIA_SIGNIN: 1,
   ACCOUNT_PICKER: 2,
   WRONG_HWID_WARNING: 3,
@@ skipping 183 matching lines @@
           chrome.send('toggleResetScreen');
         }
       } else if (name == ACCELERATOR_DEVICE_REQUISITION) {
         if (this.isOobeUI())
           this.showDeviceRequisitionPrompt_();
       } else if (name == ACCELERATOR_DEVICE_REQUISITION_REMORA) {
         if (this.isOobeUI()) {
           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_)
         return;
 
       // Handle special accelerators for keyboard enhanced navigation flow.
       if (name == ACCELERATOR_LEFT)
         keyboard.raiseKeyFocusPrevious(document.activeElement);
       else if (name == ACCELERATOR_RIGHT)
         keyboard.raiseKeyFocusNext(document.activeElement);
@@ skipping 229 matching lines @@
       this.appendButtons_(el.buttons, screenId);
     },
 
     /**
      * Updates inner container size based on the size of the current screen and
      * other screens in the same group.
      * Should be executed on screen change / screen size change.
      * @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 'fullsreen' screen yet, but
it's good to have code after this "if" to clear 'fullscreen' just in case.

[Tim Song, 2013/08/19 20:05:07]

Done. The #('inner-container').style is being set below, and we also need to
clear these custom styles for the fullscreen styles to be applied.

+
       // Have to reset any previously predefined screen size first
       // so that screen contents would define it instead (offsetHeight/width).
       // http://crbug.com/146539
       screen.style.width = '';
       screen.style.height = '';
 
       var height = screen.offsetHeight;
       var width = screen.offsetWidth;
       for (var i = 0, screenGroup; screenGroup = SCREEN_GROUPS[i]; i++) {
         if (screenGroup.indexOf(screen.id) != -1) {
@@ skipping 303 matching lines @@
    */
   DisplayManager.refocusCurrentPod = function() {
     $('pod-row').refocusCurrentPod();
   };
 
   // Export
   return {
     DisplayManager: DisplayManager
   };
 });