chrome/browser/net/chrome_network_delegate.cc - Issue 10692158: Refactor URLBlacklistManager to use URLMatcher.

Unified Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 10692158: Refactor URLBlacklistManager to use URLMatcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/managed_mode_url_filter_unittest.cc ('K') | « chrome/browser/net/chrome_network_delegate.h ('k') | chrome/browser/policy/url_blacklist_manager.h » ('j') | chrome/browser/policy/url_blacklist_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 cc87909b0cd04a57aea64fb1ad96f06d167f1a36..1afcb2328988834e593bc4fac147f50d150c4836 100644

--- a/chrome/browser/net/chrome_network_delegate.cc

+++ b/chrome/browser/net/chrome_network_delegate.cc

@@ -14,6 +14,8 @@

#include "chrome/browser/extensions/extension_event_router_forwarder.h"

#include "chrome/browser/extensions/extension_info_map.h"

#include "chrome/browser/extensions/extension_process_manager.h"

+#include "chrome/browser/managed_mode.h"

Joao da Silva 2012/07/13 12:32:11 Needed?

Bernhard Bauer 2012/07/13 14:21:07 Nope; removed.

+#include "chrome/browser/managed_mode_url_filter.h"

#include "chrome/browser/prefs/pref_member.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/task_manager/task_manager.h"

@@ -123,6 +125,7 @@ ChromeNetworkDelegate::ChromeNetworkDelegate(

ExtensionEventRouterForwarder* event_router,

ExtensionInfoMap* extension_info_map,

const policy::URLBlacklistManager* url_blacklist_manager,

+ const ManagedModeURLFilter* managed_mode_url_filter,

void* profile,

CookieSettings* cookie_settings,

BooleanPrefMember* enable_referrers)

@@ -132,7 +135,8 @@ ChromeNetworkDelegate::ChromeNetworkDelegate(

extension_info_map_(extension_info_map),

enable_referrers_(enable_referrers),

never_throttle_requests_(false),

- url_blacklist_manager_(url_blacklist_manager) {

+ url_blacklist_manager_(url_blacklist_manager),

+ managed_mode_url_filter_(managed_mode_url_filter) {

DCHECK(event_router);

DCHECK(enable_referrers);

DCHECK(!profile || cookie_settings);

@@ -177,6 +181,12 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(

}

#endif

+ if (managed_mode_url_filter_ &&

+ managed_mode_url_filter_->IsURLWhitelisted(request->url())) {

Joao da Silva 2012/07/13 12:32:11 Blocked when whitelisted? After looking at the imp

Bernhard Bauer 2012/07/13 14:21:07 Indeed :-D Fixed.

+ // Block for now.

+ return net::ERR_NETWORK_ACCESS_DENIED;

+ }

ForwardRequestStatus(REQUEST_STARTED, request, profile_);

if (!enable_referrers_->GetValue())