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

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

Issue 2189733006: ChromeOS: Implement Language Selection screen of material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. 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 729a695c31f9ce777e6f29f5290f2413d3636358..3a9a4bcc68a33d8be5e8ca070a22daa29b076785 100644
--- a/chrome/browser/resources/chromeos/login/oobe.js
+++ b/chrome/browser/resources/chromeos/login/oobe.js
@@ -305,12 +305,17 @@ cr.define('cr.ui.Oobe', function() {
Oobe.setupSelect($('timezone-select'), data.timezoneList);
// ---------- Welcome screen
- $('oobe-welcome-md').currentLanguage =
- Oobe.getSelectedTitle(data.languageList);
-
if (data.newOobeUI == 'on') {
michaelpg 2016/08/04 07:56:45 We know at startup whether or not the md-oobe flag
+ var welcomeScreen = $('oobe-welcome-md');
+ welcomeScreen.currentLanguage =
+ Oobe.getSelectedTitle(data.languageList);
+ welcomeScreen.languages = data.languageList;
+
+ welcomeScreen.keyboards = data.inputMethodsList;
+
$('oobe-connect').hidden = true;
- $('oobe-welcome-md').hidden = false;
+ welcomeScreen.hidden = false;
+ welcomeScreen.enabled = true;
michaelpg 2016/08/04 07:56:45 I guess I would say if we want to enable/disable t
} else {
$('oobe-connect').hidden = false;
$('oobe-welcome-md').hidden = true;

Powered by Google App Engine
This is Rietveld 408576698