MD Settings: About: Show connectionTypes message

chrome/browser/resources/settings/about_page/about_page.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-about-page' contains version and OS related
  * information.
  */
 Polymer({
   is: 'settings-about-page',
@@ skipping 242 matching lines @@
 // </if>
         return this.i18n('aboutUpgradeRelaunch');
       case UpdateStatus.UPDATED:
         return this.i18n('aboutUpgradeUpToDate');
       case UpdateStatus.UPDATING:
         assert(typeof this.currentUpdateStatusEvent_.progress == 'number');
         var progressPercent = this.currentUpdateStatusEvent_.progress + '%';
 
 // <if expr="chromeos">
         if (this.currentChannel_ != this.targetChannel_) {
-          return this.i18n('aboutUpgradeUpdatingChannelSwitch',
+          return this.i18n(
+              'aboutUpgradeUpdatingChannelSwitch',
               this.i18n(settings.browserChannelToI18nId(this.targetChannel_)),
               progressPercent);
         }
 // </if>
         if (this.currentUpdateStatusEvent_.progress > 0) {
           // NOTE(dbeam): some platforms (i.e. Mac) always send 0% while
           // updating (they don't support incremental upgrade progress). Though
           // it's certainly quite possible to validly end up here with 0% on
           // platforms that support incremental progress, nobody really likes
           // seeing that they're 0% done with something.
           return this.i18n('aboutUpgradeUpdatingPercent', progressPercent);
         }
         return this.i18n('aboutUpgradeUpdating');
       default:
+        var result = '';
         var message = this.currentUpdateStatusEvent_.message;
-        return message ?
-            parseHtmlSubset('<b>' + message + '</b>').firstChild.innerHTML :
-            '';
+        if (!!message) {
+          result += '<div>' +
+              parseHtmlSubset('<b>' + message + '</b>').firstChild.innerHTML +
+              '</div>';
+        }
+        var connectMessage = this.currentUpdateStatusEvent_.connectionTypes;
+        if (!!connectMessage) {
+          result += '<div>' +
+              parseHtmlSubset('<b>' + connectMessage + '</b>')

[dpapad, 2017/02/17 02:48:14]

It is also worth mentioning that this is only necessary if |connectMessage| can
potentially include HTML code (like a link). From the screenshot you provided at
https://bugs.chromium.org/p/chromium/issues/detail?id=689715#c16, I don't see a
link, so this parseHtmlSubset() call could be unnecessary.

[stevenjb, 2017/02/17 20:02:41]

I think that in principal we prefer to call this for inserting HTML, e.g. to
protect the code from a typo lower down the stack.

+                  .firstChild.innerHTML +
+              '</div>';
+        }
+        return result;

[dpapad, 2017/02/17 02:44:28]

Nit(optional): We can avoid duplicate logic as follows

default:
  function generateErrorHtml(message) {
    return '<div>' +
        parseHtmlSubset('<b>' + message + '</b>').firstChild.innerHTML +
        '</div>';
  }   

  var result = '';                                                              
                                                                                
                                                             
  var message = this.currentUpdateStatusEvent_.message;
  if (!!message)
    result += generateErrorHtml(message);
  var connectMessage = this.currentUpdateStatusEvent_.connectionTypes;
  if (!!connectMessage)
    result += generateErrorHtml(connectMessage);

  return result;

[stevenjb, 2017/02/17 20:02:41]

Sure. Done.

     }
   },
 
   /**
    * @return {?string}
    * @private
    */
   getIcon_: function() {
     // If this platform has reached the end of the line, display an error icon
     // and ignore UpdateStatus.
     if (this.obsoleteSystemInfo_.endOfLine)
       return 'settings:error';
 
     switch (this.currentUpdateStatusEvent_.status) {
       case UpdateStatus.DISABLED_BY_ADMIN:
         return 'cr20:domain';
       case UpdateStatus.FAILED:
         return 'settings:error';
       case UpdateStatus.UPDATED:
       case UpdateStatus.NEARLY_UPDATED:
-          return 'settings:check-circle';
+        return 'settings:check-circle';
       default:
-          return null;
+        return null;
     }
   },
 
   /**
    * @return {?string}
    * @private
    */
   getIconSrc_: function() {
     if (this.obsoleteSystemInfo_.endOfLine)
       return null;
@@ skipping 85 matching lines @@
     });
   },
 
 // <if expr="_google_chrome">
   /** @private */
   onReportIssueTap_: function() {
     this.aboutBrowserProxy_.openFeedbackDialog();
   },
 // </if>
 });