| Index: chrome/browser/resources/chromeos/login/oobe_welcome.js
|
| diff --git a/chrome/browser/resources/chromeos/login/oobe_welcome.js b/chrome/browser/resources/chromeos/login/oobe_welcome.js
|
| index 434a0965e48d5615b62f3e1f769e6f868fc5efa0..b0b048d0412a92c29b96ad55e1082d148d25280d 100644
|
| --- a/chrome/browser/resources/chromeos/login/oobe_welcome.js
|
| +++ b/chrome/browser/resources/chromeos/login/oobe_welcome.js
|
| @@ -19,11 +19,20 @@ Polymer({
|
| },
|
|
|
| /**
|
| + * Currently selected input method (display name).
|
| + */
|
| + currentKeyboard: {
|
| + type: String,
|
| + value: '',
|
| + },
|
| +
|
| + /**
|
| * List of languages for language selector dropdown.
|
| * @type {!Array<OobeTypes.LanguageDsc>}
|
| */
|
| languages: {
|
| type: Array,
|
| + observer: "onLanguagesChanged_",
|
| },
|
|
|
| /**
|
| @@ -32,6 +41,7 @@ Polymer({
|
| */
|
| keyboards: {
|
| type: Array,
|
| + observer: "onKeyboardsChanged_",
|
| },
|
|
|
| /**
|
| @@ -115,7 +125,7 @@ Polymer({
|
| isConnected_: {
|
| type: Boolean,
|
| value: false,
|
| - }
|
| + },
|
| },
|
|
|
| /** @override */
|
| @@ -390,6 +400,7 @@ Polymer({
|
| onLanguageSelected_: function(event) {
|
| var item = event.detail;
|
| var languageId = item.value;
|
| + this.currentLanguage = item.title;
|
| this.screen.onLanguageSelected_(languageId);
|
| },
|
|
|
| @@ -402,9 +413,18 @@ Polymer({
|
| onKeyboardSelected_: function(event) {
|
| var item = event.detail;
|
| var inputMethodId = item.value;
|
| + this.currentKeyboard = item.title;
|
| this.screen.onKeyboardSelected_(inputMethodId);
|
| },
|
|
|
| + onLanguagesChanged_: function() {
|
| + this.currentLanguage = Oobe.getSelectedTitle(this.languages);
|
| + },
|
| +
|
| + onKeyboardsChanged_: function() {
|
| + this.currentKeyboard = Oobe.getSelectedTitle(this.keyboards);
|
| + },
|
| +
|
| /**
|
| * Handle "OK" button for "LanguageSelection" screen.
|
| *
|
| @@ -465,4 +485,14 @@ Polymer({
|
|
|
| this.screen.onTimezoneSelected_(item.value);
|
| },
|
| +
|
| + /**
|
| + * This function formats message for labels.
|
| + * @param String label i18n string ID.
|
| + * @param String parameter i18n string parameter.
|
| + * @private
|
| + */
|
| + formatMessage_: function(label, parameter) {
|
| + return loadTimeData.getStringF(label, parameter);
|
| + },
|
| });
|
|
|