Chromium Code Reviews| Index: chrome/browser/net/chrome_network_delegate.cc |
| diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc |
| index 41cedf3124f7bb0a00bdfb92fd451a2737bb8d83..cc3159b90c9def1d134236aa00de3c18f3a2e7e4 100644 |
| --- a/chrome/browser/net/chrome_network_delegate.cc |
| +++ b/chrome/browser/net/chrome_network_delegate.cc |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/extensions/extension_info_map.h" |
| #include "chrome/browser/extensions/extension_proxy_api.h" |
| #include "chrome/browser/extensions/extension_webrequest_api.h" |
| +#include "chrome/browser/policy/url_blacklist_manager.h" |
| #include "chrome/browser/prefs/pref_member.h" |
| #include "chrome/browser/task_manager/task_manager.h" |
| #include "chrome/common/pref_names.h" |
| @@ -43,12 +44,14 @@ void ForwardProxyErrors(net::URLRequest* request, |
| ChromeNetworkDelegate::ChromeNetworkDelegate( |
| ExtensionEventRouterForwarder* event_router, |
| ExtensionInfoMap* extension_info_map, |
| + const policy::URLBlacklistManager* url_blacklist_manager, |
| void* profile, |
| BooleanPrefMember* enable_referrers) |
| : event_router_(event_router), |
| profile_(profile), |
| extension_info_map_(extension_info_map), |
| - enable_referrers_(enable_referrers) { |
| + enable_referrers_(enable_referrers), |
| + url_blacklist_manager_(url_blacklist_manager) { |
| DCHECK(event_router); |
| DCHECK(enable_referrers); |
| } |
| @@ -68,6 +71,13 @@ int ChromeNetworkDelegate::OnBeforeURLRequest( |
| net::URLRequest* request, |
| net::CompletionCallback* callback, |
| GURL* new_url) { |
| + if (url_blacklist_manager_ && |
| + url_blacklist_manager_->IsURLBlocked(request->url())) { |
| + // URL access blocked by policy. |
| + // TODO(joaodasilva): this error code isn't quite correct |
|
Mattias Nissler (ping if slow)
2011/08/31 14:58:09
period
Can we just define a new error code then?
Joao da Silva
2011/09/01 12:47:36
@willchan suggests using ERR_NETWORK_ACCESS_DENIED
|
| + return net::ERR_EMPTY_RESPONSE; |
| + } |
| + |
| if (!enable_referrers_->GetValue()) |
| request->set_referrer(std::string()); |
| return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( |