Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / chromeos / login / oobe.js

diff --git a/src/chrome/browser/resources/chromeos/login/oobe.js b/src/chrome/browser/resources/chromeos/login/oobe.js
index 5e84f56..ea7a0b9 100644 (file)
--- a/src/chrome/browser/resources/chromeos/login/oobe.js
+++ b/src/chrome/browser/resources/chromeos/login/oobe.js
@@ -7,10 +7,20 @@
  * This is the main code for the OOBE WebUI implementation.
  */
 
-<include src="login_common.js"></include>
-<include src="oobe_screen_eula.js"></include>
-<include src="oobe_screen_network.js"></include>
-<include src="oobe_screen_update.js"></include>
+/**
+ * Setting WAIT_FOR_POLYMER to 'true' will delay screens' registration until
+ * Polymer is loaded.
+ */
+/* @const */ var WAIT_FOR_POLYMER = true;
+
+<include src="login_common.js">
+<include src="oobe_screen_eula.js">
+<include src="oobe_screen_network.js">
+<include src="oobe_screen_hid_detection.js">
+<include src="oobe_screen_update.js">
+<include src="oobe_screen_controller_pairing.js">
+<include src="oobe_screen_host_pairing.js">
+<include src="oobe_screen_auto_enrollment_check.js">
 
 cr.define('cr.ui.Oobe', function() {
   return {
@@ -62,10 +72,12 @@ cr.define('cr.ui.Oobe', function() {
      */
     initialize: function() {
       cr.ui.login.DisplayManager.initialize();
+      login.HIDDetectionScreen.register();
       login.WrongHWIDScreen.register();
       login.NetworkScreen.register();
       login.EulaScreen.register();
       login.UpdateScreen.register();
+      login.AutoEnrollmentCheckScreen.register();
       login.ResetScreen.register();
       login.AutolaunchScreen.register();
       login.KioskEnableScreen.register();
@@ -75,11 +87,14 @@ cr.define('cr.ui.Oobe', function() {
       login.ErrorMessageScreen.register();
       login.TPMErrorMessageScreen.register();
       login.PasswordChangedScreen.register();
-      login.LocallyManagedUserCreationScreen.register();
+      login.SupervisedUserCreationScreen.register();
       login.TermsOfServiceScreen.register();
       login.AppLaunchSplashScreen.register();
       login.ConfirmPasswordScreen.register();
       login.FatalErrorScreen.register();
+      login.ControllerPairingScreen.register();
+      login.HostPairingScreen.register();
+      login.DeviceDisabledScreen.register();
 
       cr.ui.Bubble.decorate($('bubble'));
       login.HeaderBar.decorate($('login-header-bar'));
@@ -138,6 +153,15 @@ cr.define('cr.ui.Oobe', function() {
       $('accessibility-menu').showForElement(e.target,
                                              cr.ui.Bubble.Attachment.BOTTOM,
                                              BUBBLE_OFFSET, BUBBLE_PADDING);
+
+      var maxHeight = cr.ui.LoginUITools.getMaxHeightBeforeShelfOverlapping(
+          $('accessibility-menu'));
+      if (maxHeight < $('accessibility-menu').offsetHeight) {
+        $('accessibility-menu').showForElement(e.target,
+                                               cr.ui.Bubble.Attachment.TOP,
+                                               BUBBLE_OFFSET, BUBBLE_PADDING);
+      }
+
       $('accessibility-menu').firstBubbleElement = $('spoken-feedback');
       $('accessibility-menu').lastBubbleElement = $('close-accessibility-menu');
       if (Oobe.getInstance().currentScreen &&