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

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

Issue 948843003: Removed partial Client Hints implementation from the Chrome side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | chrome/browser/net/client_hints.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 11 matching lines...) Expand all
22 #include "base/profiler/scoped_tracker.h" 22 #include "base/profiler/scoped_tracker.h"
23 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
25 #include "base/time/time.h" 25 #include "base/time/time.h"
26 #include "base/trace_event/trace_event.h" 26 #include "base/trace_event/trace_event.h"
27 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/content_settings/cookie_settings.h" 28 #include "chrome/browser/content_settings/cookie_settings.h"
29 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 29 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
30 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 30 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
31 #include "chrome/browser/net/chrome_extensions_network_delegate.h" 31 #include "chrome/browser/net/chrome_extensions_network_delegate.h"
32 #include "chrome/browser/net/client_hints.h"
33 #include "chrome/browser/net/connect_interceptor.h" 32 #include "chrome/browser/net/connect_interceptor.h"
34 #include "chrome/browser/net/safe_search_util.h" 33 #include "chrome/browser/net/safe_search_util.h"
35 #include "chrome/browser/prerender/prerender_tracker.h" 34 #include "chrome/browser/prerender/prerender_tracker.h"
36 #include "chrome/browser/profiles/profile_manager.h" 35 #include "chrome/browser/profiles/profile_manager.h"
37 #include "chrome/browser/task_manager/task_manager.h" 36 #include "chrome/browser/task_manager/task_manager.h"
38 #include "chrome/common/pref_names.h" 37 #include "chrome/common/pref_names.h"
39 #include "components/domain_reliability/monitor.h" 38 #include "components/domain_reliability/monitor.h"
40 #include "content/public/browser/browser_thread.h" 39 #include "content/public/browser/browser_thread.h"
41 #include "content/public/browser/render_frame_host.h" 40 #include "content/public/browser/render_frame_host.h"
42 #include "content/public/browser/render_view_host.h" 41 #include "content/public/browser/render_view_host.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 CookieSettings* cookie_settings) { 317 CookieSettings* cookie_settings) {
319 cookie_settings_ = cookie_settings; 318 cookie_settings_ = cookie_settings;
320 } 319 }
321 320
322 void ChromeNetworkDelegate::set_predictor( 321 void ChromeNetworkDelegate::set_predictor(
323 chrome_browser_net::Predictor* predictor) { 322 chrome_browser_net::Predictor* predictor) {
324 connect_interceptor_.reset( 323 connect_interceptor_.reset(
325 new chrome_browser_net::ConnectInterceptor(predictor)); 324 new chrome_browser_net::ConnectInterceptor(predictor));
326 } 325 }
327 326
328 void ChromeNetworkDelegate::SetEnableClientHints() {
329 client_hints_.reset(new ClientHints());
330 client_hints_->Init();
331 }
332
333 // static 327 // static
334 #if defined(ENABLE_EXTENSIONS) 328 #if defined(ENABLE_EXTENSIONS)
335 void ChromeNetworkDelegate::NeverThrottleRequests() { 329 void ChromeNetworkDelegate::NeverThrottleRequests() {
336 g_never_throttle_requests_ = true; 330 g_never_throttle_requests_ = true;
337 } 331 }
338 #endif 332 #endif
339 333
340 // static 334 // static
341 void ChromeNetworkDelegate::InitializePrefsOnUIThread( 335 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
342 BooleanPrefMember* enable_referrers, 336 BooleanPrefMember* enable_referrers,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 } 391 }
398 #endif 392 #endif
399 393
400 extensions_delegate_->ForwardStartRequestStatus(request); 394 extensions_delegate_->ForwardStartRequestStatus(request);
401 395
402 if (!enable_referrers_->GetValue()) 396 if (!enable_referrers_->GetValue())
403 request->SetReferrer(std::string()); 397 request->SetReferrer(std::string());
404 if (enable_do_not_track_ && enable_do_not_track_->GetValue()) 398 if (enable_do_not_track_ && enable_do_not_track_->GetValue())
405 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */); 399 request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
406 400
407 if (client_hints_) {
408 request->SetExtraRequestHeaderByName(
409 ClientHints::kDevicePixelRatioHeader,
410 client_hints_->GetDevicePixelRatioHeader(), true);
411 }
412
413 bool force_safe_search = 401 bool force_safe_search =
414 (force_safe_search_ && force_safe_search_->GetValue()) || 402 (force_safe_search_ && force_safe_search_->GetValue()) ||
415 (force_google_safe_search_ && force_google_safe_search_->GetValue()); 403 (force_google_safe_search_ && force_google_safe_search_->GetValue());
416 404
417 net::CompletionCallback wrapped_callback = callback; 405 net::CompletionCallback wrapped_callback = callback;
418 if (force_safe_search) { 406 if (force_safe_search) {
419 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper, 407 wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper,
420 callback, 408 callback,
421 base::Unretained(request), 409 base::Unretained(request),
422 base::Unretained(new_url)); 410 base::Unretained(new_url));
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 return privacy_mode; 730 return privacy_mode;
743 } 731 }
744 732
745 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader( 733 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
746 const net::URLRequest& request, 734 const net::URLRequest& request,
747 const GURL& target_url, 735 const GURL& target_url,
748 const GURL& referrer_url) const { 736 const GURL& referrer_url) const {
749 ReportInvalidReferrerSend(target_url, referrer_url); 737 ReportInvalidReferrerSend(target_url, referrer_url);
750 return true; 738 return true;
751 } 739 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | chrome/browser/net/client_hints.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698