summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-04 19:19:59 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-04 19:19:59 +0000
commit6a5f77c3df9771d76333e665df587f5a31e08f41 (patch)
tree939ccf8b37b01319781d5b2811b30ec7df9f9599 /net
parente2f2ded6e71f88fd9d8fab165b29af458fb95713 (diff)
downloadchromium_src-6a5f77c3df9771d76333e665df587f5a31e08f41.zip
chromium_src-6a5f77c3df9771d76333e665df587f5a31e08f41.tar.gz
chromium_src-6a5f77c3df9771d76333e665df587f5a31e08f41.tar.bz2
Introduced the URLBlacklistManager, and wired it to various places.
This is part of a work in progress (http://codereview.chromium.org/7716003). This patch is meant to introduce the blacklist manager, which listens to prefs changes on the UI thread (later to be managed by policies) and filters URLRequests on the IO thread. Subsequent patches will build the blacklist based on the preferences, and block URLRequests that match the list. The policy will be introduced once everything else is ready. BUG=49612 TEST=URLBlacklistManagerTest; everything still works as before Review URL: http://codereview.chromium.org/7747018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/net_log_event_type_list.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h
index db26071..1369790 100644
--- a/net/base/net_log_event_type_list.h
+++ b/net/base/net_log_event_type_list.h
@@ -1206,3 +1206,13 @@ EVENT_TYPE(CHROME_EXTENSION_MODIFIED_HEADERS)
// "extension_id": <Extension ID that was ignored>
// }
EVENT_TYPE(CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT)
+
+// ------------------------------------------------------------------------
+// HostBlacklistManager
+// ------------------------------------------------------------------------
+
+// TODO(joaodasilva): Layering violation, see comment above.
+// http://crbug.com/90674.
+
+// This event is created when a request is blocked by a policy.
+EVENT_TYPE(CHROME_POLICY_ABORTED_REQUEST)