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

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

Issue 11293252: Change Interceptors into URLRequestJobFactory::ProtocolHandlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync (including tedv's change) Created 8 years 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 <vector> 7 #include <vector>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/prefs/public/pref_member.h" 13 #include "base/prefs/public/pref_member.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "base/string_split.h" 15 #include "base/string_split.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/content_settings/cookie_settings.h" 17 #include "chrome/browser/content_settings/cookie_settings.h"
18 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 18 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
19 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 19 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
20 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 20 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
21 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 21 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
22 #include "chrome/browser/extensions/event_router_forwarder.h" 22 #include "chrome/browser/extensions/event_router_forwarder.h"
23 #include "chrome/browser/extensions/extension_info_map.h" 23 #include "chrome/browser/extensions/extension_info_map.h"
24 #include "chrome/browser/extensions/extension_process_manager.h" 24 #include "chrome/browser/extensions/extension_process_manager.h"
25 #include "chrome/browser/extensions/extension_system.h" 25 #include "chrome/browser/extensions/extension_system.h"
26 #include "chrome/browser/google/google_util.h" 26 #include "chrome/browser/google/google_util.h"
27 #include "chrome/browser/net/connect_interceptor.h"
27 #include "chrome/browser/net/load_time_stats.h" 28 #include "chrome/browser/net/load_time_stats.h"
28 #include "chrome/browser/performance_monitor/performance_monitor.h" 29 #include "chrome/browser/performance_monitor/performance_monitor.h"
29 #include "chrome/browser/prefs/pref_service.h" 30 #include "chrome/browser/prefs/pref_service.h"
30 #include "chrome/browser/profiles/profile_manager.h" 31 #include "chrome/browser/profiles/profile_manager.h"
31 #include "chrome/browser/task_manager/task_manager.h" 32 #include "chrome/browser/task_manager/task_manager.h"
32 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
33 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
34 #include "content/public/browser/browser_thread.h" 35 #include "content/public/browser/browser_thread.h"
35 #include "content/public/browser/render_view_host.h" 36 #include "content/public/browser/render_view_host.h"
36 #include "content/public/browser/resource_request_info.h" 37 #include "content/public/browser/resource_request_info.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 void ChromeNetworkDelegate::set_extension_info_map( 286 void ChromeNetworkDelegate::set_extension_info_map(
286 ExtensionInfoMap* extension_info_map) { 287 ExtensionInfoMap* extension_info_map) {
287 extension_info_map_ = extension_info_map; 288 extension_info_map_ = extension_info_map;
288 } 289 }
289 290
290 void ChromeNetworkDelegate::set_cookie_settings( 291 void ChromeNetworkDelegate::set_cookie_settings(
291 CookieSettings* cookie_settings) { 292 CookieSettings* cookie_settings) {
292 cookie_settings_ = cookie_settings; 293 cookie_settings_ = cookie_settings;
293 } 294 }
294 295
296 void ChromeNetworkDelegate::set_predictor(
297 chrome_browser_net::Predictor* predictor) {
298 connect_interceptor_.reset(
299 new chrome_browser_net::ConnectInterceptor(predictor));
300 }
301
295 // static 302 // static
296 void ChromeNetworkDelegate::NeverThrottleRequests() { 303 void ChromeNetworkDelegate::NeverThrottleRequests() {
297 g_never_throttle_requests_ = true; 304 g_never_throttle_requests_ = true;
298 } 305 }
299 306
300 // static 307 // static
301 void ChromeNetworkDelegate::InitializePrefsOnUIThread( 308 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
302 BooleanPrefMember* enable_referrers, 309 BooleanPrefMember* enable_referrers,
303 BooleanPrefMember* enable_do_not_track, 310 BooleanPrefMember* enable_do_not_track,
304 BooleanPrefMember* force_google_safe_search, 311 BooleanPrefMember* force_google_safe_search,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 base::Unretained(new_url)); 394 base::Unretained(new_url));
388 } 395 }
389 396
390 int rv = ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 397 int rv = ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
391 profile_, extension_info_map_.get(), request, wrapped_callback, 398 profile_, extension_info_map_.get(), request, wrapped_callback,
392 new_url); 399 new_url);
393 400
394 if (force_safe_search && rv == net::OK && new_url->is_empty()) 401 if (force_safe_search && rv == net::OK && new_url->is_empty())
395 ForceGoogleSafeSearch(request, new_url); 402 ForceGoogleSafeSearch(request, new_url);
396 403
404 if (connect_interceptor_.get())
mmenke 2012/12/18 20:32:15 nit: .get() not needed.
405 connect_interceptor_->WitnessURLRequest(request);
406
397 return rv; 407 return rv;
398 } 408 }
399 409
400 int ChromeNetworkDelegate::OnBeforeSendHeaders( 410 int ChromeNetworkDelegate::OnBeforeSendHeaders(
401 net::URLRequest* request, 411 net::URLRequest* request,
402 const net::CompletionCallback& callback, 412 const net::CompletionCallback& callback,
403 net::HttpRequestHeaders* headers) { 413 net::HttpRequestHeaders* headers) {
404 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 414 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
405 profile_, extension_info_map_.get(), request, callback, headers); 415 profile_, extension_info_map_.get(), request, callback, headers);
406 } 416 }
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 672
663 void ChromeNetworkDelegate::AccumulateContentLength( 673 void ChromeNetworkDelegate::AccumulateContentLength(
664 int64 received_content_length, int64 original_content_length) { 674 int64 received_content_length, int64 original_content_length) {
665 DCHECK_GE(received_content_length, 0); 675 DCHECK_GE(received_content_length, 0);
666 DCHECK_GE(original_content_length, 0); 676 DCHECK_GE(original_content_length, 0);
667 StoreAccumulatedContentLength(received_content_length, 677 StoreAccumulatedContentLength(received_content_length,
668 original_content_length); 678 original_content_length);
669 received_content_length_ += received_content_length; 679 received_content_length_ += received_content_length;
670 original_content_length_ += original_content_length; 680 original_content_length_ += original_content_length;
671 } 681 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698