| 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 return this.i18n('aboutUpgradeUpToDate'); | 169 return this.i18n('aboutUpgradeUpToDate'); |
| 170 case UpdateStatus.UPDATING: | 170 case UpdateStatus.UPDATING: |
| 171 <if expr="chromeos"> | 171 <if expr="chromeos"> |
| 172 if (this.currentChannel_ != this.targetChannel_) { | 172 if (this.currentChannel_ != this.targetChannel_) { |
| 173 return this.i18n('aboutUpgradeUpdatingChannelSwitch', | 173 return this.i18n('aboutUpgradeUpdatingChannelSwitch', |
| 174 this.i18n(settings.browserChannelToI18nId(this.targetChannel_))); | 174 this.i18n(settings.browserChannelToI18nId(this.targetChannel_))); |
| 175 } | 175 } |
| 176 </if> | 176 </if> |
| 177 return this.i18n('aboutUpgradeUpdating'); | 177 return this.i18n('aboutUpgradeUpdating'); |
| 178 default: | 178 default: |
| 179 return this.currentUpdateStatusEvent_.message || ''; | 179 var message = this.currentUpdateStatusEvent_.message; |
| 180 return message ? |
| 181 parseHtmlSubset('<b>' + message + '</b>').firstChild.innerHTML : |
| 182 ''; |
| 180 } | 183 } |
| 181 }, | 184 }, |
| 182 | 185 |
| 183 /** | 186 /** |
| 184 * @return {?string} | 187 * @return {?string} |
| 185 * @private | 188 * @private |
| 186 */ | 189 */ |
| 187 getIcon_: function() { | 190 getIcon_: function() { |
| 188 // If this platform has reached the end of the line, display an error icon | 191 // If this platform has reached the end of the line, display an error icon |
| 189 // and ignore UpdateStatus. | 192 // and ignore UpdateStatus. |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 }, | 287 }, |
| 285 </if> | 288 </if> |
| 286 | 289 |
| 287 <if expr="_google_chrome"> | 290 <if expr="_google_chrome"> |
| 288 /** @private */ | 291 /** @private */ |
| 289 onReportIssueTap_: function() { | 292 onReportIssueTap_: function() { |
| 290 this.aboutBrowserProxy_.openFeedbackDialog(); | 293 this.aboutBrowserProxy_.openFeedbackDialog(); |
| 291 }, | 294 }, |
| 292 </if> | 295 </if> |
| 293 }); | 296 }); |
| OLD | NEW |