summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
authoridanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 19:41:36 +0000
committeridanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-28 19:41:36 +0000
commitd0a96b6e4e7cc643c2af3c9ff434edb7ff2be2f3 (patch)
treec34cfdc608065a3ad4b4cebd43d891a7da99656f /chrome/browser/net
parent294202d3462e9cf80c71b71a75a004844ee892b0 (diff)
downloadchromium_src-d0a96b6e4e7cc643c2af3c9ff434edb7ff2be2f3.zip
chromium_src-d0a96b6e4e7cc643c2af3c9ff434edb7ff2be2f3.tar.gz
chromium_src-d0a96b6e4e7cc643c2af3c9ff434edb7ff2be2f3.tar.bz2
Moved the logical dependency on Blacklist from URLRequestContext
to ChromeURLRequestContext. BUG=16932 TEST=none Review URL: http://codereview.chromium.org/159519 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/chrome_url_request_context.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 9dc0393..debee5c 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -8,8 +8,10 @@
#include "chrome/common/pref_service.h"
#include "net/url_request/url_request_context.h"
-class Profile;
+class Blacklist;
class CommandLine;
+class Profile;
+
namespace net {
class ProxyConfig;
}
@@ -69,6 +71,9 @@ class ChromeURLRequestContext : public URLRequestContext,
virtual bool AllowSendingCookies(const URLRequest* request) const;
+ // Gets the Privacy Blacklist, if any for this context.
+ const Blacklist* blacklist() const { return blacklist_; }
+
private:
// Private constructor, use the static factory methods instead. This is
// expected to be called on the UI thread.
@@ -114,6 +119,7 @@ private:
scoped_ptr<SQLitePersistentCookieStore> cookie_db_;
PrefService* prefs_;
+ const Blacklist* blacklist_;
bool is_media_;
bool is_off_the_record_;
};