MD Settings: Set all content setting values in Site Details Javascript.

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

Index: chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
index 82954acfcc7ec99d64fd35166eb7e55d0a1fc056..edcf6590d30b9504bf7e5b381f09fff69de0beba 100644
--- a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
+++ b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
@@ -19,7 +19,7 @@ var ContentSettingProvider = {
 };
 
 /**
- * The site exception information passed form the C++ handler.
+ * The site exception information passed from the C++ handler.
  * See also: SiteException.
  * @typedef {{embeddingOrigin: string,
  *            embeddingDisplayName: string,
@@ -130,13 +130,6 @@ cr.define('settings', function() {
     getExceptionList: function(contentType) {},
 
     /**
-     * Gets the exception details for a particular site.
-     * @param {string} site The name of the site.
-     * @return {!Promise<!RawSiteException>}
-     */
-    getSiteDetails: function(site) {},
-
-    /**
      * Resets the category permission for a given origin (expressed as primary
      *    and secondary patterns).
      * @param {string} primaryPattern The origin to change (primary pattern).
@@ -150,6 +143,15 @@ cr.define('settings', function() {
         primaryPattern, secondaryPattern, contentType, incognito) {},
 
     /**
+     * Gets the category permission for a given origin.

[raymes, 2017/06/19 04:13:12]

nit: It may be worth noting that this will be a different value to what will be
in the exception list for the site since it combines different sources of data
into a single permission value.

[Patti Lor, 2017/06/20 08:25:54]

Done, kind of quoted you verbatim.

+     * @param {string} contentType The name of the category to query.
+     * @param {string} origin The origin to look up the permission for.
+     * @param {string} embeddingOrigin the embedding origin to look up.
+     */
+    getCategoryPermissionForOrigin: function(
+        contentType, origin, embeddingOrigin) {},

[raymes, 2017/06/19 04:13:12]

nit: I think embeddingOrigin isn't needed right now. Maybe we should just leave
it out?

[Patti Lor, 2017/06/20 08:25:54]

Done.

+
+    /**
      * Sets the category permission for a given origin (expressed as primary
      *    and secondary patterns).
      * @param {string} primaryPattern The origin to change (primary pattern).
@@ -319,11 +321,6 @@ cr.define('settings', function() {
     },
 
     /** @override */
-    getSiteDetails: function(site) {
-      return cr.sendWithPromise('getSiteDetails', site);
-    },
-
-    /** @override */
     resetCategoryPermissionForOrigin: function(
         primaryPattern, secondaryPattern, contentType, incognito) {
       chrome.send(
@@ -332,6 +329,14 @@ cr.define('settings', function() {
     },
 
     /** @override */
+    getCategoryPermissionForOrigin: function(
+        contentType, origin, embeddingOrigin) {
+      return cr.sendWithPromise(
+          'getCategoryPermissionForOrigin', contentType, origin,
+          embeddingOrigin);
+    },
+
+    /** @override */
     setCategoryPermissionForOrigin: function(
         primaryPattern, secondaryPattern, contentType, value, incognito) {
       // TODO(dschuyler): It may be incorrect for JS to send the embeddingOrigin