Settings: About: Fix cros channel info.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview 'settings-detailed-build-info' contains detailed build
  * information for ChromeOS.
  */
 
 Polymer({
   is: 'settings-detailed-build-info',
 
   behaviors: [I18nBehavior],
 
   properties: {
     /** @private {!VersionInfo} */
     versionInfo_: Object,
 
     /** @private */
     currentlyOnChannelText_: String,
 
     /** @private */
     showChannelSwitcherDialog_: Boolean,
 
     /** @private */
-    canChangeChannel_: {
-      type: Boolean,
-      value: function() {
-        return loadTimeData.getBoolean('aboutCanChangeChannel');
-      },
-    },
+    canChangeChannel_: Boolean,
   },
 
   /** @override */
   ready: function() {
     var browserProxy = settings.AboutPageBrowserProxyImpl.getInstance();
     browserProxy.pageReady();
 
     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));
   },
 
   /**
    * @param {string} version
    * @return {boolean}
    * @private
    */
   shouldShowVersion_: function(version) {
     return version.length > 0;
   },
 
   /** @private */
   onChangeChannelTap_: function() {
     this.showChannelSwitcherDialog_ = true;
     // Async to wait for dialog to appear in the DOM.
     this.async(function() {
       var dialog = this.$$('settings-channel-switcher-dialog');
       // Register listener to detect when the dialog is closed. Flip the boolean
       // once closed to force a restamp next time it is shown such that the
       // previous dialog's contents are cleared.
       dialog.addEventListener('close', function() {
         this.showChannelSwitcherDialog_ = false;
+        this.updateChannelInfo_();
       }.bind(this));
     }.bind(this));
   },
 });