Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1982)

Unified Diff: chrome/browser/resources/chromeos/login/oobe.js

Issue 2302453002: ChromeOS: Fix "continue OOBE on restart" screen size calculation. (Closed)
Patch Set: Bugfix Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/login/oobe.js
diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js
index a5d20a54d7c6cd4d5f5b010741f26cdfaf1d5e0f..0e763943516974c340e916d2bfa79484e34ac5be 100644
--- a/chrome/browser/resources/chromeos/login/oobe.js
+++ b/chrome/browser/resources/chromeos/login/oobe.js
@@ -90,6 +90,7 @@ cr.define('cr.ui.Oobe', function() {
* be invoked to do final setup.
*/
initialize: function() {
+ this.respectMDMode_();
cr.ui.login.DisplayManager.initialize();
login.HIDDetectionScreen.register();
login.WrongHWIDScreen.register();
@@ -308,26 +309,7 @@ cr.define('cr.ui.Oobe', function() {
Oobe.setupSelect($('timezone-select'), data.timezoneList);
// ---------- MD OOBE screen
achuithb 2016/09/01 22:47:20 Do you still need this comment?
Alexander Alekseev 2016/09/01 23:01:40 Done.
- 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.respectMDMode_();
// ----------
// Update localized content of the screens.
@@ -342,5 +324,17 @@ cr.define('cr.ui.Oobe', function() {
// Buttons, headers and links.
Oobe.getInstance().updateLocalizedContent_();
},
+
+ /**
+ * This method takes care of switching to material-design OOBE.
+ * @private
+ */
+ respectMDMode_: function() {
achuithb 2016/09/01 22:47:20 Better name? SetMDMode_? SwitchMDMode_?
Alexander Alekseev 2016/09/01 23:01:40 Done.
+ if (loadTimeData.getString('newOobeUI') == 'on') {
+ $('oobe').setAttribute('md-mode', 'true');
+ } else {
+ $('oobe').removeAttribute('md-mode');
+ }
+ },
};
});

Powered by Google App Engine
This is Rietveld 408576698