| 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 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1037 FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 ProfileIOData::Init2")); | 1037 FROM_HERE_WITH_EXPLICIT_FUNCTION("436671 ProfileIOData::Init2")); |
| 1038 | 1038 |
| 1039 scoped_ptr<ChromeNetworkDelegate> network_delegate( | 1039 scoped_ptr<ChromeNetworkDelegate> network_delegate( |
| 1040 new ChromeNetworkDelegate( | 1040 new ChromeNetworkDelegate( |
| 1041 #if defined(ENABLE_EXTENSIONS) | 1041 #if defined(ENABLE_EXTENSIONS) |
| 1042 io_thread_globals->extension_event_router_forwarder.get(), | 1042 io_thread_globals->extension_event_router_forwarder.get(), |
| 1043 #else | 1043 #else |
| 1044 NULL, | 1044 NULL, |
| 1045 #endif | 1045 #endif |
| 1046 &enable_referrers_)); | 1046 &enable_referrers_)); |
| 1047 if (command_line.HasSwitch(switches::kEnableClientHints)) | |
| 1048 network_delegate->SetEnableClientHints(); | |
| 1049 #if defined(ENABLE_EXTENSIONS) | 1047 #if defined(ENABLE_EXTENSIONS) |
| 1050 network_delegate->set_extension_info_map( | 1048 network_delegate->set_extension_info_map( |
| 1051 profile_params_->extension_info_map.get()); | 1049 profile_params_->extension_info_map.get()); |
| 1052 #endif | 1050 #endif |
| 1053 #if defined(ENABLE_CONFIGURATION_POLICY) | 1051 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 1054 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 1052 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
| 1055 #endif | 1053 #endif |
| 1056 network_delegate->set_profile(profile_params_->profile); | 1054 network_delegate->set_profile(profile_params_->profile); |
| 1057 network_delegate->set_profile_path(profile_params_->path); | 1055 network_delegate->set_profile_path(profile_params_->path); |
| 1058 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 1056 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 void ProfileIOData::SetCookieSettingsForTesting( | 1344 void ProfileIOData::SetCookieSettingsForTesting( |
| 1347 CookieSettings* cookie_settings) { | 1345 CookieSettings* cookie_settings) { |
| 1348 DCHECK(!cookie_settings_.get()); | 1346 DCHECK(!cookie_settings_.get()); |
| 1349 cookie_settings_ = cookie_settings; | 1347 cookie_settings_ = cookie_settings; |
| 1350 } | 1348 } |
| 1351 | 1349 |
| 1352 void ProfileIOData::set_signin_names_for_testing( | 1350 void ProfileIOData::set_signin_names_for_testing( |
| 1353 SigninNamesOnIOThread* signin_names) { | 1351 SigninNamesOnIOThread* signin_names) { |
| 1354 signin_names_.reset(signin_names); | 1352 signin_names_.reset(signin_names); |
| 1355 } | 1353 } |
| OLD | NEW |