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 160 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');
+        }

[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_)
         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 230 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')) {
+        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
       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) {
           // Set screen dimensions to maximum dimensions within this group.
           for (var j = 0, screen2; screen2 = $(screenGroup[j]); j++) {
             height = Math.max(height, screen2.offsetHeight);
             width = Math.max(width, screen2.offsetWidth);
           }
           break;
         }
       }
       $('inner-container').style.height = height + 'px';
       $('inner-container').style.width = width + 'px';
       // This requires |screen| to have 'box-sizing: border-box'.
       screen.style.width = width + 'px';
       screen.style.height = height + 'px';
     },
 
     /**
+     * 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:
.step.fullscreen {
  height: 100%;
  left: 0;
  right: 0;
  top: 0;
  width: 100%;
}

In screen_container.css:
#oobe.fullscreen #outer-container {
  height: 100%;
  width: 100%;
}

Then in updateScreenSize above, toggle "fullscreen" class on #oobe based on
whether the screen has "fullscreen" class. Something like
$('oobe').classList.toggle("fullscreen",
                           screen.classList.contains('fullscreen'));

[Tim Song, 2013/08/16 19:07:59]

Good call. #outer-container is the parent of the #oobe, so I moved the
fullscreen to that element instead. It seems we still need the early return to
prevent all of the resizing logic below from running.

+      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.
      */
     updateLocalizedContent_: function() {
       for (var i = 0, screenId; screenId = this.screens_[i]; ++i) {
         var screen = $(screenId);
         var buttonStrip = $(screenId + '-controls');
         if (buttonStrip)
           buttonStrip.innerHTML = '';
         // TODO(nkostylev): Update screen headers for new OOBE design.
@@ skipping 289 matching lines @@
    */
   DisplayManager.refocusCurrentPod = function() {
     $('pod-row').refocusCurrentPod();
   };
 
   // Export
   return {
     DisplayManager: DisplayManager
   };
 });