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

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

Issue 24451003: Client Hints (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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
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 <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 23 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
24 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 24 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
25 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 25 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
26 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 26 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
27 #include "chrome/browser/extensions/event_router_forwarder.h" 27 #include "chrome/browser/extensions/event_router_forwarder.h"
28 #include "chrome/browser/extensions/extension_info_map.h" 28 #include "chrome/browser/extensions/extension_info_map.h"
29 #include "chrome/browser/extensions/extension_process_manager.h" 29 #include "chrome/browser/extensions/extension_process_manager.h"
30 #include "chrome/browser/extensions/extension_system.h" 30 #include "chrome/browser/extensions/extension_system.h"
31 #include "chrome/browser/google/google_util.h" 31 #include "chrome/browser/google/google_util.h"
32 #include "chrome/browser/net/chrome_network_data_saving_metrics.h" 32 #include "chrome/browser/net/chrome_network_data_saving_metrics.h"
33 #include "chrome/browser/net/client_hints.h"
33 #include "chrome/browser/net/connect_interceptor.h" 34 #include "chrome/browser/net/connect_interceptor.h"
34 #include "chrome/browser/net/load_time_stats.h" 35 #include "chrome/browser/net/load_time_stats.h"
35 #include "chrome/browser/performance_monitor/performance_monitor.h" 36 #include "chrome/browser/performance_monitor/performance_monitor.h"
36 #include "chrome/browser/profiles/profile_manager.h" 37 #include "chrome/browser/profiles/profile_manager.h"
37 #include "chrome/browser/task_manager/task_manager.h" 38 #include "chrome/browser/task_manager/task_manager.h"
38 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
39 #include "chrome/common/url_constants.h" 40 #include "chrome/common/url_constants.h"
40 #include "content/public/browser/browser_thread.h" 41 #include "content/public/browser/browser_thread.h"
41 #include "content/public/browser/render_view_host.h" 42 #include "content/public/browser/render_view_host.h"
42 #include "content/public/browser/resource_request_info.h" 43 #include "content/public/browser/resource_request_info.h"
(...skipping 30 matching lines...) Expand all
73 bool ChromeNetworkDelegate::g_allow_file_access_ = true; 74 bool ChromeNetworkDelegate::g_allow_file_access_ = true;
74 #endif 75 #endif
75 76
76 // This remains false unless the --disable-extensions-http-throttling 77 // This remains false unless the --disable-extensions-http-throttling
77 // flag is passed to the browser. 78 // flag is passed to the browser.
78 bool ChromeNetworkDelegate::g_never_throttle_requests_ = false; 79 bool ChromeNetworkDelegate::g_never_throttle_requests_ = false;
79 80
80 namespace { 81 namespace {
81 82
82 const char kDNTHeader[] = "DNT"; 83 const char kDNTHeader[] = "DNT";
84 const char kClientHintsDevicePixelRatioHeader[] = "CH-DPR";
mmenke 2013/09/25 16:26:19 optional: This may make more sense as a static me
mmenke 2013/09/25 16:26:19 ERm...This seems to violate the spec linked in the
bengr 2013/09/25 17:25:52 There's a newer spec. The CL points to it but a co
bengr 2013/09/25 17:25:52 Done.
83 85
84 // If the |request| failed due to problems with a proxy, forward the error to 86 // If the |request| failed due to problems with a proxy, forward the error to
85 // the proxy extension API. 87 // the proxy extension API.
86 void ForwardProxyErrors(net::URLRequest* request, 88 void ForwardProxyErrors(net::URLRequest* request,
87 extensions::EventRouterForwarder* event_router, 89 extensions::EventRouterForwarder* event_router,
88 void* profile) { 90 void* profile) {
89 if (request->status().status() == net::URLRequestStatus::FAILED) { 91 if (request->status().status() == net::URLRequestStatus::FAILED) {
90 switch (request->status().error()) { 92 switch (request->status().error()) {
91 case net::ERR_PROXY_AUTH_UNSUPPORTED: 93 case net::ERR_PROXY_AUTH_UNSUPPORTED:
92 case net::ERR_PROXY_CONNECTION_FAILED: 94 case net::ERR_PROXY_CONNECTION_FAILED:
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 CookieSettings* cookie_settings) { 329 CookieSettings* cookie_settings) {
328 cookie_settings_ = cookie_settings; 330 cookie_settings_ = cookie_settings;
329 } 331 }
330 332
331 void ChromeNetworkDelegate::set_predictor( 333 void ChromeNetworkDelegate::set_predictor(
332 chrome_browser_net::Predictor* predictor) { 334 chrome_browser_net::Predictor* predictor) {
333 connect_interceptor_.reset( 335 connect_interceptor_.reset(
334 new chrome_browser_net::ConnectInterceptor(predictor)); 336 new chrome_browser_net::ConnectInterceptor(predictor));
335 } 337 }
336 338
339 void ChromeNetworkDelegate::SetEnableClientHints() {
340 client_hints_.reset(new ClientHints());
341 client_hints_->Init();
342 }
343
337 // static 344 // static
338 void ChromeNetworkDelegate::NeverThrottleRequests() { 345 void ChromeNetworkDelegate::NeverThrottleRequests() {
339 g_never_throttle_requests_ = true; 346 g_never_throttle_requests_ = true;
340 } 347 }
341 348
342 // static 349 // static
343 void ChromeNetworkDelegate::InitializePrefsOnUIThread( 350 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
344 BooleanPrefMember* enable_referrers, 351 BooleanPrefMember* enable_referrers,
345 BooleanPrefMember* enable_do_not_track, 352 BooleanPrefMember* enable_do_not_track,
346 BooleanPrefMember* force_google_safe_search, 353 BooleanPrefMember* force_google_safe_search,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 } 418 }
412 #endif 419 #endif
413 420
414 ForwardRequestStatus(REQUEST_STARTED, request, profile_); 421 ForwardRequestStatus(REQUEST_STARTED, request, profile_);
415 422
416 if (!enable_referrers_->GetValue()) 423 if (!enable_referrers_->GetValue())
417 request->SetReferrer(std::string()); 424 request->SetReferrer(std::string());
418 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) 425 if (enable_do_not_track_ && enable_do_not_track_->GetValue())
419 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); 426 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
420 427
428 if (client_hints_) {
429 request->SetExtraRequestHeaderByName(kClientHintsDevicePixelRatioHeader,
430 client_hints_->GetString(), true);
431 }
432
421 bool force_safe_search = force_google_safe_search_ && 433 bool force_safe_search = force_google_safe_search_ &&
422 force_google_safe_search_->GetValue(); 434 force_google_safe_search_->GetValue();
423 435
424 net::CompletionCallback wrapped_callback = callback; 436 net::CompletionCallback wrapped_callback = callback;
425 if (force_safe_search) { 437 if (force_safe_search) {
426 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper, 438 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper,
427 callback, 439 callback,
428 base::Unretained(request), 440 base::Unretained(request),
429 base::Unretained(new_url)); 441 base::Unretained(new_url));
430 } 442 }
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 int64 received_content_length, int64 original_content_length, 750 int64 received_content_length, int64 original_content_length,
739 bool via_data_reduction_proxy) { 751 bool via_data_reduction_proxy) {
740 DCHECK_GE(received_content_length, 0); 752 DCHECK_GE(received_content_length, 0);
741 DCHECK_GE(original_content_length, 0); 753 DCHECK_GE(original_content_length, 0);
742 StoreAccumulatedContentLength(received_content_length, 754 StoreAccumulatedContentLength(received_content_length,
743 original_content_length, 755 original_content_length,
744 via_data_reduction_proxy); 756 via_data_reduction_proxy);
745 received_content_length_ += received_content_length; 757 received_content_length_ += received_content_length;
746 original_content_length_ += original_content_length; 758 original_content_length_ += original_content_length;
747 } 759 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698