Chromium Code Reviews| Index: chrome/browser/resources/settings/about_page/about_page.js |
| diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js |
| index dc61dbb1f5cc056455c123503d309d6fad3174e5..529455f4f98e352a1b5ed4aece4f245ab772f304 100644 |
| --- a/chrome/browser/resources/settings/about_page/about_page.js |
| +++ b/chrome/browser/resources/settings/about_page/about_page.js |
| @@ -170,7 +170,15 @@ Polymer({ |
| progressPercent); |
|
Dan Beam
2016/11/09 21:21:13
i don't really care much about making a non-percen
|
| } |
| </if> |
| - return this.i18n('aboutUpgradeUpdating', progressPercent); |
| + if (this.currentUpdateStatusEvent_.progress > 0) { |
| + // NOTE(dbeam): some platforms (i.e. Mac) always send 0% while |
| + // updating (they don't support incremental upgrade progress). Though |
| + // it's certainly quite possible to validly end up here with 0% on |
| + // platforms that support incremental progress, nobody really likes |
| + // seeing that they're 0% done with something. |
| + return this.i18n('aboutUpgradeUpdatingPercent', progressPercent); |
| + } |
| + return this.i18n('aboutUpgradeUpdating'); |
| default: |
| var message = this.currentUpdateStatusEvent_.message; |
| return message ? |