Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6226)

Unified Diff: chrome/browser/resources/settings/site_settings/site_settings_category.js

Issue 2021343003: MD Site Settings: Add five new top level categories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unit test fix Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/site_settings/site_settings_category.js
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_category.js b/chrome/browser/resources/settings/site_settings/site_settings_category.js
index 6bf06cfceae3c81fd2fc39f04c044f68b2fb19a7..2b5174805bd3486da6e2ca59b38b804a65b5400c 100644
--- a/chrome/browser/resources/settings/site_settings/site_settings_category.js
+++ b/chrome/browser/resources/settings/site_settings/site_settings_category.js
@@ -74,9 +74,11 @@ Polymer({
*/
onToggleChange_: function(event) {
switch (this.category) {
+ case settings.ContentSettingsTypes.BACKGROUND_SYNC:
case settings.ContentSettingsTypes.COOKIES:
case settings.ContentSettingsTypes.IMAGES:
case settings.ContentSettingsTypes.JAVASCRIPT:
+ case settings.ContentSettingsTypes.KEYGEN:
case settings.ContentSettingsTypes.POPUPS:
// "Allowed" vs "Blocked".
this.browserProxy.setDefaultValueForContentType(
@@ -85,10 +87,12 @@ Polymer({
settings.PermissionValues.ALLOW :
settings.PermissionValues.BLOCK);
break;
- case settings.ContentSettingsTypes.NOTIFICATIONS:
+ case settings.ContentSettingsTypes.AUTOMATIC_DOWNLOADS:
case settings.ContentSettingsTypes.GEOLOCATION:
case settings.ContentSettingsTypes.CAMERA:
case settings.ContentSettingsTypes.MIC:
+ case settings.ContentSettingsTypes.NOTIFICATIONS:
+ case settings.ContentSettingsTypes.UNSANDBOXED_PLUGINS:
// "Ask" vs "Blocked".
this.browserProxy.setDefaultValueForContentType(
this.category,
@@ -96,6 +100,14 @@ Polymer({
settings.PermissionValues.ASK :
settings.PermissionValues.BLOCK);
break;
+ case settings.ContentSettingsTypes.PLUGINS:
+ // "Detect important" vs "Let me choose".
+ this.browserProxy.setDefaultValueForContentType(
+ this.category,
+ this.categoryEnabled ?
+ settings.PermissionValues.IMPORTANT_CONTENT :
+ settings.PermissionValues.BLOCK);
+ break;
default:
assertNotReached('Invalid category: ' + this.category);
}

Powered by Google App Engine
This is Rietveld 408576698