[MD setting] tool tips on controlledBy site exceptions

chrome/browser/resources/settings/site_settings/site_settings_behavior.js

Index: chrome/browser/resources/settings/site_settings/site_settings_behavior.js
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
index 8551689a6e6c687e409d3204de2833b8317f247b..121f5d66db0ee2ee25c559e8aa0e8e45181ace3c 100644
--- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
+++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
@@ -6,6 +6,21 @@
  * @fileoverview Behavior common to Site Settings classes.
  */
 
+
+/**
+ * The source information on site exceptions doesn't exactly match the
+ * controlledBy values.
+ * TODO(dschuyler): Can they be unified (and this dictionary removed)?
+ * @type {!Object}
+ */
+var kControlledByLookup = {
+  'extension': chrome.settingsPrivate.ControlledBy.EXTENSION,
+  'HostedApp': chrome.settingsPrivate.ControlledBy.EXTENSION,
+  'platform_app': chrome.settingsPrivate.ControlledBy.EXTENSION,
+  'policy': chrome.settingsPrivate.ControlledBy.USER_POLICY,
+};
+
+
 /** @polymerBehavior */
 var SiteSettingsBehaviorImpl = {
   properties: {
@@ -39,7 +54,8 @@ var SiteSettingsBehaviorImpl = {
    * @return {string} The URL with a scheme, or an empty string.
    */
   ensureUrlHasScheme: function(url) {
-    if (url.length == 0) return url;
+    if (url.length == 0)
+      return url;
     return url.includes('://') ? url : 'http://' + url;
   },
 
@@ -94,17 +110,6 @@ var SiteSettingsBehaviorImpl = {
   },
 
   /**
-   * Returns true if this exception is controlled by, for example, a policy or
-   * set by an extension.
-   * @param {string} source The source controlling the extension
-   * @return {boolean} Whether it is being controlled.
-   * @protected
-   */
-  isExceptionControlled_: function(source) {
-    return source != undefined && source != 'preference';
-  },
-
-  /**
    * Returns the icon to use for a given site.
    * @param {string} site The url of the site to fetch the icon for.
    * @return {string} The background-image style with the favicon.
@@ -148,7 +153,7 @@ var SiteSettingsBehaviorImpl = {
    * Convert an exception (received from the C++ handler) to a full
    * SiteException.
    * @param {!RawSiteException} exception The raw site exception from C++.
-   * @return {SiteException} The expanded (full) SiteException.
+   * @return {!SiteException} The expanded (full) SiteException.
    * @private
    */
   expandSiteException: function(exception) {
@@ -160,6 +165,12 @@ var SiteSettingsBehaviorImpl = {
           this.getEmbedderString(embeddingOrigin, this.category);
     }
 
+    var enforcement = '';

[tommycli, 2017/03/27 16:02:07]

Hmm it seems like the enum only has these two possible values:
https://cs.chromium.org/chromium/src/third_party/closure_compiler/externs/set...

maybe it would not be good to introduce the new "enforcement" concept... since
all the content settings authors are already familiar with the three possible
sources of settings... pref, policy, and extensions.

[dschuyler, 2017/03/28 01:05:53]

There are three states that enforcement of a setting may be in. The third state
is unenforced. 

Adding enforcement in content settings allows content settings to use existing
chrome policy controls rather than rolling separate one-off code for content
settings.

The separation of enforcement and controlledBy looks like it came in with
a2df3b6 2015-06-11 00:37:10. It's a new concept for content settings, but an
old-ish concept for the rest of settings. I'm interested in getting the
settings/content settings the code using the same concepts, but I'm flexible on
which direction we go in (use separate enforcement or not). For now, content
settings is the odd one out, so I'd like to migrate it to use the common code.

[tommycli, 2017/03/28 16:20:44]

I'm surprised that closure considers '' a valid value of the Enum, but if it
does, then i have no problem with it.

[dschuyler, 2017/03/28 19:27:05]

I see what you mean. It likely should not allow it. I'm going to look at
specifying the enforcement differently (maybe changing the closure type). I'll
do that in a separate CL so we can focus on just that topic.

+    if (exception.source == 'policy' || exception.source == 'extension')
+      enforcement = chrome.settingsPrivate.Enforcement.ENFORCED;
+
+    var controlledBy = kControlledByLookup[exception.source] || '';
+
     return {
       category: this.category,
       origin: origin,
@@ -168,7 +179,8 @@ var SiteSettingsBehaviorImpl = {
       embeddingDisplayName: embeddingDisplayName,
       incognito: exception.incognito,
       setting: exception.setting,
-      source: exception.source,
+      enforcement: enforcement,
+      controlledBy: controlledBy,
     };
   },