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