| 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 29 matching lines...) Expand all Loading... |
| 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); | 46 welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList); |
| 47 | 47 |
| 48 var inputMethodsList = loadTimeData.getValue('inputMethodsList'); | 48 var inputMethodsList = loadTimeData.getValue('inputMethodsList'); |
| 49 welcomeScreen.keyboards = inputMethodsList; | 49 welcomeScreen.keyboards = inputMethodsList; |
| 50 |
| 51 var timezoneList = loadTimeData.getValue('timezoneList'); |
| 52 welcomeScreen.timezones = timezoneList; |
| 53 |
| 54 welcomeScreen.highlightStrength = |
| 55 loadTimeData.getValue('highlightStrength'); |
| 50 // ------------------------- | 56 // ------------------------- |
| 51 | 57 |
| 52 this.dropdown_ = $('networks-list'); | 58 this.dropdown_ = $('networks-list'); |
| 53 cr.ui.DropDown.decorate(this.dropdown_); | 59 cr.ui.DropDown.decorate(this.dropdown_); |
| 54 | 60 |
| 55 this.declareUserAction( | 61 this.declareUserAction( |
| 56 $('connect-debugging-features-link'), | 62 $('connect-debugging-features-link'), |
| 57 { action_id: USER_ACTION_CONNECT_DEBUGGING_FEATURES_CLICKED, | 63 { action_id: USER_ACTION_CONNECT_DEBUGGING_FEATURES_CLICKED, |
| 58 event: 'click' | 64 event: 'click' |
| 59 }); | 65 }); |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 $('oobe-welcome-md').hidden = !useMDOobe; | 182 $('oobe-welcome-md').hidden = !useMDOobe; |
| 177 | 183 |
| 178 if (useMDOobe) { | 184 if (useMDOobe) { |
| 179 var welcomeScreen = $('oobe-welcome-md'); | 185 var welcomeScreen = $('oobe-welcome-md'); |
| 180 var languageList = loadTimeData.getValue('languageList'); | 186 var languageList = loadTimeData.getValue('languageList'); |
| 181 welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList); | 187 welcomeScreen.currentLanguage = Oobe.getSelectedTitle(languageList); |
| 182 welcomeScreen.languages = languageList; | 188 welcomeScreen.languages = languageList; |
| 183 | 189 |
| 184 welcomeScreen.keyboards = loadTimeData.getValue('inputMethodsList'); | 190 welcomeScreen.keyboards = loadTimeData.getValue('inputMethodsList'); |
| 185 welcomeScreen.enabled = true; | 191 welcomeScreen.enabled = true; |
| 192 |
| 193 var timezoneList = loadTimeData.getValue('timezoneList'); |
| 194 welcomeScreen.timezones = timezoneList; |
| 195 |
| 196 welcomeScreen.highlightStrength = |
| 197 loadTimeData.getValue('highlightStrength'); |
| 186 } | 198 } |
| 187 }, | 199 }, |
| 188 }; | 200 }; |
| 189 }); | 201 }); |
| 190 | 202 |
| OLD | NEW |