Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 Polymer element for displaying material design OOBE. | 6 * @fileoverview Polymer element for displaying material design OOBE. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 Polymer({ | 9 Polymer({ |
| 10 is: 'oobe-welcome-md', | 10 is: 'oobe-welcome-md', |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 339 this.networkLastSelectedGuid_ = state.GUID; | 339 this.networkLastSelectedGuid_ = state.GUID; |
| 340 | 340 |
| 341 var self = this; | 341 var self = this; |
| 342 var networkStateCopy = Object.assign({}, state); | 342 var networkStateCopy = Object.assign({}, state); |
| 343 | 343 |
| 344 chrome.networkingPrivate.startConnect(state.GUID, function() { | 344 chrome.networkingPrivate.startConnect(state.GUID, function() { |
| 345 var lastError = chrome.runtime.lastError; | 345 var lastError = chrome.runtime.lastError; |
| 346 if (!lastError) | 346 if (!lastError) |
| 347 return; | 347 return; |
| 348 | 348 |
| 349 if (lastError.message == 'connected') { | 349 if (lastError.message == 'connected') |
|
stevenjb
2017/02/21 17:54:41
nit: This could now be == 'connected' || == 'conne
Alexander Alekseev
2017/02/21 22:03:57
Done.
| |
| 350 self.onNetworkConnected_({'detail': networkStateCopy}); | |
| 351 return; | 350 return; |
| 352 } | |
| 353 | 351 |
| 354 if (lastError.message != 'connecting') | 352 if (lastError.message != 'connecting') |
| 355 console.error('networkingPrivate.startConnect error: ' + lastError); | 353 console.error('networkingPrivate.startConnect error: ' + lastError); |
| 356 }); | 354 }); |
| 357 }, | 355 }, |
| 358 | 356 |
| 359 /** | 357 /** |
| 360 * @param {!Event} event | 358 * @param {!Event} event |
| 361 * @private | 359 * @private |
| 362 */ | 360 */ |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 470 /** | 468 /** |
| 471 * This function formats message for labels. | 469 * This function formats message for labels. |
| 472 * @param String label i18n string ID. | 470 * @param String label i18n string ID. |
| 473 * @param String parameter i18n string parameter. | 471 * @param String parameter i18n string parameter. |
| 474 * @private | 472 * @private |
| 475 */ | 473 */ |
| 476 formatMessage_: function(label, parameter) { | 474 formatMessage_: function(label, parameter) { |
| 477 return loadTimeData.getStringF(label, parameter); | 475 return loadTimeData.getStringF(label, parameter); |
| 478 }, | 476 }, |
| 479 }); | 477 }); |
| OLD | NEW |