[Chrome Settings UI] Show overruled User Exceptions as strike-through.

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;
@@ skipping 327 matching lines @@
      */
     updateEditables: function() {
       this.resetInput();
 
       var settingOption =
           this.select.querySelector('[value=\'' + this.setting + '\']');
       if (settingOption)
         settingOption.selected = true;
     },
 
+    /**
+     * Updates UI to indicate that the exception was overruled by a source.
+     *
+     * @param {string} overruledBy The source that overrules the exception.
+     */
+    setOverruledBy: function(overruledBy) {
+      this.classList.toggle('overruled', !!overruledBy);
+      var textElt = this.querySelector('.exception-pattern .static-text');
+      textElt.setAttribute('title',
+          loadTimeData.getString('exceptionDisabledByPolicy'));
+
+      var indicator = new ControlledSettingIndicator();

[Bernhard Bauer, 2016/05/19 14:20:41]

This duplicates a lot of code in lines 208ff. Could we extract that into a
shared method?

(Also, the whole approach of using a fake Event seems a bit involved to me, when
we could just call a method directly, but that's maybe not for now.)

[huangs, 2016/05/20 15:16:46]

Done; extracted to appendIndicatorElement().

Yeah the usage of event is yucky. Actually I think that the new routine should
be a static function of ControlledSettingIndicator that injects a new instance
of itself to a given element. Then it can check for existing instance and
possibly replacing it. This also allows later cleanup re. fake event, without
affecting callers. However, doing this cleanup probably does not belong in this
CL.

+      indicator.setAttribute('content-exception', this.contentType);
+      // Create a synthetic pref change event decorated as
+      // CoreOptionsHandler::CreateValueForPref() does.
+      var event = new Event(this.contentType);
+      event.value = { controlledBy: overruledBy };
+      indicator.handlePrefChange(event);
+      this.appendChild(indicator);
+    },
+
     /** @override */
     get currentInputIsValid() {
       return this.inputValidityKnown && this.inputIsValid;
     },
 
     /** @override */
     get hasBeenEdited() {
       var livePattern = this.input.value;
       var liveSetting = this.select.value;
       return livePattern != this.pattern || liveSetting != this.setting;
@@ skipping 155 matching lines @@
                                       entry);
       } else {
         var addRowItem = new ExceptionsAddRowListItem(this.contentType,
                                                       this.mode);
         addRowItem.deletable = false;
         return addRowItem;
       }
     },
 
     /**
+     * Updates UI to indicate that user exceptions were overruled by a source.
+     *
+     * @param {string} overruledBy The source that overrules user exceptions.
+     */
+    setOverruledBy: function(overruledBy) {
+      for (var index = 0; index < this.dataModel.length; ++index) {
+        var item = this.getListItemByIndex(index);
+        if (item.dataItem.source == 'preference') {
+          item.setOverruledBy(overruledBy);
+        }
+      }
+    },
+
+    /**
      * Sets the exceptions in the js model.
      *
      * @param {Array<options.Exception>} entries A list of dictionaries of
      *     values, each dictionary represents an exception.
      */
     setExceptions: function(entries) {
       var deleteCount = this.dataModel.length;
 
       if (this.isEditable()) {
         // We don't want to remove the Add New Exception row.
@@ skipping 163 matching lines @@
     }
   };
 
   return {
     ExceptionsListItem: ExceptionsListItem,
     ExceptionsAddRowListItem: ExceptionsAddRowListItem,
     ExceptionsList: ExceptionsList,
     ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
   };
 });