[MD settings] show blocked sites even when category is blocked

chrome/browser/resources/settings/site_settings/add_site_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
  * 'add-site-dialog' provides a dialog to add exceptions for a given Content
  * Settings category.
  */
 Polymer({
   is: 'add-site-dialog',
 
   behaviors: [SiteSettingsBehavior, WebUIListenerBehavior],
 
   properties: {
     /**
+     * Whether this is an allow exception this dialog is adding.
+     */
+    allowException: Boolean,

[dpapad, 2016/11/07 21:59:35]

This was used when calling browserProxy.setCategoryPermissionForOrigin before. I
don't see any uses of it now, is it still necessary?

[dschuyler, 2016/11/07 23:54:04]

Done.

+
+    contentSetting: String,

[dpapad, 2016/11/07 21:59:35]

Can you add a comment explaining what does this member var hold? It is not clear
without any context.

[dschuyler, 2016/11/07 23:54:04]

Done.

+
+    /**
      * The site to add an exception for.
      * @private
      */
     site_: String,
-
-    /**
-     * Whether this is an allow exception this dialog is adding.
-     */
-     allowException: Boolean,
   },
 
   /**
    * Opens the dialog.
    * @param {string} type Whether this was launched from an Allow list or a
    *     Block list.
    */
   open: function(type) {
     this.addWebUIListener('onIncognitoStatusChanged',
         this.onIncognitoStatusChanged_.bind(this));
@@ skipping 33 matching lines @@
   /**
    * The tap handler for the Add [Site] button (adds the pattern and closes
    * the dialog).
    * @private
    */
   onSubmit_: function() {
     if (this.$.add.disabled)
       return;  // Can happen when Enter is pressed.
     var pattern = this.addPatternWildcard(this.site_);
     this.browserProxy.setCategoryPermissionForOrigin(
-        pattern, pattern, this.category, this.allowException ?
-            settings.PermissionValues.ALLOW : settings.PermissionValues.BLOCK,
+        pattern, pattern, this.category, this.contentSetting,

[dpapad, 2016/11/07 21:59:35]

Are we assuming that |contentSettings| has been populated by a parent? Can we
add an assertion before calling setCategoryPermissionForOrigin?

[dschuyler, 2016/11/07 23:54:04]

I added asserts in attached so that they would be checked early and
have lower overhead (vs checking in member functions other than
attached).

         this.$.incognito.checked);
     this.$.dialog.close();
   },
 });