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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 load_time_stats_)); | 637 load_time_stats_)); |
638 extensions_request_context_.reset( | 638 extensions_request_context_.reset( |
639 new ChromeURLRequestContext( | 639 new ChromeURLRequestContext( |
640 ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS, | 640 ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS, |
641 load_time_stats_)); | 641 load_time_stats_)); |
642 | 642 |
643 ChromeNetworkDelegate* network_delegate = | 643 ChromeNetworkDelegate* network_delegate = |
644 new ChromeNetworkDelegate( | 644 new ChromeNetworkDelegate( |
645 io_thread_globals->extension_event_router_forwarder.get(), | 645 io_thread_globals->extension_event_router_forwarder.get(), |
646 &enable_referrers_); | 646 &enable_referrers_); |
| 647 if (command_line.HasSwitch(switches::kEnableClientHints)) |
| 648 network_delegate->set_enable_client_hints(); |
647 network_delegate->set_extension_info_map(profile_params_->extension_info_map); | 649 network_delegate->set_extension_info_map(profile_params_->extension_info_map); |
648 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 650 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
649 network_delegate->set_profile(profile_params_->profile); | 651 network_delegate->set_profile(profile_params_->profile); |
650 network_delegate->set_cookie_settings(profile_params_->cookie_settings); | 652 network_delegate->set_cookie_settings(profile_params_->cookie_settings); |
651 network_delegate->set_enable_do_not_track(&enable_do_not_track_); | 653 network_delegate->set_enable_do_not_track(&enable_do_not_track_); |
652 network_delegate->set_force_google_safe_search(&force_safesearch_); | 654 network_delegate->set_force_google_safe_search(&force_safesearch_); |
653 network_delegate->set_load_time_stats(load_time_stats_); | 655 network_delegate->set_load_time_stats(load_time_stats_); |
654 network_delegate_.reset(network_delegate); | 656 network_delegate_.reset(network_delegate); |
655 | 657 |
656 fraudulent_certificate_reporter_.reset( | 658 fraudulent_certificate_reporter_.reset( |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
838 void ProfileIOData::SetCookieSettingsForTesting( | 840 void ProfileIOData::SetCookieSettingsForTesting( |
839 CookieSettings* cookie_settings) { | 841 CookieSettings* cookie_settings) { |
840 DCHECK(!cookie_settings_.get()); | 842 DCHECK(!cookie_settings_.get()); |
841 cookie_settings_ = cookie_settings; | 843 cookie_settings_ = cookie_settings; |
842 } | 844 } |
843 | 845 |
844 void ProfileIOData::set_signin_names_for_testing( | 846 void ProfileIOData::set_signin_names_for_testing( |
845 SigninNamesOnIOThread* signin_names) { | 847 SigninNamesOnIOThread* signin_names) { |
846 signin_names_.reset(signin_names); | 848 signin_names_.reset(signin_names); |
847 } | 849 } |
OLD | NEW |