Settings: About: Fix cros channel info.

chrome/browser/resources/settings/about_page/detailed_build_info.js

Index: chrome/browser/resources/settings/about_page/detailed_build_info.js
diff --git a/chrome/browser/resources/settings/about_page/detailed_build_info.js b/chrome/browser/resources/settings/about_page/detailed_build_info.js
index ab301700ec3036ca490badaaf5987f80ffab750f..685be3b44805e679540ff0278e4b765adba7ae3e 100644
--- a/chrome/browser/resources/settings/about_page/detailed_build_info.js
+++ b/chrome/browser/resources/settings/about_page/detailed_build_info.js
@@ -23,12 +23,7 @@ Polymer({
     showChannelSwitcherDialog_: Boolean,
 
     /** @private */
-    canChangeChannel_: {
-      type: Boolean,
-      value: function() {
-        return loadTimeData.getBoolean('aboutCanChangeChannel');
-      },
-    },
+    canChangeChannel_: Boolean,
   },
 
   /** @override */
@@ -39,10 +34,19 @@ Polymer({
     browserProxy.getVersionInfo().then(function(versionInfo) {
       this.versionInfo_ = versionInfo;
     }.bind(this));
-    browserProxy.getCurrentChannel().then(function(channel) {
+
+    this.updateChannelInfo_();
+  },
+
+  /** @private */
+  updateChannelInfo_: function() {
+    var browserProxy = settings.AboutPageBrowserProxyImpl.getInstance();
+    browserProxy.getChannelInfo().then(function(info) {
+      // Display the target channel for the 'Currently on' message.

[dpapad, 2016/12/07 01:42:23]

Does this message reflect the fact that we are not yet on the "currently on"
channel, but still in the process of updating to it? Basically is
https://bugs.chromium.org/p/chromium/issues/detail?id=610529#c7 addressed as
part of this CL?

[stevenjb, 2016/12/07 20:59:17]

Effectively. We could definitely improve the UI by showing the actual current
channel and the "updating to" channel here. For now at least this matches the
current experience.

       this.currentlyOnChannelText_ = this.i18n(
           'aboutCurrentlyOnChannel',
-          this.i18n(settings.browserChannelToI18nId(channel)));
+          this.i18n(settings.browserChannelToI18nId(info.targetChannel)));
+      this.canChangeChannel_ = info.canChangeChannel;
     }.bind(this));
   },
 
@@ -66,6 +70,7 @@ Polymer({
       // previous dialog's contents are cleared.
       dialog.addEventListener('close', function() {
         this.showChannelSwitcherDialog_ = false;
+        this.updateChannelInfo_();
       }.bind(this));
     }.bind(this));
   },