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 3977d51116cc3e859943eb0d43f55361982f6a0f..c6ac824f3d490dfc3901ce006c93c446ca94ff29 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_screen_network.js |
| +++ b/chrome/browser/resources/chromeos/login/oobe_screen_network.js |
| @@ -97,6 +97,7 @@ login.createScreen('NetworkScreen', 'connect', function() { |
| }, |
| onBeforeShow: function(data) { |
| + this.respectMDMode_(); |
| cr.ui.DropDown.show('networks-list', true, -1); |
| this.classList.toggle('connect-debugging-view', |
| data && 'isDeveloperMode' in data && data['isDeveloperMode']); |
| @@ -155,7 +156,35 @@ login.createScreen('NetworkScreen', 'connect', function() { |
| $('bubble').showContentForElement($('networks-list'), |
| cr.ui.Bubble.Attachment.BOTTOM, |
| error); |
| - } |
| + }, |
| + |
| + /** |
| + * This is called after resources are updated. |
| + */ |
| + updateLocalizedContent: function() { |
| + this.respectMDMode_(); |
| + }, |
| + |
| + /** |
| + * This method takes care of switching to material-design OOBE. |
| + * @private |
| + */ |
| + respectMDMode_: function() { |
|
achuithb
2016/09/01 22:47:20
Can we use a different name to avoid confusion dur
Alexander Alekseev
2016/09/01 23:01:40
Done.
|
| + var useMDOobe = (loadTimeData.getString('newOobeUI') == 'on'); |
| + |
| + $('oobe-connect').hidden = useMDOobe; |
| + $('oobe-welcome-md').hidden = !useMDOobe; |
| + |
| + if (useMDOobe) { |
| + var welcomeScreen = $('oobe-welcome-md'); |
| + var languageList = loadTimeData.getValue('languageList'); |
| + welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList); |
| + welcomeScreen.languages = languageList; |
| + |
| + welcomeScreen.keyboards = loadTimeData.getValue('inputMethodsList'); |
| + welcomeScreen.enabled = true; |
| + } |
| + }, |
| }; |
| }); |