Chromium Code Reviews| 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..7f6f014a16aa7c86b2deef24b098f152ca0d54d6 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,25 @@ cr.define('cr.ui.Oobe', function() { |
| }); |
| } |
| }, |
| + /** |
|
jdufault
2016/05/20 18:27:27
nit: newline above here
Alexander Alekseev
2016/05/24 00:38:45
Done.
|
| + * Returns title of the selected option (see setupSelect() above). |
| + * @param {!Object} - the same as in setupSelect() above. |
|
jdufault
2016/05/20 18:27:26
replace "-" with "list".
Alexander Alekseev
2016/05/24 00:38:45
Done.
|
| + */ |
| + getSelectedTitle: function(list) { |
|
jdufault
2016/05/20 18:27:26
Do the items in |list| store any interesting data
Alexander Alekseev
2016/05/24 00:38:45
It also contains data to setup input element, but
|
| + var firstTitle = ''; |
| + 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; |
| + } |
| + return firstTitle; |
| + }, |
| /** |
| * Initializes the OOBE flow. This will cause all C++ handlers to |
| @@ -281,6 +303,19 @@ cr.define('cr.ui.Oobe', function() { |
| Oobe.setupSelect($('keyboard-select'), data.inputMethodsList); |
| Oobe.setupSelect($('timezone-select'), data.timezoneList); |
| + // ---------- Welcome screen |
| + $('oobe-welcome-md').currentLanguage = |
| + Oobe.getSelectedTitle(data.languageList); |
| + |
| + if (data.newOobeUI == 'on') { |
| + $('oobe-connect').hidden = true; |
| + $('oobe-welcome-md').hidden = false; |
| + } else { |
| + $('oobe-connect').hidden = false; |
| + $('oobe-welcome-md').hidden = true; |
| + } |
| + // ---------- |
| + |
| // Update localized content of the screens. |
| Oobe.updateLocalizedContent(); |
| }, |