diff options
author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-04 19:19:59 +0000 |
---|---|---|
committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-04 19:19:59 +0000 |
commit | 6a5f77c3df9771d76333e665df587f5a31e08f41 (patch) | |
tree | 939ccf8b37b01319781d5b2811b30ec7df9f9599 /chrome/common | |
parent | e2f2ded6e71f88fd9d8fab165b29af458fb95713 (diff) | |
download | chromium_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 'chrome/common')
-rw-r--r-- | chrome/common/pref_names.cc | 6 | ||||
-rw-r--r-- | chrome/common/pref_names.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index a1dde85..2f0e10a 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -334,6 +334,12 @@ const char kDisableSpdy[] = "spdy.disabled"; // Disables the listed protocol schemes. const char kDisabledSchemes[] = "protocol.disabled_schemes"; +// Blocks access to the listed host patterns. +const char kUrlBlacklist[] = "policy.url_blacklist"; + +// Allows access to the listed host patterns, as exceptions to the blacklist. +const char kUrlWhitelist[] = "policy.url_whitelist"; + // Boolean pref indicating whether the instant confirm dialog has been shown. const char kInstantConfirmDialogShown[] = "instant.confirm_dialog_shown"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index dba5a37..44b1ae9 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -130,6 +130,8 @@ extern const char kDnsHostReferralList[]; // OBSOLETE extern const char kDnsPrefetchingHostReferralList[]; extern const char kDisableSpdy[]; extern const char kDisabledSchemes[]; +extern const char kUrlBlacklist[]; +extern const char kUrlWhitelist[]; extern const char kInstantConfirmDialogShown[]; extern const char kInstantEnabled[]; extern const char kInstantEnabledOnce[]; |