Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7662)

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

Issue 10824257: Add ManagedModeURLFilter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile fix Created 8 years, 4 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
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 c9f69cc5f68ba611223563a6609831582d0aff68..0ddb5dae0886d7a4236ae57d6aa0ca014b9de32b 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -33,6 +33,10 @@
#include "net/socket_stream/socket_stream.h"
#include "net/url_request/url_request.h"
+#if !defined(OS_ANDROID)
+#include "chrome/browser/managed_mode_url_filter.h"
+#endif
+
#if defined(OS_CHROMEOS)
#include "base/chromeos/chromeos_version.h"
#endif
@@ -129,6 +133,7 @@ ChromeNetworkDelegate::ChromeNetworkDelegate(
extensions::EventRouterForwarder* 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,
@@ -139,6 +144,7 @@ ChromeNetworkDelegate::ChromeNetworkDelegate(
extension_info_map_(extension_info_map),
enable_referrers_(enable_referrers),
url_blacklist_manager_(url_blacklist_manager),
+ managed_mode_url_filter_(managed_mode_url_filter),
cache_stats_(cache_stats) {
DCHECK(event_router);
DCHECK(enable_referrers);
@@ -185,6 +191,14 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
}
#endif
+#if !defined(OS_ANDROID)
+ if (managed_mode_url_filter_ &&
+ !managed_mode_url_filter_->IsURLWhitelisted(request->url())) {
+ // Block for now.
+ return net::ERR_NETWORK_ACCESS_DENIED;
+ }
+#endif
+
ForwardRequestStatus(REQUEST_STARTED, request, profile_);
if (!enable_referrers_->GetValue())
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | chrome/browser/net/chrome_network_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698