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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 10824257: Add ManagedModeURLFilter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/cookie_settings.h" 9 #include "chrome/browser/content_settings/cookie_settings.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
(...skipping 15 matching lines...) Expand all
26 #include "net/base/host_port_pair.h" 26 #include "net/base/host_port_pair.h"
27 #include "net/base/net_errors.h" 27 #include "net/base/net_errors.h"
28 #include "net/base/net_log.h" 28 #include "net/base/net_log.h"
29 #include "net/cookies/canonical_cookie.h" 29 #include "net/cookies/canonical_cookie.h"
30 #include "net/cookies/cookie_options.h" 30 #include "net/cookies/cookie_options.h"
31 #include "net/http/http_request_headers.h" 31 #include "net/http/http_request_headers.h"
32 #include "net/http/http_response_headers.h" 32 #include "net/http/http_response_headers.h"
33 #include "net/socket_stream/socket_stream.h" 33 #include "net/socket_stream/socket_stream.h"
34 #include "net/url_request/url_request.h" 34 #include "net/url_request/url_request.h"
35 35
36 #if !defined(OS_ANDROID)
37 #include "chrome/browser/managed_mode_url_filter.h"
38 #endif
39
36 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
37 #include "base/chromeos/chromeos_version.h" 41 #include "base/chromeos/chromeos_version.h"
38 #endif 42 #endif
39 43
40 #if defined(ENABLE_CONFIGURATION_POLICY) 44 #if defined(ENABLE_CONFIGURATION_POLICY)
41 #include "chrome/browser/policy/url_blacklist_manager.h" 45 #include "chrome/browser/policy/url_blacklist_manager.h"
42 #endif 46 #endif
43 47
44 using content::BrowserThread; 48 using content::BrowserThread;
45 using content::RenderViewHost; 49 using content::RenderViewHost;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 status, profile_id, process_id, render_view_id)); 126 status, profile_id, process_id, render_view_id));
123 } 127 }
124 } 128 }
125 129
126 } // namespace 130 } // namespace
127 131
128 ChromeNetworkDelegate::ChromeNetworkDelegate( 132 ChromeNetworkDelegate::ChromeNetworkDelegate(
129 extensions::EventRouterForwarder* event_router, 133 extensions::EventRouterForwarder* event_router,
130 ExtensionInfoMap* extension_info_map, 134 ExtensionInfoMap* extension_info_map,
131 const policy::URLBlacklistManager* url_blacklist_manager, 135 const policy::URLBlacklistManager* url_blacklist_manager,
136 const ManagedModeURLFilter* managed_mode_url_filter,
132 void* profile, 137 void* profile,
133 CookieSettings* cookie_settings, 138 CookieSettings* cookie_settings,
134 BooleanPrefMember* enable_referrers, 139 BooleanPrefMember* enable_referrers,
135 chrome_browser_net::CacheStats* cache_stats) 140 chrome_browser_net::CacheStats* cache_stats)
136 : event_router_(event_router), 141 : event_router_(event_router),
137 profile_(profile), 142 profile_(profile),
138 cookie_settings_(cookie_settings), 143 cookie_settings_(cookie_settings),
139 extension_info_map_(extension_info_map), 144 extension_info_map_(extension_info_map),
140 enable_referrers_(enable_referrers), 145 enable_referrers_(enable_referrers),
141 url_blacklist_manager_(url_blacklist_manager), 146 url_blacklist_manager_(url_blacklist_manager),
147 managed_mode_url_filter_(managed_mode_url_filter),
142 cache_stats_(cache_stats) { 148 cache_stats_(cache_stats) {
143 DCHECK(event_router); 149 DCHECK(event_router);
144 DCHECK(enable_referrers); 150 DCHECK(enable_referrers);
145 DCHECK(!profile || cookie_settings); 151 DCHECK(!profile || cookie_settings);
146 } 152 }
147 153
148 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 154 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
149 155
150 // static 156 // static
151 void ChromeNetworkDelegate::NeverThrottleRequests() { 157 void ChromeNetworkDelegate::NeverThrottleRequests() {
(...skipping 26 matching lines...) Expand all
178 url_blacklist_manager_->IsURLBlocked(request->url())) { 184 url_blacklist_manager_->IsURLBlocked(request->url())) {
179 // URL access blocked by policy. 185 // URL access blocked by policy.
180 request->net_log().AddEvent( 186 request->net_log().AddEvent(
181 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, 187 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
182 net::NetLog::StringCallback("url", 188 net::NetLog::StringCallback("url",
183 &request->url().possibly_invalid_spec())); 189 &request->url().possibly_invalid_spec()));
184 return net::ERR_NETWORK_ACCESS_DENIED; 190 return net::ERR_NETWORK_ACCESS_DENIED;
185 } 191 }
186 #endif 192 #endif
187 193
194 #if !defined(OS_ANDROID)
willchan no longer on Chromium 2012/08/14 17:12:29 Why is this not on for Android?
Bernhard Bauer 2012/08/14 23:36:32 ManagedModeURLFilter depends on policy code for wh
195 if (managed_mode_url_filter_ &&
196 !managed_mode_url_filter_->IsURLWhitelisted(request->url())) {
197 // Block for now.
198 return net::ERR_NETWORK_ACCESS_DENIED;
199 }
200 #endif
201
188 ForwardRequestStatus(REQUEST_STARTED, request, profile_); 202 ForwardRequestStatus(REQUEST_STARTED, request, profile_);
189 203
190 if (!enable_referrers_->GetValue()) 204 if (!enable_referrers_->GetValue())
191 request->set_referrer(std::string()); 205 request->set_referrer(std::string());
192 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 206 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
193 profile_, extension_info_map_.get(), request, callback, new_url); 207 profile_, extension_info_map_.get(), request, callback, new_url);
194 } 208 }
195 209
196 int ChromeNetworkDelegate::OnBeforeSendHeaders( 210 int ChromeNetworkDelegate::OnBeforeSendHeaders(
197 net::URLRequest* request, 211 net::URLRequest* request,
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 #endif 410 #endif
397 return net::OK; 411 return net::OK;
398 } 412 }
399 413
400 void ChromeNetworkDelegate::OnCacheWaitStateChange( 414 void ChromeNetworkDelegate::OnCacheWaitStateChange(
401 const net::URLRequest& request, 415 const net::URLRequest& request,
402 CacheWaitState state) { 416 CacheWaitState state) {
403 if (cache_stats_) 417 if (cache_stats_)
404 cache_stats_->OnCacheWaitStateChange(request, state); 418 cache_stats_->OnCacheWaitStateChange(request, state);
405 } 419 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698