| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * @fileoverview Oobe network screen implementation. | 6 * @fileoverview Oobe network screen implementation. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 login.createScreen('NetworkScreen', 'connect', function() { | 9 login.createScreen('NetworkScreen', 'connect', function() { |
| 10 var USER_ACTION_CONTINUE_BUTTON_CLICKED = 'continue'; | 10 var USER_ACTION_CONTINUE_BUTTON_CLICKED = 'continue'; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 Oobe.setupSelect($('timezone-select'), | 36 Oobe.setupSelect($('timezone-select'), |
| 37 loadTimeData.getValue('timezoneList'), | 37 loadTimeData.getValue('timezoneList'), |
| 38 this.onTimezoneSelected_.bind(this)); | 38 this.onTimezoneSelected_.bind(this)); |
| 39 | 39 |
| 40 // ---------- Welcome screen | 40 // ---------- Welcome screen |
| 41 var welcomeScreen = $('oobe-welcome-md'); | 41 var welcomeScreen = $('oobe-welcome-md'); |
| 42 welcomeScreen.screen = this; | 42 welcomeScreen.screen = this; |
| 43 | 43 |
| 44 var languageList = loadTimeData.getValue('languageList'); | 44 var languageList = loadTimeData.getValue('languageList'); |
| 45 welcomeScreen.languages = languageList; | 45 welcomeScreen.languages = languageList; |
| 46 welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList); | |
| 47 | 46 |
| 48 var inputMethodsList = loadTimeData.getValue('inputMethodsList'); | 47 var inputMethodsList = loadTimeData.getValue('inputMethodsList'); |
| 49 welcomeScreen.keyboards = inputMethodsList; | 48 welcomeScreen.keyboards = inputMethodsList; |
| 50 | 49 |
| 51 var timezoneList = loadTimeData.getValue('timezoneList'); | 50 var timezoneList = loadTimeData.getValue('timezoneList'); |
| 52 welcomeScreen.timezones = timezoneList; | 51 welcomeScreen.timezones = timezoneList; |
| 53 | 52 |
| 54 welcomeScreen.highlightStrength = | 53 welcomeScreen.highlightStrength = |
| 55 loadTimeData.getValue('highlightStrength'); | 54 loadTimeData.getValue('highlightStrength'); |
| 56 // ------------------------- | 55 // ------------------------- |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 */ | 176 */ |
| 178 setMDMode_: function() { | 177 setMDMode_: function() { |
| 179 var useMDOobe = (loadTimeData.getString('newOobeUI') == 'on'); | 178 var useMDOobe = (loadTimeData.getString('newOobeUI') == 'on'); |
| 180 | 179 |
| 181 $('oobe-connect').hidden = useMDOobe; | 180 $('oobe-connect').hidden = useMDOobe; |
| 182 $('oobe-welcome-md').hidden = !useMDOobe; | 181 $('oobe-welcome-md').hidden = !useMDOobe; |
| 183 | 182 |
| 184 if (useMDOobe) { | 183 if (useMDOobe) { |
| 185 var welcomeScreen = $('oobe-welcome-md'); | 184 var welcomeScreen = $('oobe-welcome-md'); |
| 186 var languageList = loadTimeData.getValue('languageList'); | 185 var languageList = loadTimeData.getValue('languageList'); |
| 187 welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList); | |
| 188 welcomeScreen.languages = languageList; | 186 welcomeScreen.languages = languageList; |
| 189 | 187 |
| 190 welcomeScreen.keyboards = loadTimeData.getValue('inputMethodsList'); | 188 welcomeScreen.keyboards = loadTimeData.getValue('inputMethodsList'); |
| 191 welcomeScreen.enabled = true; | 189 welcomeScreen.enabled = true; |
| 192 | 190 |
| 193 var timezoneList = loadTimeData.getValue('timezoneList'); | 191 var timezoneList = loadTimeData.getValue('timezoneList'); |
| 194 welcomeScreen.timezones = timezoneList; | 192 welcomeScreen.timezones = timezoneList; |
| 195 | 193 |
| 196 welcomeScreen.highlightStrength = | 194 welcomeScreen.highlightStrength = |
| 197 loadTimeData.getValue('highlightStrength'); | 195 loadTimeData.getValue('highlightStrength'); |
| 198 } | 196 } |
| 199 }, | 197 }, |
| 200 }; | 198 }; |
| 201 }); | 199 }); |
| 202 | 200 |
| OLD | NEW |