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 754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
765 load_time_stats_)); | 765 load_time_stats_)); |
766 extensions_request_context_.reset( | 766 extensions_request_context_.reset( |
767 new ChromeURLRequestContext( | 767 new ChromeURLRequestContext( |
768 ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS, | 768 ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS, |
769 load_time_stats_)); | 769 load_time_stats_)); |
770 | 770 |
771 ChromeNetworkDelegate* network_delegate = | 771 ChromeNetworkDelegate* network_delegate = |
772 new ChromeNetworkDelegate( | 772 new ChromeNetworkDelegate( |
773 io_thread_globals->extension_event_router_forwarder.get(), | 773 io_thread_globals->extension_event_router_forwarder.get(), |
774 &enable_referrers_); | 774 &enable_referrers_); |
| 775 if (command_line.HasSwitch(switches::kEnableClientHints)) |
| 776 network_delegate->SetEnableClientHints(); |
775 network_delegate->set_extension_info_map( | 777 network_delegate->set_extension_info_map( |
776 profile_params_->extension_info_map.get()); | 778 profile_params_->extension_info_map.get()); |
777 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 779 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
778 network_delegate->set_profile(profile_params_->profile); | 780 network_delegate->set_profile(profile_params_->profile); |
779 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 781 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
780 network_delegate->set_enable_do_not_track(&enable_do_not_track_); | 782 network_delegate->set_enable_do_not_track(&enable_do_not_track_); |
781 network_delegate->set_force_google_safe_search(&force_safesearch_); | 783 network_delegate->set_force_google_safe_search(&force_safesearch_); |
782 network_delegate->set_load_time_stats(load_time_stats_); | 784 network_delegate->set_load_time_stats(load_time_stats_); |
783 network_delegate_.reset(network_delegate); | 785 network_delegate_.reset(network_delegate); |
784 | 786 |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
976 void ProfileIOData::SetCookieSettingsForTesting( | 978 void ProfileIOData::SetCookieSettingsForTesting( |
977 CookieSettings* cookie_settings) { | 979 CookieSettings* cookie_settings) { |
978 DCHECK(!cookie_settings_.get()); | 980 DCHECK(!cookie_settings_.get()); |
979 cookie_settings_ = cookie_settings; | 981 cookie_settings_ = cookie_settings; |
980 } | 982 } |
981 | 983 |
982 void ProfileIOData::set_signin_names_for_testing( | 984 void ProfileIOData::set_signin_names_for_testing( |
983 SigninNamesOnIOThread* signin_names) { | 985 SigninNamesOnIOThread* signin_names) { |
984 signin_names_.reset(signin_names); | 986 signin_names_.reset(signin_names); |
985 } | 987 } |
OLD | NEW |