| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 continueButton.classList.add('preserve-disabled-state'); | 136 continueButton.classList.add('preserve-disabled-state'); |
| 137 buttons.push(continueButton); | 137 buttons.push(continueButton); |
| 138 | 138 |
| 139 return buttons; | 139 return buttons; |
| 140 }, | 140 }, |
| 141 | 141 |
| 142 /** | 142 /** |
| 143 * Returns a control which should receive an initial focus. | 143 * Returns a control which should receive an initial focus. |
| 144 */ | 144 */ |
| 145 get defaultControl() { | 145 get defaultControl() { |
| 146 if (loadTimeData.getString('newOobeUI') == 'on') |
| 147 return $('oobe-welcome-md'); |
| 148 |
| 146 return $('language-select'); | 149 return $('language-select'); |
| 147 }, | 150 }, |
| 148 | 151 |
| 149 /** | 152 /** |
| 150 * Shows the network error message. | 153 * Shows the network error message. |
| 151 * @param {string} message Message to be shown. | 154 * @param {string} message Message to be shown. |
| 152 */ | 155 */ |
| 153 showError: function(message) { | 156 showError: function(message) { |
| 154 var error = document.createElement('div'); | 157 var error = document.createElement('div'); |
| 155 var messageDiv = document.createElement('div'); | 158 var messageDiv = document.createElement('div'); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 var timezoneList = loadTimeData.getValue('timezoneList'); | 194 var timezoneList = loadTimeData.getValue('timezoneList'); |
| 192 welcomeScreen.timezones = timezoneList; | 195 welcomeScreen.timezones = timezoneList; |
| 193 | 196 |
| 194 welcomeScreen.highlightStrength = | 197 welcomeScreen.highlightStrength = |
| 195 loadTimeData.getValue('highlightStrength'); | 198 loadTimeData.getValue('highlightStrength'); |
| 196 } | 199 } |
| 197 }, | 200 }, |
| 198 }; | 201 }; |
| 199 }); | 202 }); |
| 200 | 203 |
| OLD | NEW |