Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/oobe_screen_network.js |
| diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_network.js b/chrome/browser/resources/chromeos/login/oobe_screen_network.js |
| index bba9c38824784f6b889e1bd8ff050631c19f5095..360400b439f7549c3764b1ab578cb52d125d534e 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_screen_network.js |
| +++ b/chrome/browser/resources/chromeos/login/oobe_screen_network.js |
| @@ -32,23 +32,31 @@ login.createScreen('NetworkScreen', 'connect', function() { |
| Oobe.setupSelect($('language-select'), |
| loadTimeData.getValue('languageList'), |
| function(languageId) { |
|
michaelpg
2016/08/02 00:06:38
optional: this.onLanguageSelected_.bind(this)
Alexander Alekseev
2016/08/02 04:25:57
Done.
|
| - self.context.set(CONTEXT_KEY_LOCALE, languageId); |
| - self.commitContextChanges(); |
| + self.onLanguageSelected_(languageId); |
| }); |
| Oobe.setupSelect($('keyboard-select'), |
| loadTimeData.getValue('inputMethodsList'), |
| function(inputMethodId) { |
| - self.context.set(CONTEXT_KEY_INPUT_METHOD, |
| - inputMethodId); |
| - self.commitContextChanges(); |
| + self.onKeyboardSelected_(inputMethodId); |
|
michaelpg
2016/08/02 00:06:38
same
Alexander Alekseev
2016/08/02 04:25:57
Done.
|
| }); |
| Oobe.setupSelect($('timezone-select'), |
| loadTimeData.getValue('timezoneList'), |
| function(timezoneId) { |
|
michaelpg
2016/08/02 00:06:38
same
Alexander Alekseev
2016/08/02 04:25:57
Done.
|
| - self.context.set(CONTEXT_KEY_TIMEZONE, timezoneId); |
| - self.commitContextChanges(); |
| + self.onTimezoneSelected_(timezoneId); |
| }); |
| + // ---------- Welcome screen |
| + var welcomeScreen = $('oobe-welcome-md'); |
| + welcomeScreen.screen = this; |
| + |
| + var languageList = loadTimeData.getValue('languageList'); |
| + welcomeScreen.languages = languageList; |
| + welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList); |
| + |
| + var inputMethodsList = loadTimeData.getValue('inputMethodsList'); |
| + welcomeScreen.keyboards = inputMethodsList; |
| + // ------------------------- |
| + |
| this.dropdown_ = $('networks-list'); |
| cr.ui.DropDown.decorate(this.dropdown_); |
| @@ -81,6 +89,21 @@ login.createScreen('NetworkScreen', 'connect', function() { |
| }); |
| }, |
| + onLanguageSelected_: function(languageId) { |
| + this.context.set(CONTEXT_KEY_LOCALE, languageId); |
| + this.commitContextChanges(); |
| + }, |
| + |
| + onKeyboardSelected_: function(inputMethodId) { |
| + this.context.set(CONTEXT_KEY_INPUT_METHOD, inputMethodId); |
| + this.commitContextChanges(); |
| + }, |
| + |
| + onTimezoneSelected_: function(timezoneId) { |
| + this.context.set(CONTEXT_KEY_TIMEZONE, timezoneId); |
| + this.commitContextChanges(); |
| + }, |
| + |
| onBeforeShow: function(data) { |
| cr.ui.DropDown.show('networks-list', true, -1); |
| this.classList.toggle('connect-debugging-view', |