diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 18:14:49 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 18:14:49 +0000 |
| commit | 363119947a1e9111c19c326a2844bc60a29fabba (patch) | |
| tree | a008f948a2591ffec99b7b25040d6c74815b6a01 /chrome/browser/resources | |
| parent | 4f67d8a72d73ca17ae35434e3301e708fddd2970 (diff) | |
| download | chromium_src-363119947a1e9111c19c326a2844bc60a29fabba.zip chromium_src-363119947a1e9111c19c326a2844bc60a29fabba.tar.gz chromium_src-363119947a1e9111c19c326a2844bc60a29fabba.tar.bz2 | |
Implement delaying resource requests until privacy blacklists are ready.
Associate a BlacklistRequestInfo with each URLRequest started by ResourceDispatcherHost so that in various places we get access to the right BlacklistManager (each Profile has its own), and lazily cache a Blacklist::Match.
BlacklistListener controls delaying requests until the privacy blacklist is ready for the request.
BlacklistInterceptor handles substituting real response with a blocking page or blocking image. I've temporarily removed support for unblocking things. It was too hacky.
This change also removes a large block of blacklist-related code from RDH to more focused classes. Should make it a little more readable.
This should also make BlacklistManagerBrowserTest not flaky.
TEST=Covered by browser_tests and unit_tests.
BUG=21541, 29113
Review URL: http://codereview.chromium.org/501082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/privacy_blacklist_block.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/resources/privacy_blacklist_block.html b/chrome/browser/resources/privacy_blacklist_block.html index 2f23b4f..3836d79 100644 --- a/chrome/browser/resources/privacy_blacklist_block.html +++ b/chrome/browser/resources/privacy_blacklist_block.html @@ -37,7 +37,6 @@ body { <ul style="list-style-type: none"> <li><a i18n-values="href: url" i18n-content="name" target="_blank"></a></li> </ul> - <p><a i18n-values="href: bypass" i18n-content="unblock"></a></p> </div> </td> </table> |