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

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

Issue 1965913005: ChromeOS: Implement minumal material design OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 06b62e4604ac808f4d9c25d440afc54a2624b2cf..ab7ae119fcb660c755c4bdd28c1c30b05885b4ab 100644
--- a/chrome/browser/resources/chromeos/login/oobe.js
+++ b/chrome/browser/resources/chromeos/login/oobe.js
@@ -28,6 +28,9 @@ cr.define('cr.ui.Oobe', function() {
* Elements with optionGroupName are considered option group.
* @param {string} callback Callback name which should be send to Chrome or
* an empty string if the event listener shouldn't be added.
+ *
+ * Note: do not forget to update getSelectedTitle() below if this is
+ * updated!
*/
setupSelect: function(select, list, callback) {
select.innerHTML = '';
@@ -61,6 +64,28 @@ cr.define('cr.ui.Oobe', function() {
});
}
},
+ /**
+ * Returns title of the selected option (see setupSelect() above).
+ * @param {!Object} - the same as in setupSelect() above.
+ */
+ getSelectedTitle: function(list) {
+ var firstTitle;
jdufault 2016/05/11 22:07:43 Initialize to '', and then after the for loop unco
Alexander Alekseev 2016/05/13 20:52:34 Done.
+ for (var i = 0; i < list.length; ++i) {
+ var item = list[i];
+ if (item.optionGroupName)
+ continue;
+
+ if (!firstTitle)
+ firstTitle = item.title;
+
+ if (item.selected)
+ return item.title;
+ }
+ if (firstTitle)
+ return firstTitle;
+
+ return '';
+ },
/**
* Initializes the OOBE flow. This will cause all C++ handlers to
@@ -281,6 +306,18 @@ cr.define('cr.ui.Oobe', function() {
Oobe.setupSelect($('keyboard-select'), data.inputMethodsList);
Oobe.setupSelect($('timezone-select'), data.timezoneList);
+ // ---------- Welcome screen
+ $('oobe-poly-welcome').SetOobePolyWelcomeCurrentLanguage(
jdufault 2016/05/11 22:07:43 Rename method call to SetCurrentLanguage? What abo
jdufault 2016/05/11 22:07:43 What about oobe-welcome-md?
Alexander Alekseev 2016/05/13 20:52:34 Done.
+ Oobe.getSelectedTitle(data.languageList));
+ if (data.mdOobeUI == 'on') {
+ $('oobe-classic-connect').hidden = true;
jdufault 2016/05/11 22:07:43 Just oobe-connect?
Alexander Alekseev 2016/05/13 20:52:34 Done.
+ $('oobe-poly-welcome').hidden = false;
+ } else {
+ $('oobe-classic-connect').hidden = false;
+ $('oobe-poly-welcome').hidden = true;
+ }
+ // ----------
+
// Update localized content of the screens.
Oobe.updateLocalizedContent();
},

Powered by Google App Engine
This is Rietveld 408576698