Site Settings: Give each category its own route.

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

 // Copyright 2015 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 Behavior common to Site Settings classes.
  */
 
 /** @polymerBehavior */
 var SiteSettingsBehaviorImpl = {
@@ skipping 52 matching lines @@
     var key2 = origin + ',*';
     if (pref.value[key1] != undefined)
       pref.value[key1].setting = value;
     if (pref.value[key2] != undefined)
       pref.value[key2].setting = value;
     this.setPrefValue(
         this.computeCategoryExceptionsPrefName(category), pref.value);
   },
 
   /**
+   * A utility function to lookup a category name from its enum.
+   * @param {number} category The category ID to look up.
+   * @return {string} The category found or blank string if not found.
+   * @protected
+   */
+  computeCategoryTextId: function(category) {
+    switch (category) {
+      case settings.ContentSettingsTypes.CAMERA:
+        return 'camera';
+      case settings.ContentSettingsTypes.COOKIES:
+        return 'cookies';
+      case settings.ContentSettingsTypes.FULLSCREEN:
+        return 'fullscreen';
+      case settings.ContentSettingsTypes.GEOLOCATION:
+        return 'location';
+      case settings.ContentSettingsTypes.IMAGES:
+        return 'images';
+      case settings.ContentSettingsTypes.JAVASCRIPT:
+        return 'javascript';
+      case settings.ContentSettingsTypes.MIC:
+        return 'microphone';
+      case settings.ContentSettingsTypes.NOTIFICATIONS:
+        return 'notifications';
+      case settings.ContentSettingsTypes.POPUPS:
+        return 'popups';
+      default:
+        return '';
+    }
+  },
+
+  /**
+   * A utility function to lookup a category enum from its text id.
+   * @param {string} textId The category text id to look up.
+   * @return {number} The category found or -1 if not found.
+   * @protected
+   */
+  computeCategoryFromTextId: function(textId) {

[tommycli, 2016/01/07 19:30:37]

I think this is no longer used.

[Finnur, 2016/01/08 10:36:15]

Correct. Removed.

+    switch (textId) {
+      case 'camera':
+        return settings.ContentSettingsTypes.CAMERA;
+      case 'cookies':
+        return settings.ContentSettingsTypes.COOKIES;
+      case 'fullscreen':
+        return settings.ContentSettingsTypes.FULLSCREEN;
+      case 'location':
+        return settings.ContentSettingsTypes.GEOLOCATION;
+      case 'images':
+        return settings.ContentSettingsTypes.IMAGES;
+      case 'javascript':
+        return settings.ContentSettingsTypes.JAVASCRIPT;
+      case 'microphone':
+        return settings.ContentSettingsTypes.MIC;
+      case 'notifications':
+        return settings.ContentSettingsTypes.NOTIFICATIONS;
+      case 'popups':
+        return settings.ContentSettingsTypes.POPUPS;
+      default:
+        return -1;
+    }
+  },
+
+  /**
    * A utility function to compute the icon to use for the category.
    * @param {number} category The category to show the icon for.
    * @return {string} The id of the icon for the given category.
    * @protected
    */
   computeIconForContentCategory: function(category) {
     switch (category) {
       case settings.ContentSettingsTypes.CAMERA:
         return 'av:videocam';
       case settings.ContentSettingsTypes.COOKIES:
         return 'md-settings-icons:cookie';
       case settings.ContentSettingsTypes.FULLSCREEN:
         return 'icons:fullscreen';
       case settings.ContentSettingsTypes.GEOLOCATION:
         return 'communication:location-on';
       case settings.ContentSettingsTypes.IMAGES:
         return 'image:photo';
       case settings.ContentSettingsTypes.JAVASCRIPT:
         return 'icons:input';
       case settings.ContentSettingsTypes.MIC:
         return 'av:mic';
-      case settings.ContentSettingsTypes.NOTIFICATION:
+      case settings.ContentSettingsTypes.NOTIFICATIONS:
         return 'social:notifications';
       case settings.ContentSettingsTypes.POPUPS:
         return 'icons:open-in-new';
       default:
         assertNotReached();
         return '';
     }
   },
 
   /**
@@ skipping 11 matching lines @@
       case settings.ContentSettingsTypes.FULLSCREEN:
         return loadTimeData.getString('siteSettingsFullscreen');
       case settings.ContentSettingsTypes.GEOLOCATION:
         return loadTimeData.getString('siteSettingsLocation');
       case settings.ContentSettingsTypes.IMAGES:
         return loadTimeData.getString('siteSettingsImages');
       case settings.ContentSettingsTypes.JAVASCRIPT:
         return loadTimeData.getString('siteSettingsJavascript');
       case settings.ContentSettingsTypes.MIC:
         return loadTimeData.getString('siteSettingsMic');
-      case settings.ContentSettingsTypes.NOTIFICATION:
+      case settings.ContentSettingsTypes.NOTIFICATIONS:
         return loadTimeData.getString('siteSettingsNotifications');
       case settings.ContentSettingsTypes.POPUPS:
         return loadTimeData.getString('siteSettingsPopups');
       default:
         assertNotReached();
         return '';
     }
   },
 
   /**
@@ skipping 35 matching lines @@
       case settings.ContentSettingsTypes.FULLSCREEN:
         return 'fullscreen';
       case settings.ContentSettingsTypes.GEOLOCATION:
         return 'geolocation';
       case settings.ContentSettingsTypes.IMAGES:
         return 'images';
       case settings.ContentSettingsTypes.JAVASCRIPT:
         return 'javascript';
       case settings.ContentSettingsTypes.MIC:
         return 'media_stream_mic';
-      case settings.ContentSettingsTypes.NOTIFICATION:
+      case settings.ContentSettingsTypes.NOTIFICATIONS:
         return 'notifications';
       case settings.ContentSettingsTypes.POPUPS:
         return 'popups';
       default:
         assertNotReached();
         return '';
     }
   },
 
   /**
@@ skipping 16 matching lines @@
             loadTimeData.getString('siteSettingsAllowedRecommended') :
             loadTimeData.getString('siteSettingsAllowed');
       case settings.ContentSettingsTypes.POPUPS:
         // "Allowed" vs "Blocked (recommended)".
         if (categoryEnabled) {
           return loadTimeData.getString('siteSettingsAllowed');
         }
         return showRecommendation ?
             loadTimeData.getString('siteSettingsBlockedRecommended') :
             loadTimeData.getString('siteSettingsBlocked');
-      case settings.ContentSettingsTypes.NOTIFICATION:
+      case settings.ContentSettingsTypes.NOTIFICATIONS:
         // "Ask before sending (recommended)" vs "Blocked".
         if (!categoryEnabled) {
           return loadTimeData.getString('siteSettingsBlocked');
         }
         return showRecommendation ?
             loadTimeData.getString('siteSettingsAskBeforeSendingRecommended') :
             loadTimeData.getString('siteSettingsAskBeforeSending');
       case settings.ContentSettingsTypes.GEOLOCATION:
       case settings.ContentSettingsTypes.CAMERA:
       case settings.ContentSettingsTypes.MIC:
@@ skipping 47 matching lines @@
         return settings.ContentSettingsTypes[type];
       }
     }
     assertNotReached();
     return 0;
   },
 };
 
 /** @polymerBehavior */
 var SiteSettingsBehavior = [PrefsBehavior, SiteSettingsBehaviorImpl];