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

Unified Diff: chrome/browser/resources/settings/about_page/about_page.js

Issue 2538043006: Settings: About: Fix cros channel info. (Closed)
Patch Set: Fix non cros tests Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/about_page/about_page_browser_proxy.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 23519b1f0260cc93d0bf00bffba604ea070dd1cb..48690252efb6827f63e5c9cfd90df6c9b01bc73d 100644
--- a/chrome/browser/resources/settings/about_page/about_page.js
+++ b/chrome/browser/resources/settings/about_page/about_page.js
@@ -83,7 +83,8 @@ Polymer({
'updateShowUpdateStatus_(' +
'obsoleteSystemInfo_, currentUpdateStatusEvent_,' +
'hasCheckedForUpdates_)',
- 'updateShowRelaunch_(currentUpdateStatusEvent_, targetChannel_)',
+ 'updateShowRelaunch_(currentUpdateStatusEvent_, targetChannel_,' +
+ 'currentChannel_)',
'updateShowButtonContainer_(' +
'showRelaunch_, showRelaunchAndPowerwash_, showCheckUpdates_)',
</if>
@@ -109,13 +110,9 @@ Polymer({
this.targetChannel_ = e.detail;
}.bind(this));
- Promise.all([
- this.aboutBrowserProxy_.getCurrentChannel(),
- this.aboutBrowserProxy_.getTargetChannel(),
- ]).then(function(channels) {
- this.currentChannel_ = channels[0];
- this.targetChannel_ = channels[1];
-
+ this.aboutBrowserProxy_.getChannelInfo().then(function(info) {
+ this.currentChannel_ = info.currentChannel;
+ this.targetChannel_ = info.targetChannel;
this.startListening_();
}.bind(this));
« no previous file with comments | « no previous file | chrome/browser/resources/settings/about_page/about_page_browser_proxy.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698