Settings: About: Fix cros channel info.

chrome/browser/resources/settings/about_page/channel_switcher_dialog.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-channel-switcher-dialog' is a component allowing the
  * user to switch between release channels (dev, beta, stable). A
  * |target-channel-changed| event is fired if the user does select a different
  * release channel to notify parents of this dialog.
  */
 Polymer({
   is: 'settings-channel-switcher-dialog',
 
   behaviors: [I18nBehavior],
 
   properties: {
     /** @private */
     browserChannelEnum_: {
       type: Object,
       value: BrowserChannel,
     },
 
     /** @private {!BrowserChannel} */
     currentChannel_: String,
 
+    /** @private {!BrowserChannel} */
+    targetChannel_: String,
+
     /**
      * Controls which of the two action buttons is visible.
      * @private {?{changeChannel: boolean, changeChannelAndPowerwash: boolean}}
      */
     shouldShowButtons_: {
       type: Object,
       value: null,
     },
 
     /** @private {?{title: string, description: string}} */
     warning_: {
       type: Object,
       value: null,
     },
   },
 
   /** @private {?settings.AboutPageBrowserProxy} */
   browserProxy_: null,
 
   /** @override */
   ready: function() {
     this.browserProxy_ = settings.AboutPageBrowserProxyImpl.getInstance();
-
-    this.browserProxy_.getCurrentChannel().then(function(channel) {
-      this.currentChannel_ = channel;
-      // Pre-populate radio group with current channel.
-      this.$$('paper-radio-group').select(channel);
+    this.browserProxy_.getChannelInfo().then(function(info) {
+      this.currentChannel_ = info.currentChannel;
+      this.targetChannel_ = info.targetChannel;
+      // Pre-populate radio group with target channel.
+      this.$$('paper-radio-group').select(this.targetChannel_);
     }.bind(this));
   },
 
   /** @override */
   attached: function() {
     this.$.dialog.showModal();
   },
 
   /** @private */
   onCancelTap_: function() {
@@ skipping 48 matching lines @@
     this.shouldShowButtons_ = {
       changeChannel: changeChannel,
       changeChannelAndPowerwash: changeChannelAndPowerwash,
     };
   },
 
   /** @private */
   onChannelSelectionChanged_: function() {
     var selectedChannel = this.$$('paper-radio-group').selected;
 
+    // Selected channel is the same as the target channel so only show 'cancel'.
+    if (selectedChannel == this.targetChannel_) {
+      this.shouldShowButtons_ = null;
+      this.warning_ = null;
+      return;
+    }
+
+    // Selected channel is the same as the current channel, allow the user to
+    // change without warnings.
     if (selectedChannel == this.currentChannel_) {
-      this.shouldShowButtons_ = null;
+      this.updateButtons_(true, false);
       this.warning_ = null;
       return;
     }
 
     if (settings.isTargetChannelMoreStable(
         this.currentChannel_, selectedChannel)) {
+      // More stable channel selected. For non managed devices, notify the user
+      // about powerwash.
       if (loadTimeData.getBoolean('aboutEnterpriseManaged')) {
         this.updateWarning_(
-            'aboutDelayedWarningTitle',
-            'aboutDelayedWarningMessage',
+            'aboutDelayedWarningTitle', 'aboutDelayedWarningMessage',
             'aboutProductTitle');
         this.updateButtons_(true, false);
       } else {
         this.updateWarning_(
-          'aboutPowerwashWarningTitle', 'aboutPowerwashWarningMessage');
+            'aboutPowerwashWarningTitle', 'aboutPowerwashWarningMessage');
         this.updateButtons_(false, true);
       }
     } else {
-      this.updateWarning_(
-        'aboutUnstableWarningTitle',
-        'aboutUnstableWarningMessage',
-        'aboutProductTitle');
+      if (selectedChannel == BrowserChannel.DEV) {
+        // Dev channel selected, warn the user.
+        this.updateWarning_(
+            'aboutUnstableWarningTitle', 'aboutUnstableWarningMessage',
+            'aboutProductTitle');
+      } else {
+        this.warning_ = null;
+      }
       this.updateButtons_(true, false);
     }
   },
 
   /**
    * @return {boolean}
    * @private
    */
   shouldShowWarning_: function() {
     return this.warning_ !== null;
   },
 });