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

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

Issue 2302453002: ChromeOS: Fix "continue OOBE on restart" screen size calculation. (Closed)
Patch Set: Update after review Created 4 years, 3 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_screen_eula.js
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_eula.js b/chrome/browser/resources/chromeos/login/oobe_screen_eula.js
index 7e64c99abd9d3027ea0e334c7a4a4b39b5c58c84..ef6ca5d94d282d47828e3484b2570eb65da89a12 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_eula.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_eula.js
@@ -73,6 +73,7 @@ login.createScreen('EulaScreen', 'eula', function() {
* @param {object} data Screen init payload.
*/
onBeforeShow: function() {
+ this.setMDMode_();
$('eula').classList.add('eula-loading');
$('cros-eula-frame').onload = this.onFrameLoad;
$('accept-button').disabled = true;
@@ -134,9 +135,21 @@ login.createScreen('EulaScreen', 'eula', function() {
},
/**
+ * This method takes care of switching to material-design OOBE.
+ * @private
+ */
+ setMDMode_: function() {
+ var useMDOobe = (loadTimeData.getString('newOobeUI') == 'on');
+ $('oobe-eula-md').hidden = !useMDOobe;
+ $('oobe-eula').hidden = useMDOobe;
+ },
+
+ /**
* Updates localized content of the screen that is not updated via template.
*/
updateLocalizedContent: function() {
+ this.setMDMode_();
+
$('oobe-eula-md').updateLocalizedContent();
// Force iframes to refresh. It's only available method because we have
@@ -147,7 +160,7 @@ login.createScreen('EulaScreen', 'eula', function() {
if ($('oem-eula-frame').src) {
$('oem-eula-frame').src = $('oem-eula-frame').src;
}
- }
+ },
};
});

Powered by Google App Engine
This is Rietveld 408576698