Add USB devices to the content settings page.

chrome/browser/resources/options/content_settings_exceptions_area.js

 // Copyright (c) 2012 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.
 
 cr.define('options.contentSettings', function() {
   /** @const */ var ControlledSettingIndicator =
                     options.ControlledSettingIndicator;
   /** @const */ var InlineEditableItemList = options.InlineEditableItemList;
   /** @const */ var InlineEditableItem = options.InlineEditableItem;
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
    * Returns whether exceptions list for the type is editable.
    *
    * @param {string} contentType The type of the list.
    */
   function IsEditableType(contentType) {
     // Exceptions of the following lists are not editable for now.
     return !(contentType == 'location' ||
              contentType == 'fullscreen' ||
              contentType == 'media-stream-mic' ||
              contentType == 'media-stream-camera' ||
              contentType == 'midi-sysex' ||
-             contentType == 'zoomlevels');
+             contentType == 'zoomlevels' ||
+             IsChosenObjectType(contentType));
   }
 
   /**
+   * Returns whether exceptions of this type represent chosen objects.
+   *
+   * @param {string} contentType The type of the list.
+   */
+  function IsChosenObjectType(contentType) {
+    return contentType == 'usb-devices';
+  }
+
+  function ValueColumnForContentType(contentType) {
+    if (contentType == 'usb-devices')
+      return 'exception-usb-device-column';
+    else if (contentType == 'zoomlevels')

[Bernhard Bauer, 2015/11/16 12:53:30]

Else is not necessary if the previous branch returns.

[Reilly Grant (use Gerrit), 2015/11/16 22:18:27]

Done.

+      return 'exception-zoom-column';
+    else
+      return 'exception-behavior-column';
+  }
+
+  /**
    * Creates a new exceptions list item.
    *
    * @param {string} contentType The type of the list.
    * @param {string} mode The browser mode, 'otr' or 'normal'.
    * @param {Object} exception A dictionary that contains the data of the
    *     exception.
    * @constructor
    * @extends {options.InlineEditableItem}
    */
   function ExceptionsListItem(contentType, mode, exception) {
@@ skipping 69 matching lines @@
         this.editable = false;
       }
 
       if (this.setting == 'default') {
         // Items that don't have their own settings (parents of 'embedded on'
         // items) aren't deletable.
         this.deletable = false;
         this.editable = false;
       }
 
-      if (this.contentType != 'zoomlevels') {
+      if (this.contentType != 'zoomlevels' &&
+          !IsChosenObjectType(this.contentType)) {
         this.addEditField(select, this.settingLabel);
         this.contentElement.appendChild(select);
       }
       select.className = 'exception-setting';
-      select.setAttribute('aria-labelledby', 'exception-behavior-column');
+      select.setAttribute('aria-labelledby',
+                          ValueColumnForContentType(this.contentType));
 
       if (this.pattern)
         select.setAttribute('displaymode', 'edit');
 
       if (this.contentType == 'zoomlevels') {
         this.deletable = true;
 
         var zoomLabel = cr.doc.createElement('span');
         zoomLabel.textContent = this.dataItem.zoom;
         zoomLabel.className = 'exception-setting';
         zoomLabel.setAttribute('displaymode', 'static');
-        zoomLabel.setAttribute('aria-labelledby', 'exception-zoom-column');
         this.contentElement.appendChild(zoomLabel);
         this.zoomLabel = zoomLabel;
       }
 
+      if (IsChosenObjectType(this.contentType) &&
+          this.dataItem.hasOwnProperty('object')) {

[Bernhard Bauer, 2015/11/16 12:53:30]

I don't think you need to work around any Javascript weirdnesses here -- you can
just check for `dataItem.object`.

[Reilly Grant (use Gerrit), 2015/11/16 22:18:27]

Done.

+        this.deletable = true;
+
+        var objectLabel = cr.doc.createElement('span');
+        objectLabel.textContent = this.dataItem.objectName;
+        objectLabel.className = 'exception-setting';
+        objectLabel.setAttribute('displaymode', 'static');
+        this.contentElement.appendChild(objectLabel);
+        this.objectLabel = objectLabel;
+      }
+
       // Used to track whether the URL pattern in the input is valid.
       // This will be true if the browser process has informed us that the
       // current text in the input is valid. Changing the text resets this to
       // false, and getting a response from the browser sets it back to true.
       // It starts off as false for empty string (new exceptions) or true for
       // already-existing exceptions (which we assume are valid).
       this.inputValidityKnown = this.pattern;
       // This one tracks the actual validity of the pattern in the input. This
       // starts off as true so as not to annoy the user when he adds a new and
       // empty input.
@@ skipping 393 matching lines @@
       }
     },
 
     /** @override */
     deleteItemAtIndex: function(index) {
       var listItem = this.getListItemByIndex(index);
       if (!listItem.deletable)
         return;
 
       var dataItem = listItem.dataItem;
-      chrome.send('removeException', [listItem.contentType,
-                                      listItem.mode,
-                                      dataItem.origin,
-                                      dataItem.embeddingOrigin]);
+      if (IsChosenObjectType(this.contentType)) {
+        chrome.send('removeException', [listItem.contentType,
+                                        listItem.mode,
+                                        dataItem.origin,
+                                        dataItem.embeddingOrigin,
+                                        dataItem.object]);
+      } else {
+        chrome.send('removeException', [listItem.contentType,
+                                        listItem.mode,
+                                        dataItem.origin,
+                                        dataItem.embeddingOrigin]);
+      }
     },
   };
 
   var Page = cr.ui.pageManager.Page;
   var PageManager = cr.ui.pageManager.PageManager;
 
   /**
    * Encapsulated handling of content settings list subpage.
    *
    * @constructor
@@ skipping 44 matching lines @@
       header.textContent = loadTimeData.getString(camelCasedType + 'Header');
 
       var divs = this.pageDiv.querySelectorAll('div[contentType]');
       for (var i = 0; i < divs.length; i++) {
         if (divs[i].getAttribute('contentType') == type)
           divs[i].hidden = false;
         else
           divs[i].hidden = true;
       }
 
-      $('exception-behavior-column').hidden = type == 'zoomlevels';
-      $('exception-zoom-column').hidden = type != 'zoomlevels';
+      var valueColumnId = ValueColumnForContentType(type);
+      this.pageDiv.querySelectorAll('div.exception-value-column-header')
+          .forEach(function(div) { div.hidden = (div.id != valueColumnId); });

[Bernhard Bauer, 2015/11/16 12:53:30]

Move the code inside the loop to a new line?

[Reilly Grant (use Gerrit), 2015/11/16 22:18:27]

Done.

     },
 
     /**
      * Called after the page has been shown. Show the content type for the
      * location's hash.
      */
     didShowPage: function() {
       if (this.hash)
         this.showList(this.hash.slice(1));
     },
@@ skipping 20 matching lines @@
     }
   };
 
   return {
     ExceptionsListItem: ExceptionsListItem,
     ExceptionsAddRowListItem: ExceptionsAddRowListItem,
     ExceptionsList: ExceptionsList,
     ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
   };
 });