OLD | NEW |
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 <stdlib.h> | 7 #include <stdlib.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/content_settings/cookie_settings.h" | 21 #include "chrome/browser/content_settings/cookie_settings.h" |
22 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 22 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
23 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 23 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
24 #include "chrome/browser/extensions/api/proxy/proxy_api.h" | 24 #include "chrome/browser/extensions/api/proxy/proxy_api.h" |
25 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 25 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
26 #include "chrome/browser/extensions/event_router_forwarder.h" | 26 #include "chrome/browser/extensions/event_router_forwarder.h" |
27 #include "chrome/browser/extensions/extension_info_map.h" | 27 #include "chrome/browser/extensions/extension_info_map.h" |
28 #include "chrome/browser/extensions/extension_process_manager.h" | 28 #include "chrome/browser/extensions/extension_process_manager.h" |
29 #include "chrome/browser/extensions/extension_system.h" | 29 #include "chrome/browser/extensions/extension_system.h" |
30 #include "chrome/browser/google/google_util.h" | 30 #include "chrome/browser/google/google_util.h" |
| 31 #include "chrome/browser/net/client_hints.h" |
31 #include "chrome/browser/net/connect_interceptor.h" | 32 #include "chrome/browser/net/connect_interceptor.h" |
32 #include "chrome/browser/net/load_time_stats.h" | 33 #include "chrome/browser/net/load_time_stats.h" |
33 #include "chrome/browser/performance_monitor/performance_monitor.h" | 34 #include "chrome/browser/performance_monitor/performance_monitor.h" |
34 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 35 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
35 #include "chrome/browser/profiles/profile_manager.h" | 36 #include "chrome/browser/profiles/profile_manager.h" |
36 #include "chrome/browser/task_manager/task_manager.h" | 37 #include "chrome/browser/task_manager/task_manager.h" |
37 #include "chrome/common/pref_names.h" | 38 #include "chrome/common/pref_names.h" |
38 #include "chrome/common/url_constants.h" | 39 #include "chrome/common/url_constants.h" |
39 #include "content/public/browser/browser_thread.h" | 40 #include "content/public/browser/browser_thread.h" |
40 #include "content/public/browser/render_view_host.h" | 41 #include "content/public/browser/render_view_host.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 bool ChromeNetworkDelegate::g_allow_file_access_ = true; | 73 bool ChromeNetworkDelegate::g_allow_file_access_ = true; |
73 #endif | 74 #endif |
74 | 75 |
75 // This remains false unless the --disable-extensions-http-throttling | 76 // This remains false unless the --disable-extensions-http-throttling |
76 // flag is passed to the browser. | 77 // flag is passed to the browser. |
77 bool ChromeNetworkDelegate::g_never_throttle_requests_ = false; | 78 bool ChromeNetworkDelegate::g_never_throttle_requests_ = false; |
78 | 79 |
79 namespace { | 80 namespace { |
80 | 81 |
81 const char kDNTHeader[] = "DNT"; | 82 const char kDNTHeader[] = "DNT"; |
| 83 const char kClientHintsHeader[] = "CH"; |
82 | 84 |
83 // If the |request| failed due to problems with a proxy, forward the error to | 85 // If the |request| failed due to problems with a proxy, forward the error to |
84 // the proxy extension API. | 86 // the proxy extension API. |
85 void ForwardProxyErrors(net::URLRequest* request, | 87 void ForwardProxyErrors(net::URLRequest* request, |
86 extensions::EventRouterForwarder* event_router, | 88 extensions::EventRouterForwarder* event_router, |
87 void* profile) { | 89 void* profile) { |
88 if (request->status().status() == net::URLRequestStatus::FAILED) { | 90 if (request->status().status() == net::URLRequestStatus::FAILED) { |
89 switch (request->status().error()) { | 91 switch (request->status().error()) { |
90 case net::ERR_PROXY_AUTH_UNSUPPORTED: | 92 case net::ERR_PROXY_AUTH_UNSUPPORTED: |
91 case net::ERR_PROXY_CONNECTION_FAILED: | 93 case net::ERR_PROXY_CONNECTION_FAILED: |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
523 CookieSettings* cookie_settings) { | 525 CookieSettings* cookie_settings) { |
524 cookie_settings_ = cookie_settings; | 526 cookie_settings_ = cookie_settings; |
525 } | 527 } |
526 | 528 |
527 void ChromeNetworkDelegate::set_predictor( | 529 void ChromeNetworkDelegate::set_predictor( |
528 chrome_browser_net::Predictor* predictor) { | 530 chrome_browser_net::Predictor* predictor) { |
529 connect_interceptor_.reset( | 531 connect_interceptor_.reset( |
530 new chrome_browser_net::ConnectInterceptor(predictor)); | 532 new chrome_browser_net::ConnectInterceptor(predictor)); |
531 } | 533 } |
532 | 534 |
| 535 void ChromeNetworkDelegate::SetEnableClientHints() { |
| 536 client_hints_.reset(new ClientHints()); |
| 537 client_hints_->Init(); |
| 538 } |
| 539 |
533 // static | 540 // static |
534 void ChromeNetworkDelegate::NeverThrottleRequests() { | 541 void ChromeNetworkDelegate::NeverThrottleRequests() { |
535 g_never_throttle_requests_ = true; | 542 g_never_throttle_requests_ = true; |
536 } | 543 } |
537 | 544 |
538 // static | 545 // static |
539 void ChromeNetworkDelegate::InitializePrefsOnUIThread( | 546 void ChromeNetworkDelegate::InitializePrefsOnUIThread( |
540 BooleanPrefMember* enable_referrers, | 547 BooleanPrefMember* enable_referrers, |
541 BooleanPrefMember* enable_do_not_track, | 548 BooleanPrefMember* enable_do_not_track, |
542 BooleanPrefMember* force_google_safe_search, | 549 BooleanPrefMember* force_google_safe_search, |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
607 } | 614 } |
608 #endif | 615 #endif |
609 | 616 |
610 ForwardRequestStatus(REQUEST_STARTED, request, profile_); | 617 ForwardRequestStatus(REQUEST_STARTED, request, profile_); |
611 | 618 |
612 if (!enable_referrers_->GetValue()) | 619 if (!enable_referrers_->GetValue()) |
613 request->SetReferrer(std::string()); | 620 request->SetReferrer(std::string()); |
614 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) | 621 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) |
615 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); | 622 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); |
616 | 623 |
| 624 if (client_hints_) { |
| 625 request->SetExtraRequestHeaderByName(kClientHintsHeader, |
| 626 client_hints_->GetString(), true); |
| 627 } |
| 628 |
617 bool force_safe_search = force_google_safe_search_ && | 629 bool force_safe_search = force_google_safe_search_ && |
618 force_google_safe_search_->GetValue(); | 630 force_google_safe_search_->GetValue(); |
619 | 631 |
620 net::CompletionCallback wrapped_callback = callback; | 632 net::CompletionCallback wrapped_callback = callback; |
621 if (force_safe_search) { | 633 if (force_safe_search) { |
622 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper, | 634 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper, |
623 callback, | 635 callback, |
624 base::Unretained(request), | 636 base::Unretained(request), |
625 base::Unretained(new_url)); | 637 base::Unretained(new_url)); |
626 } | 638 } |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
934 int64 received_content_length, int64 original_content_length, | 946 int64 received_content_length, int64 original_content_length, |
935 bool data_reduction_proxy_was_used) { | 947 bool data_reduction_proxy_was_used) { |
936 DCHECK_GE(received_content_length, 0); | 948 DCHECK_GE(received_content_length, 0); |
937 DCHECK_GE(original_content_length, 0); | 949 DCHECK_GE(original_content_length, 0); |
938 StoreAccumulatedContentLength(received_content_length, | 950 StoreAccumulatedContentLength(received_content_length, |
939 original_content_length, | 951 original_content_length, |
940 data_reduction_proxy_was_used); | 952 data_reduction_proxy_was_used); |
941 received_content_length_ += received_content_length; | 953 received_content_length_ += received_content_length; |
942 original_content_length_ += original_content_length; | 954 original_content_length_ += original_content_length; |
943 } | 955 } |
OLD | NEW |