ChromeOS: Fix "continue OOBE on restart" screen size calculation.

chrome/browser/resources/chromeos/login/oobe.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 Out of the box experience flow (OOBE).
  * This is the main code for the OOBE WebUI implementation.
  */
 
 <include src="login_shared.js">
@@ skipping 72 matching lines @@
           return item.title;
       }
       return firstTitle;
     },
 
     /**
      * Initializes the OOBE flow.  This will cause all C++ handlers to
      * be invoked to do final setup.
      */
     initialize: function() {
+      this.setMDMode_();
       cr.ui.login.DisplayManager.initialize();
       login.HIDDetectionScreen.register();
       login.WrongHWIDScreen.register();
       login.NetworkScreen.register();
       login.EulaScreen.register();
       login.UpdateScreen.register();
       login.AutoEnrollmentCheckScreen.register();
       login.EnableDebuggingScreen.register();
       login.ResetScreen.register();
       login.AutolaunchScreen.register();
@@ skipping 197 matching lines @@
     reloadContent: function(data) {
       // Reload global local strings, process DOM tree again.
       loadTimeData.overrideValues(data);
       i18nTemplate.process(document, loadTimeData);
 
       // Update language and input method menu lists.
       Oobe.setupSelect($('language-select'), data.languageList);
       Oobe.setupSelect($('keyboard-select'), data.inputMethodsList);
       Oobe.setupSelect($('timezone-select'), data.timezoneList);
 
-      // ---------- MD OOBE screen
-      if (data.newOobeUI == 'on') {
-        // Welcome + etc...
-        var welcomeScreen = $('oobe-welcome-md');
-        welcomeScreen.currentLanguage =
-            Oobe.getSelectedTitle(data.languageList);
-        welcomeScreen.languages = data.languageList;
-
-        welcomeScreen.keyboards = data.inputMethodsList;
-
-        $('oobe-connect').hidden = true;
-        welcomeScreen.hidden = false;
-        welcomeScreen.enabled = true;
-        // EULA
-        $('oobe-poly-eula').hidden = false;
-        $('oobe-eula').hidden = true;
-        $('oobe').setAttribute('md-mode', 'true');
-      } else {
-        $('oobe-connect').hidden = false;
-        $('oobe-welcome-md').hidden = true;
-      }
-      // ----------
+      this.setMDMode_();
 
       // Update localized content of the screens.
       Oobe.updateLocalizedContent();
     },
 
     /**
      * Updates localized content of the screens.
      * Should be executed on language change.
      */
     updateLocalizedContent: function() {
       // Buttons, headers and links.
       Oobe.getInstance().updateLocalizedContent_();
     },
+
+    /**
+     * This method takes care of switching to material-design OOBE.
+     * @private
+     */
+    setMDMode_: function() {
+      if (loadTimeData.getString('newOobeUI') == 'on') {
+        $('oobe').setAttribute('md-mode', 'true');
+      } else {
+        $('oobe').removeAttribute('md-mode');
+      }
+    },
   };
 });