[CUPS] Fix the Printer protocol string that displays in the UI.

chrome/browser/resources/settings/printing_page/cups_printer_details_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-cups-printer-details-page' is the subpage for
  * viewing the details of a CUPS printer.
  */
 Polymer({
   is: 'settings-cups-printer-details-page',
@@ skipping 30 matching lines @@
 
   /**
    * @param {Event} event
    * @private
    */
   toggleAdvancedExpanded_: function(event) {
     if (event.target.id == 'expandButton')
       return;  // Already handled.
     this.advancedExpanded = !this.advancedExpanded;
   },
+
+  /**
+   * @param {string} printerProtocol
+   * @return {string} The Printer's protocol that displays in UI
+   * @private
+   */
+  getPrinterProtocol_: function(printerProtocol) {
+    if (printerProtocol == 'ipp')

[michaelpg, 2016/09/17 02:19:06]

Optional: name the strings "printerProtocol_ipp", "printerProtocol_socket", etc.
and do a lookup:

    if (loadTimeData.valueExists('printerProtocol_' + printerProtocol))
      return loadTimeData.getString('printerProtocol_' + printerProtocol);
    return '';

Rationale: since the keys are basically generated using the printer's URL scheme
or w/e, there's not much value in customizing the names of the strings.

[xdai1, 2016/09/19 22:43:48]

Renaming it to "printerProtocol_ipp" seems break the naming convention in the
webui handler file... If you don't mind, I would prefer to keep it this way.

[michaelpg, 2016/09/19 23:32:08]

That's fine, I just mentioned it as an option. (Straying from convention where
it makes sense is fine, and we don't have strict rules for string keys for
loadTimeData.)

+      return loadTimeData.getString('printerProtocolIpp');
+    if (printerProtocol == 'ipps')
+      return loadTimeData.getString('printerProtocolIpps');
+    if (printerProtocol == 'http')
+      return loadTimeData.getString('printerProtocolHttp');
+    if (printerProtocol == 'https')
+      return loadTimeData.getString('printerProtocolHttps');
+    if (printerProtocol == 'socket')
+      return loadTimeData.getString('printerProtocolAppSocket');
+    if (printerProtocol == 'lpd')
+      return loadTimeData.getString('printerProtocolLpd');
+    if (printerProtocol == 'usb')
+      return loadTimeData.getString('printerProtocolUsb');
+    return '';

[michaelpg, 2016/09/17 02:19:06]

if the printer protocol should always be one of the above strings (or empty),
then return early if the string is '', and call assertNotReached at the end.

[xdai1, 2016/09/19 22:43:48]

Addressed! Yes, the protocol should only be one of the above strings.

+  },
 });