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 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
980 ChromeNetworkDelegate* network_delegate = | 980 ChromeNetworkDelegate* network_delegate = |
981 new ChromeNetworkDelegate( | 981 new ChromeNetworkDelegate( |
982 io_thread_globals->extension_event_router_forwarder.get(), | 982 io_thread_globals->extension_event_router_forwarder.get(), |
983 &enable_referrers_); | 983 &enable_referrers_); |
984 network_delegate->set_data_reduction_proxy_params( | 984 network_delegate->set_data_reduction_proxy_params( |
985 io_thread_globals->data_reduction_proxy_params.get()); | 985 io_thread_globals->data_reduction_proxy_params.get()); |
986 network_delegate->set_data_reduction_proxy_usage_stats( | 986 network_delegate->set_data_reduction_proxy_usage_stats( |
987 io_thread_globals->data_reduction_proxy_usage_stats.get()); | 987 io_thread_globals->data_reduction_proxy_usage_stats.get()); |
988 network_delegate->set_data_reduction_proxy_auth_request_handler( | 988 network_delegate->set_data_reduction_proxy_auth_request_handler( |
989 io_thread_globals->data_reduction_proxy_auth_request_handler.get()); | 989 io_thread_globals->data_reduction_proxy_auth_request_handler.get()); |
| 990 network_delegate->set_on_resolve_proxy_handler( |
| 991 io_thread_globals->on_resolve_proxy_handler.get()); |
990 if (command_line.HasSwitch(switches::kEnableClientHints)) | 992 if (command_line.HasSwitch(switches::kEnableClientHints)) |
991 network_delegate->SetEnableClientHints(); | 993 network_delegate->SetEnableClientHints(); |
992 network_delegate->set_extension_info_map( | 994 network_delegate->set_extension_info_map( |
993 profile_params_->extension_info_map.get()); | 995 profile_params_->extension_info_map.get()); |
994 #if defined(ENABLE_CONFIGURATION_POLICY) | 996 #if defined(ENABLE_CONFIGURATION_POLICY) |
995 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 997 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
996 #endif | 998 #endif |
997 network_delegate->set_profile(profile_params_->profile); | 999 network_delegate->set_profile(profile_params_->profile); |
998 network_delegate->set_profile_path(profile_params_->path); | 1000 network_delegate->set_profile_path(profile_params_->path); |
999 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 1001 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1236 void ProfileIOData::SetCookieSettingsForTesting( | 1238 void ProfileIOData::SetCookieSettingsForTesting( |
1237 CookieSettings* cookie_settings) { | 1239 CookieSettings* cookie_settings) { |
1238 DCHECK(!cookie_settings_.get()); | 1240 DCHECK(!cookie_settings_.get()); |
1239 cookie_settings_ = cookie_settings; | 1241 cookie_settings_ = cookie_settings; |
1240 } | 1242 } |
1241 | 1243 |
1242 void ProfileIOData::set_signin_names_for_testing( | 1244 void ProfileIOData::set_signin_names_for_testing( |
1243 SigninNamesOnIOThread* signin_names) { | 1245 SigninNamesOnIOThread* signin_names) { |
1244 signin_names_.reset(signin_names); | 1246 signin_names_.reset(signin_names); |
1245 } | 1247 } |
OLD | NEW |