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

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

Issue 11970002: Added Client-Hints. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Nit Created 7 years, 11 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 <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/client_hints.h"
27 #include "chrome/browser/net/connect_interceptor.h" 28 #include "chrome/browser/net/connect_interceptor.h"
28 #include "chrome/browser/net/load_time_stats.h" 29 #include "chrome/browser/net/load_time_stats.h"
29 #include "chrome/browser/performance_monitor/performance_monitor.h" 30 #include "chrome/browser/performance_monitor/performance_monitor.h"
30 #include "chrome/browser/prefs/pref_service.h" 31 #include "chrome/browser/prefs/pref_service.h"
31 #include "chrome/browser/profiles/profile_manager.h" 32 #include "chrome/browser/profiles/profile_manager.h"
32 #include "chrome/browser/task_manager/task_manager.h" 33 #include "chrome/browser/task_manager/task_manager.h"
33 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
34 #include "chrome/common/url_constants.h" 35 #include "chrome/common/url_constants.h"
35 #include "content/public/browser/browser_thread.h" 36 #include "content/public/browser/browser_thread.h"
36 #include "content/public/browser/render_view_host.h" 37 #include "content/public/browser/render_view_host.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 bool ChromeNetworkDelegate::g_allow_file_access_ = true; 69 bool ChromeNetworkDelegate::g_allow_file_access_ = true;
69 #endif 70 #endif
70 71
71 // This remains false unless the --disable-extensions-http-throttling 72 // This remains false unless the --disable-extensions-http-throttling
72 // flag is passed to the browser. 73 // flag is passed to the browser.
73 bool ChromeNetworkDelegate::g_never_throttle_requests_ = false; 74 bool ChromeNetworkDelegate::g_never_throttle_requests_ = false;
74 75
75 namespace { 76 namespace {
76 77
77 const char kDNTHeader[] = "DNT"; 78 const char kDNTHeader[] = "DNT";
79 const char kClientHintsHeader[] = "Client-Hints";
78 80
79 // If the |request| failed due to problems with a proxy, forward the error to 81 // If the |request| failed due to problems with a proxy, forward the error to
80 // the proxy extension API. 82 // the proxy extension API.
81 void ForwardProxyErrors(net::URLRequest* request, 83 void ForwardProxyErrors(net::URLRequest* request,
82 extensions::EventRouterForwarder* event_router, 84 extensions::EventRouterForwarder* event_router,
83 void* profile) { 85 void* profile) {
84 if (request->status().status() == net::URLRequestStatus::FAILED) { 86 if (request->status().status() == net::URLRequestStatus::FAILED) {
85 switch (request->status().error()) { 87 switch (request->status().error()) {
86 case net::ERR_PROXY_AUTH_UNSUPPORTED: 88 case net::ERR_PROXY_AUTH_UNSUPPORTED:
87 case net::ERR_PROXY_CONNECTION_FAILED: 89 case net::ERR_PROXY_CONNECTION_FAILED:
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 profile_(NULL), 274 profile_(NULL),
273 enable_referrers_(enable_referrers), 275 enable_referrers_(enable_referrers),
274 enable_do_not_track_(NULL), 276 enable_do_not_track_(NULL),
275 force_google_safe_search_(NULL), 277 force_google_safe_search_(NULL),
276 url_blacklist_manager_(NULL), 278 url_blacklist_manager_(NULL),
277 load_time_stats_(NULL), 279 load_time_stats_(NULL),
278 received_content_length_(0), 280 received_content_length_(0),
279 original_content_length_(0) { 281 original_content_length_(0) {
280 DCHECK(event_router); 282 DCHECK(event_router);
281 DCHECK(enable_referrers); 283 DCHECK(enable_referrers);
284 client_hints_ = ClientHints::create();
Ryan Sleevi 2013/01/16 23:19:56 Why a static method? Why not new ClientHints?
bengr (incorrect) 2013/01/17 01:50:44 Done.
282 } 285 }
283 286
284 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 287 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
285 288
286 void ChromeNetworkDelegate::set_extension_info_map( 289 void ChromeNetworkDelegate::set_extension_info_map(
287 ExtensionInfoMap* extension_info_map) { 290 ExtensionInfoMap* extension_info_map) {
288 extension_info_map_ = extension_info_map; 291 extension_info_map_ = extension_info_map;
289 } 292 }
290 293
291 void ChromeNetworkDelegate::set_cookie_settings( 294 void ChromeNetworkDelegate::set_cookie_settings(
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 } 379 }
377 #endif 380 #endif
378 381
379 ForwardRequestStatus(REQUEST_STARTED, request, profile_); 382 ForwardRequestStatus(REQUEST_STARTED, request, profile_);
380 383
381 if (!enable_referrers_->GetValue()) 384 if (!enable_referrers_->GetValue())
382 request->set_referrer(std::string()); 385 request->set_referrer(std::string());
383 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) 386 if (enable_do_not_track_ && enable_do_not_track_->GetValue())
384 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); 387 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
385 388
389 // TODO(bengr): Put behind experimental flag.
390 int process_id, render_view_id;
391 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
392 if (info && info->GetAssociatedRenderView(&process_id, &render_view_id)) {
393 if (client_hints_->IsScreenInfoAvailable(process_id, render_view_id)) {
394 std::string client_hints_value =
395 client_hints_->GetScreenInfoHints(process_id, render_view_id);
396 request->SetExtraRequestHeaderByName(kClientHintsHeader,
397 client_hints_value, true);
398 DVLOG(2) << kClientHintsHeader << ": " << client_hints_value
399 << " for " << request->url().spec();
400 } else {
401 DVLOG(2) << kClientHintsHeader << " not available for "
402 << request->url().spec();
403 }
404 }
405
386 bool force_safe_search = force_google_safe_search_ && 406 bool force_safe_search = force_google_safe_search_ &&
387 force_google_safe_search_->GetValue(); 407 force_google_safe_search_->GetValue();
388 408
389 net::CompletionCallback wrapped_callback = callback; 409 net::CompletionCallback wrapped_callback = callback;
390 if (force_safe_search) { 410 if (force_safe_search) {
391 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper, 411 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper,
392 callback, 412 callback,
393 base::Unretained(request), 413 base::Unretained(request),
394 base::Unretained(new_url)); 414 base::Unretained(new_url));
395 } 415 }
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 692
673 void ChromeNetworkDelegate::AccumulateContentLength( 693 void ChromeNetworkDelegate::AccumulateContentLength(
674 int64 received_content_length, int64 original_content_length) { 694 int64 received_content_length, int64 original_content_length) {
675 DCHECK_GE(received_content_length, 0); 695 DCHECK_GE(received_content_length, 0);
676 DCHECK_GE(original_content_length, 0); 696 DCHECK_GE(original_content_length, 0);
677 StoreAccumulatedContentLength(received_content_length, 697 StoreAccumulatedContentLength(received_content_length,
678 original_content_length); 698 original_content_length);
679 received_content_length_ += received_content_length; 699 received_content_length_ += received_content_length;
680 original_content_length_ += original_content_length; 700 original_content_length_ += original_content_length;
681 } 701 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698