| 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 'settings-about-page' contains version and OS related | 6 * @fileoverview 'settings-about-page' contains version and OS related |
| 7 * information. | 7 * information. |
| 8 */ | 8 */ |
| 9 Polymer({ | 9 Polymer({ |
| 10 is: 'settings-about-page', | 10 is: 'settings-about-page', |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 this.aboutBrowserProxy_.pageReady(); | 56 this.aboutBrowserProxy_.pageReady(); |
| 57 | 57 |
| 58 this.lifetimeBrowserProxy_ = | 58 this.lifetimeBrowserProxy_ = |
| 59 settings.LifetimeBrowserProxyImpl.getInstance(); | 59 settings.LifetimeBrowserProxyImpl.getInstance(); |
| 60 | 60 |
| 61 <if expr="chromeos"> | 61 <if expr="chromeos"> |
| 62 this.addEventListener('target-channel-changed', function(e) { | 62 this.addEventListener('target-channel-changed', function(e) { |
| 63 this.targetChannel_ = e.detail; | 63 this.targetChannel_ = e.detail; |
| 64 }.bind(this)); | 64 }.bind(this)); |
| 65 | 65 |
| 66 Promise.all([ | 66 this.aboutBrowserProxy_.getChannelInfo().then(function(info) { |
| 67 this.aboutBrowserProxy_.getCurrentChannel(), | 67 this.currentChannel_ = info.currentChannel; |
| 68 this.aboutBrowserProxy_.getTargetChannel(), | 68 this.targetChannel_ = info.targetChannel; |
| 69 ]).then(function(channels) { | |
| 70 this.currentChannel_ = channels[0]; | |
| 71 this.targetChannel_ = channels[1]; | |
| 72 | |
| 73 this.startListening_(); | 69 this.startListening_(); |
| 74 }.bind(this)); | 70 }.bind(this)); |
| 75 | 71 |
| 76 this.aboutBrowserProxy_.getRegulatoryInfo().then(function(info) { | 72 this.aboutBrowserProxy_.getRegulatoryInfo().then(function(info) { |
| 77 this.regulatoryInfo_ = info; | 73 this.regulatoryInfo_ = info; |
| 78 }.bind(this)); | 74 }.bind(this)); |
| 79 </if> | 75 </if> |
| 80 <if expr="not chromeos"> | 76 <if expr="not chromeos"> |
| 81 this.startListening_(); | 77 this.startListening_(); |
| 82 </if> | 78 </if> |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 }); | 300 }); |
| 305 }, | 301 }, |
| 306 | 302 |
| 307 <if expr="_google_chrome"> | 303 <if expr="_google_chrome"> |
| 308 /** @private */ | 304 /** @private */ |
| 309 onReportIssueTap_: function() { | 305 onReportIssueTap_: function() { |
| 310 this.aboutBrowserProxy_.openFeedbackDialog(); | 306 this.aboutBrowserProxy_.openFeedbackDialog(); |
| 311 }, | 307 }, |
| 312 </if> | 308 </if> |
| 313 }); | 309 }); |
| OLD | NEW |