Settings: About: Fix cros channel info.

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

Index: chrome/browser/resources/settings/about_page/channel_switcher_dialog.js
diff --git a/chrome/browser/resources/settings/about_page/channel_switcher_dialog.js b/chrome/browser/resources/settings/about_page/channel_switcher_dialog.js
index 14b01f6677b5be6df406e3ea2798c0417a497af0..e259634a94279572d29d606678f1485587eda80b 100644
--- a/chrome/browser/resources/settings/about_page/channel_switcher_dialog.js
+++ b/chrome/browser/resources/settings/about_page/channel_switcher_dialog.js
@@ -21,7 +21,7 @@ Polymer({
     },
 
     /** @private {!BrowserChannel} */
-    currentChannel_: String,
+    targetChannel_: String,
 
     /**
      * Controls which of the two action buttons is visible.
@@ -46,9 +46,9 @@ Polymer({
   ready: function() {
     this.browserProxy_ = settings.AboutPageBrowserProxyImpl.getInstance();
 
-    this.browserProxy_.getCurrentChannel().then(function(channel) {
-      this.currentChannel_ = channel;
-      // Pre-populate radio group with current channel.
+    this.browserProxy_.getTargetChannel().then(function(channel) {
+      this.targetChannel_ = channel;
+      // Pre-populate radio group with target channel.
       this.$$('paper-radio-group').select(channel);
     }.bind(this));
   },
@@ -118,14 +118,14 @@ Polymer({
   onChannelSelectionChanged_: function() {
     var selectedChannel = this.$$('paper-radio-group').selected;
 
-    if (selectedChannel == this.currentChannel_) {
+    if (selectedChannel == this.targetChannel_) {
       this.shouldShowButtons_ = null;
       this.warning_ = null;
       return;
     }
 
     if (settings.isTargetChannelMoreStable(
-        this.currentChannel_, selectedChannel)) {
+        this.targetChannel_, selectedChannel)) {

[dpapad, 2016/12/02 23:27:12]

I am confused by the currentChannel -> targetChannel change? Isn't the dialog
supposed to be pre-populated with the current channel?

[dpapad, 2016/12/02 23:29:43]

Also see equivalent logic in the old page,
https://cs.chromium.org/chromium/src/chrome/browser/resources/help/channel_ch...,
using currentChannel instead of targetChannel.

[stevenjb, 2016/12/02 23:54:39]

We want to show the *target* channel as selected in the dialog, since that
corresponds to the "most recently selected" channel. (i.e. the user is actually
selecting the target channel, which won't become the current channel until an
update occurs).

But yeah, it looks like we need to involve currentChannel here at least. You'll
note that the rest of the old UI logic that you pointed to uses targetChannel.

I'll take a closer look at the code on Monday.



I'll look at this more carefully on Monday.

[dpapad, 2016/12/03 00:02:32]

Ok. In case it helps, this is my understanding (which my be contradicting the
current state in this CL).

 - Current channel: This is what the dialog should be prepopulated with (which
means that the dialog always start with the "change channel" button disabled).
 - Target channel: Initially has the same value as the "current channel" and is
not reflected anywhere in the dialog.
 - Selected channel: The currently selected value in the dialog. If different
than "current channel" the "change channel" button is enabled. Once the user
clicks "change channel", this value becomes the "target channel" value.

[stevenjb, 2016/12/06 20:38:02]

OK, I think I have the logic correct now. We do need both the current and target
channel.

       if (loadTimeData.getBoolean('aboutEnterpriseManaged')) {
         this.updateWarning_(
             'aboutDelayedWarningTitle',