Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(595)

Side by Side Diff: chrome/browser/resources/settings/about_page/about_page.js

Issue 2325193002: MD Settings/About: Implement update progress percentage (Closed)
Patch Set: fix tests Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/test/data/webui/settings/about_page_tests.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 if (this.currentChannel_ != this.targetChannel_) 156 if (this.currentChannel_ != this.targetChannel_)
157 return this.i18n('aboutUpgradeSuccessChannelSwitch'); 157 return this.i18n('aboutUpgradeSuccessChannelSwitch');
158 </if> 158 </if>
159 return this.i18n('aboutUpgradeRelaunch'); 159 return this.i18n('aboutUpgradeRelaunch');
160 case UpdateStatus.UPDATED: 160 case UpdateStatus.UPDATED:
161 return this.i18n('aboutUpgradeUpToDate'); 161 return this.i18n('aboutUpgradeUpToDate');
162 case UpdateStatus.UPDATING: 162 case UpdateStatus.UPDATING:
163 <if expr="chromeos"> 163 <if expr="chromeos">
164 if (this.currentChannel_ != this.targetChannel_) { 164 if (this.currentChannel_ != this.targetChannel_) {
165 return this.i18n('aboutUpgradeUpdatingChannelSwitch', 165 return this.i18n('aboutUpgradeUpdatingChannelSwitch',
166 this.i18n(settings.browserChannelToI18nId(this.targetChannel_))); 166 this.i18n(settings.browserChannelToI18nId(this.targetChannel_)));
hcarmona 2016/09/09 21:51:52 Does changing the channel also need a progress per
Dan Beam 2016/09/10 00:56:02 Done. (thanks!)
167 } 167 }
168 </if> 168 </if>
169 return this.i18n('aboutUpgradeUpdating'); 169 assert(typeof this.currentUpdateStatusEvent_.progress == 'number');
170 return this.i18n('aboutUpgradeUpdating',
171 this.currentUpdateStatusEvent_.progress + '%');
170 default: 172 default:
171 var message = this.currentUpdateStatusEvent_.message; 173 var message = this.currentUpdateStatusEvent_.message;
172 return message ? 174 return message ?
173 parseHtmlSubset('<b>' + message + '</b>').firstChild.innerHTML : 175 parseHtmlSubset('<b>' + message + '</b>').firstChild.innerHTML :
174 ''; 176 '';
175 } 177 }
176 }, 178 },
177 179
178 /** 180 /**
179 * @return {?string} 181 * @return {?string}
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 }, 281 },
280 </if> 282 </if>
281 283
282 <if expr="_google_chrome"> 284 <if expr="_google_chrome">
283 /** @private */ 285 /** @private */
284 onReportIssueTap_: function() { 286 onReportIssueTap_: function() {
285 this.aboutBrowserProxy_.openFeedbackDialog(); 287 this.aboutBrowserProxy_.openFeedbackDialog();
286 }, 288 },
287 </if> 289 </if>
288 }); 290 });
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/test/data/webui/settings/about_page_tests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698