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 977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
988 ChromeNetworkDelegate* network_delegate = | 988 ChromeNetworkDelegate* network_delegate = |
989 new ChromeNetworkDelegate( | 989 new ChromeNetworkDelegate( |
990 io_thread_globals->extension_event_router_forwarder.get(), | 990 io_thread_globals->extension_event_router_forwarder.get(), |
991 &enable_referrers_); | 991 &enable_referrers_); |
992 network_delegate->set_data_reduction_proxy_params( | 992 network_delegate->set_data_reduction_proxy_params( |
993 io_thread_globals->data_reduction_proxy_params.get()); | 993 io_thread_globals->data_reduction_proxy_params.get()); |
994 network_delegate->set_data_reduction_proxy_usage_stats( | 994 network_delegate->set_data_reduction_proxy_usage_stats( |
995 io_thread_globals->data_reduction_proxy_usage_stats.get()); | 995 io_thread_globals->data_reduction_proxy_usage_stats.get()); |
996 network_delegate->set_data_reduction_proxy_auth_request_handler( | 996 network_delegate->set_data_reduction_proxy_auth_request_handler( |
997 io_thread_globals->data_reduction_proxy_auth_request_handler.get()); | 997 io_thread_globals->data_reduction_proxy_auth_request_handler.get()); |
| 998 network_delegate->set_on_resolve_proxy_handler( |
| 999 io_thread_globals->on_resolve_proxy_handler); |
998 if (command_line.HasSwitch(switches::kEnableClientHints)) | 1000 if (command_line.HasSwitch(switches::kEnableClientHints)) |
999 network_delegate->SetEnableClientHints(); | 1001 network_delegate->SetEnableClientHints(); |
1000 network_delegate->set_extension_info_map( | 1002 network_delegate->set_extension_info_map( |
1001 profile_params_->extension_info_map.get()); | 1003 profile_params_->extension_info_map.get()); |
1002 #if defined(ENABLE_CONFIGURATION_POLICY) | 1004 #if defined(ENABLE_CONFIGURATION_POLICY) |
1003 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 1005 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
1004 #endif | 1006 #endif |
1005 network_delegate->set_profile(profile_params_->profile); | 1007 network_delegate->set_profile(profile_params_->profile); |
1006 network_delegate->set_profile_path(profile_params_->path); | 1008 network_delegate->set_profile_path(profile_params_->path); |
1007 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 1009 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1246 void ProfileIOData::SetCookieSettingsForTesting( | 1248 void ProfileIOData::SetCookieSettingsForTesting( |
1247 CookieSettings* cookie_settings) { | 1249 CookieSettings* cookie_settings) { |
1248 DCHECK(!cookie_settings_.get()); | 1250 DCHECK(!cookie_settings_.get()); |
1249 cookie_settings_ = cookie_settings; | 1251 cookie_settings_ = cookie_settings; |
1250 } | 1252 } |
1251 | 1253 |
1252 void ProfileIOData::set_signin_names_for_testing( | 1254 void ProfileIOData::set_signin_names_for_testing( |
1253 SigninNamesOnIOThread* signin_names) { | 1255 SigninNamesOnIOThread* signin_names) { |
1254 signin_names_.reset(signin_names); | 1256 signin_names_.reset(signin_names); |
1255 } | 1257 } |
OLD | NEW |