Made small refactoring of OobeUI.

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';
@@ skipping 35 matching lines @@
 };
 
 /* Possible UI states of the error screen. */
 /** @const */ var ERROR_SCREEN_UI_STATE = {
   UNKNOWN: 'ui-state-unknown',
   UPDATE: 'ui-state-update',
   SIGNIN: 'ui-state-signin',
   MANAGED_USER_CREATION_FLOW: 'ui-state-locally-managed'
 };
 
+/* Possible types of UI. */
+/** @const */ var DISPLAY_TYPE = {
+  UNKNOWN: 'unknown',
+  OOBE: 'oobe',
+  LOGIN: 'login',
+  LOCK: 'lock',
+  USER_ADDING: 'user-adding'
+};
+
 cr.define('cr.ui.login', function() {
   var Bubble = cr.ui.Bubble;
 
   /**
    * Groups of screens (screen IDs) that should have the same dimensions.
    * @type Array.<Array.<string>>
    * @const
    */
   var SCREEN_GROUPS = [[SCREEN_OOBE_NETWORK,
                         SCREEN_OOBE_EULA,
@@ skipping 27 matching lines @@
      */
     allowToggleVersion_: false,
 
     /**
      * Whether keyboard navigation flow is enforced.
      * @type {boolean}
      */
     forceKeyboardFlow_: false,
 
     /**
+     * Type of UI.
+     * @type {boolean}

[ygorshenin1, 2013/07/30 15:06:34]

nit: maybe string instead of boolean?

[dzhioev (left Google), 2013/07/30 16:18:55]

Done.

+     */
+    displayType_: DISPLAY_TYPE.UNKNOWN,
+
+    get displayType() {
+      return this.displayType_;
+    },
+
+    set displayType(displayType) {
+      this.displayType_ = displayType;
+    },
+
+    /**
      * Gets current screen element.
      * @type {HTMLElement}
      */
     get currentScreen() {
       return $(this.screens_[this.currentStep_]);
     },
 
     /**
      * Hides/shows header (Shutdown/Add User/Cancel buttons).
      * @param {boolean} hidden Whether header is hidden.
@@ skipping 197 matching lines @@
             if (defaultControl)
               defaultControl.focus();
           });
         } else {
           oldStep.classList.add('hidden');
           if (defaultControl)
             defaultControl.focus();
         }
       } else {
         // First screen on OOBE launch.
-        if (document.body.classList.contains('oobe-display') &&
-            innerContainer.classList.contains('down')) {
+        if (this.isOobeUI() && innerContainer.classList.contains('down')) {
           innerContainer.classList.remove('down');
           innerContainer.addEventListener(
               'webkitTransitionEnd', function f(e) {
                 innerContainer.removeEventListener('webkitTransitionEnd', f);
                 $('progress-dots').classList.remove('down');
                 chrome.send('loginVisible', ['oobe']);
                 // Refresh defaultControl. It could have changed.
                 var defaultControl = newStep.defaultControl;
                 if (defaultControl)
                   defaultControl.focus();
               });
         } else {
           if (defaultControl)
             defaultControl.focus();
         }
-        newHeader.classList.remove('right');  // Old OOBE.
       }
       this.currentStep_ = nextStepIndex;
       $('oobe').className = nextStepId;
 
       $('step-logo').hidden = newStep.classList.contains('no-logo');
 
       chrome.send('updateCurrentScreen', [this.currentScreen.id]);
     },
 
     /**
@@ skipping 176 matching lines @@
      * @param {string} requisition The device requisition.
      */
     updateDeviceRequisition: function(requisition) {
       this.deviceRequisition_ = requisition;
     },
 
     /**
      * Returns true if Oobe UI is shown.
      */
     isOobeUI: function() {
-      return !document.body.classList.contains('login-display');
+      return document.body.classList.contains('oobe-display');
     },
 
     /**
-     * Returns true if the current UI type is the "Sign-in to add user"
-     * (another user session is already active).
-     */
-    isSignInToAddScreen: function() {
-      return document.documentElement.getAttribute('screen') ==
-          'user-adding';
-    },
-
-    /**
-     * Returns true if the current UI type is the lock screen.
-     */
-    isLockScreen: function() {
-      return document.documentElement.getAttribute('screen') == 'lock';
-    },
-
-    /**
      * Returns true if sign in UI should trigger wallpaper load on boot.
      */
     shouldLoadWallpaperOnBoot: function() {
       return loadTimeData.getString('bootIntoWallpaper') == 'on';
     },
   };
 
   /**
    * Initializes display manager.
    */
   DisplayManager.initialize = function() {
-    // Extracting screen type from URL.
-    var hash = window.location.hash;
-    var screenType;
-    if (!hash) {
-      console.error('Screen type not found. Setting default value "login".');
-      screenType = 'login';
-    } else {
-      screenType = hash.substring(1);
+    // Extracting display type from URL.
+    var path = window.location.pathname.substr(1);
+    var displayType = DISPLAY_TYPE.UNKNOWN;
+    Object.getOwnPropertyNames(DISPLAY_TYPE).forEach(function(type) {
+      if (DISPLAY_TYPE[type] == path) {
+        displayType = path;
+      }
+    });
+    if (displayType == DISPLAY_TYPE.UNKNOWN) {
+      console.error("Unknown display type '" + path + "'. Setting default.");
+      displayType = DISPLAY_TYPE.LOGIN;
     }
-    document.documentElement.setAttribute('screen', screenType);
+    Oobe.getInstance().displayType = displayType;
+    document.documentElement.setAttribute('screen', displayType);
 
     var link = $('enterprise-info-hint-link');
     link.addEventListener(
         'click', DisplayManager.handleEnterpriseHintLinkClick);
   },
 
   /**
    * Returns offset (top, left) of the element.
    * @param {!Element} element HTML element.
    * @return {!Object} The offset (top, left).
@@ skipping 172 matching lines @@
    */
   DisplayManager.refocusCurrentPod = function() {
     $('pod-row').refocusCurrentPod();
   };
 
   // Export
   return {
     DisplayManager: DisplayManager
   };
 });