Chromium Code Reviews| 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 b46f6f326e3a58fee2a801e4fe4bd121237a83f9..637eab64061fc74d69afd7ad9a46eb0574b9859a 100644 |
| --- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js |
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js |
| @@ -91,7 +91,7 @@ var SiteSettingsBehaviorImpl = { |
| 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'; |
| @@ -123,7 +123,7 @@ var SiteSettingsBehaviorImpl = { |
| 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'); |
| @@ -179,7 +179,7 @@ var SiteSettingsBehaviorImpl = { |
| 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'; |
| @@ -190,6 +190,37 @@ var SiteSettingsBehaviorImpl = { |
| }, |
| /** |
| + * A utility function to lookup a category enum from its display name. |
| + * @param {string} The category display name to look up. |
| + * @return {number} category The category found or -1 if nothing found. |
| + * @protected |
| + */ |
| + computeCategoryFromDisplayName: function(displayName) { |
|
tommycli
2016/01/04 18:12:09
Is this really the display name? I thought the dis
|
| + switch (displayName) { |
| + 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 description for the category. |
| * @param {number} category The category to show the description for. |
| * @param {boolean} categoryEnabled The state of the global toggle. |
| @@ -216,7 +247,7 @@ var SiteSettingsBehaviorImpl = { |
| 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'); |