| 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 8c07d7e7501b34452692d7b88952d12d5adb6326..737d0e4463a8a0971228acc2ad5f9f6464c53d61 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| @@ -33,116 +33,6 @@ var SiteSettingsBehaviorImpl = {
|
| },
|
|
|
| /**
|
| - * A utility function to compute the description for the category.
|
| - * @param {string} category The category to show the description for.
|
| - * @param {string} setting The string value of the setting.
|
| - * @param {boolean} showRecommendation Whether to show the '(recommended)'
|
| - * label prefix.
|
| - * @return {string} The category description.
|
| - * @protected
|
| - */
|
| - computeCategoryDesc: function(category, setting, showRecommendation) {
|
| - var categoryEnabled = this.computeIsSettingEnabled(setting);
|
| - switch (category) {
|
| - case settings.ContentSettingsTypes.JAVASCRIPT:
|
| - // "Allowed (recommended)" vs "Blocked".
|
| - if (!categoryEnabled) {
|
| - return loadTimeData.getString('siteSettingsBlocked');
|
| - }
|
| - return showRecommendation ?
|
| - 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.NOTIFICATIONS:
|
| - // "Ask before sending (recommended)" vs "Blocked".
|
| - if (!categoryEnabled) {
|
| - return loadTimeData.getString('siteSettingsBlocked');
|
| - }
|
| - return showRecommendation ?
|
| - loadTimeData.getString('siteSettingsAskBeforeSendingRecommended') :
|
| - loadTimeData.getString('siteSettingsAskBeforeSending');
|
| - case settings.ContentSettingsTypes.CAMERA:
|
| - case settings.ContentSettingsTypes.GEOLOCATION:
|
| - case settings.ContentSettingsTypes.MIC:
|
| - // "Ask before accessing (recommended)" vs "Blocked".
|
| - if (!categoryEnabled) {
|
| - return loadTimeData.getString('siteSettingsBlocked');
|
| - }
|
| - return showRecommendation ?
|
| - loadTimeData.getString(
|
| - 'siteSettingsAskBeforeAccessingRecommended') :
|
| - loadTimeData.getString('siteSettingsAskBeforeAccessing');
|
| - case settings.ContentSettingsTypes.COOKIES:
|
| - // Tri-state: "Allow sites to save and read cookie data" vs "Blocked"
|
| - // vs "Keep local data only until you quit your browser".
|
| - if (setting == settings.PermissionValues.BLOCK)
|
| - return loadTimeData.getString('siteSettingsBlocked');
|
| - if (setting == settings.PermissionValues.SESSION_ONLY)
|
| - return loadTimeData.getString('deleteDataPostSession');
|
| - return showRecommendation ?
|
| - loadTimeData.getString('siteSettingsCookiesAllowedRecommended') :
|
| - loadTimeData.getString('siteSettingsCookiesAllowed');
|
| - case settings.ContentSettingsTypes.PROTOCOL_HANDLERS:
|
| - // "Allow sites to ask to become default handlers" vs "Blocked".
|
| - if (!categoryEnabled) {
|
| - return loadTimeData.getString('siteSettingsHandlersBlocked');
|
| - }
|
| - return showRecommendation ?
|
| - loadTimeData.getString('siteSettingsHandlersAskRecommended') :
|
| - loadTimeData.getString('siteSettingsHandlersAsk');
|
| - case settings.ContentSettingsTypes.IMAGES:
|
| - if (!categoryEnabled) {
|
| - return loadTimeData.getString('siteSettingsDontShowImages');
|
| - }
|
| - return showRecommendation ?
|
| - loadTimeData.getString('siteSettingsShowAllRecommended') :
|
| - loadTimeData.getString('siteSettingsShowAll');
|
| - case settings.ContentSettingsTypes.PLUGINS:
|
| - if (setting == settings.PermissionValues.ALLOW)
|
| - return loadTimeData.getString('siteSettingsFlashAllow');
|
| - if (setting == settings.PermissionValues.BLOCK)
|
| - return loadTimeData.getString('siteSettingsFlashBlock');
|
| - return loadTimeData.getString('siteSettingsFlashAskBefore');
|
| - case settings.ContentSettingsTypes.BACKGROUND_SYNC:
|
| - // "Allow sites to finish sending and receiving data" vs "Do not allow".
|
| - if (!categoryEnabled) {
|
| - return loadTimeData.getString('siteSettingsBackgroundSyncBlocked');
|
| - }
|
| - return showRecommendation ?
|
| - loadTimeData.getString(
|
| - 'siteSettingsAllowRecentlyClosedSitesRecommended') :
|
| - loadTimeData.getString('siteSettingsAllowRecentlyClosedSites');
|
| - case settings.ContentSettingsTypes.AUTOMATIC_DOWNLOADS:
|
| - // "Ask when a site wants to auto-download multiple" vs "Do not allow".
|
| - if (!categoryEnabled) {
|
| - return loadTimeData.getString('siteSettingsAutoDownloadBlock');
|
| - }
|
| - return showRecommendation ?
|
| - loadTimeData.getString('siteSettingsAutoDownloadAskRecommended') :
|
| - loadTimeData.getString('siteSettingsAutoDownloadAsk');
|
| - case settings.ContentSettingsTypes.UNSANDBOXED_PLUGINS:
|
| - // "Ask when a plugin accesses your computer" vs "Do not allow".
|
| - if (!categoryEnabled) {
|
| - return loadTimeData.getString('siteSettingsUnsandboxedPluginsBlock');
|
| - }
|
| - return showRecommendation ?
|
| - loadTimeData.getString(
|
| - 'siteSettingsUnsandboxedPluginsAskRecommended') :
|
| - loadTimeData.getString('siteSettingsUnsandboxedPluginsAsk');
|
| - default:
|
| - assertNotReached('Invalid category: ' + category);
|
| - return '';
|
| - }
|
| - },
|
| -
|
| - /**
|
| * Ensures the URL has a scheme (assumes http if omitted).
|
| * @param {string} url The URL with or without a scheme.
|
| * @return {string} The URL with a scheme, or an empty string.
|
|
|