| 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 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 this.networkLastSelectedGuid_ = state.GUID; | 359 this.networkLastSelectedGuid_ = state.GUID; |
| 360 | 360 |
| 361 var self = this; | 361 var self = this; |
| 362 var networkStateCopy = Object.assign({}, state); | 362 var networkStateCopy = Object.assign({}, state); |
| 363 | 363 |
| 364 chrome.networkingPrivate.startConnect(state.GUID, function() { | 364 chrome.networkingPrivate.startConnect(state.GUID, function() { |
| 365 var lastError = chrome.runtime.lastError; | 365 var lastError = chrome.runtime.lastError; |
| 366 if (!lastError) | 366 if (!lastError) |
| 367 return; | 367 return; |
| 368 | 368 |
| 369 if (lastError.message == 'connected') { | 369 if (lastError.message == 'connected' || lastError.message == 'connecting') |
| 370 self.onNetworkConnected_({'detail': networkStateCopy}); | |
| 371 return; | 370 return; |
| 372 } | |
| 373 | 371 |
| 374 if (lastError.message != 'connecting') | 372 console.error('networkingPrivate.startConnect error: ' + lastError); |
| 375 console.error('networkingPrivate.startConnect error: ' + lastError); | |
| 376 }); | 373 }); |
| 377 }, | 374 }, |
| 378 | 375 |
| 379 /** | 376 /** |
| 380 * @param {!Event} event | 377 * @param {!Event} event |
| 381 * @private | 378 * @private |
| 382 */ | 379 */ |
| 383 onNetworkListCustomItemSelected_: function(e) { | 380 onNetworkListCustomItemSelected_: function(e) { |
| 384 var itemState = e.detail; | 381 var itemState = e.detail; |
| 385 itemState.customData.onTap(); | 382 itemState.customData.onTap(); |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 /** | 491 /** |
| 495 * This function formats message for labels. | 492 * This function formats message for labels. |
| 496 * @param String label i18n string ID. | 493 * @param String label i18n string ID. |
| 497 * @param String parameter i18n string parameter. | 494 * @param String parameter i18n string parameter. |
| 498 * @private | 495 * @private |
| 499 */ | 496 */ |
| 500 formatMessage_: function(label, parameter) { | 497 formatMessage_: function(label, parameter) { |
| 501 return loadTimeData.getStringF(label, parameter); | 498 return loadTimeData.getStringF(label, parameter); |
| 502 }, | 499 }, |
| 503 }); | 500 }); |
| OLD | NEW |