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

Unified Diff: chrome/browser/subresource_filter/chrome_subresource_filter_client.h

Issue 2877553002: [subresource_filter] Swap ALLOW and BLOCK meanings in the content setting (Closed)
Patch Set: fix newer tests Created 3 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
« no previous file with comments | « no previous file | chrome/browser/subresource_filter/chrome_subresource_filter_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/subresource_filter/chrome_subresource_filter_client.h
diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.h b/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
index 86811425e14eebf573a088c2abfd7915cca9c18a..03de2d3ae20cfb3969ea8940e1520ae7afa56199 100644
--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
+++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.h
@@ -43,17 +43,20 @@ enum SubresourceFilterAction {
// Content settings:
//
+ // Blocked => The subresource filter will block resources.
+ // Allowed => The subresource filter will not block resources.
+ //
// Content setting updated automatically via the standard UI.
- kActionContentSettingsBlockedFromUI,
+ kActionContentSettingsAllowedFromUI,
// Content settings which target specific origins (e.g. no wildcards). These
// updates do not include updates from the main UI.
- kActionContentSettingsAllowed,
kActionContentSettingsBlocked,
+ kActionContentSettingsAllowed,
// Global settings.
- kActionContentSettingsAllowedGlobal,
kActionContentSettingsBlockedGlobal,
+ kActionContentSettingsAllowedGlobal,
// A wildcard update. The current content settings API makes this a bit
// difficult to see whether it is Block or Allow. This should not be a huge
@@ -68,11 +71,12 @@ enum SubresourceFilterAction {
// on navigations on the same origin within a certain time.
kActionUISuppressed,
- // The feature was blocked via content setting manually while smart UI was
- // suppressing the UI. Potentially indicates that the smart UI is too
- // aggressive if this happens frequently. This is a reported alongside
- // kActionContentSettingsBlocked if the UI is currently in suppressed mode.
- kActionContentSettingsBlockedWhileUISuppressed,
+ // Subresources were explicitly allowed via manual content setting changes
+ // while smart UI was suppressing the UI. Potentially indicates that the smart
+ // UI is too aggressive if this happens frequently. This is reported
+ // alongside kActionContentSettingsAllowed if the UI is currently in
+ // suppressed mode.
+ kActionContentSettingsAllowedWhileUISuppressed,
kActionLastEntry
};
« no previous file with comments | « no previous file | chrome/browser/subresource_filter/chrome_subresource_filter_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698