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 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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)) | 1047 if (command_line.HasSwitch(switches::kEnableClientHints)) |
1048 network_delegate->SetEnableClientHints(); | 1048 network_delegate->SetEnableClientHints(); |
| 1049 if (command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures)) |
| 1050 network_delegate->SetExperimentalWebPlatformFeaturesEnabled(); |
1049 #if defined(ENABLE_EXTENSIONS) | 1051 #if defined(ENABLE_EXTENSIONS) |
1050 network_delegate->set_extension_info_map( | 1052 network_delegate->set_extension_info_map( |
1051 profile_params_->extension_info_map.get()); | 1053 profile_params_->extension_info_map.get()); |
1052 #endif | 1054 #endif |
1053 #if defined(ENABLE_CONFIGURATION_POLICY) | 1055 #if defined(ENABLE_CONFIGURATION_POLICY) |
1054 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); | 1056 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); |
1055 #endif | 1057 #endif |
1056 network_delegate->set_profile(profile_params_->profile); | 1058 network_delegate->set_profile(profile_params_->profile); |
1057 network_delegate->set_profile_path(profile_params_->path); | 1059 network_delegate->set_profile_path(profile_params_->path); |
1058 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); | 1060 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( | 1348 void ProfileIOData::SetCookieSettingsForTesting( |
1347 CookieSettings* cookie_settings) { | 1349 CookieSettings* cookie_settings) { |
1348 DCHECK(!cookie_settings_.get()); | 1350 DCHECK(!cookie_settings_.get()); |
1349 cookie_settings_ = cookie_settings; | 1351 cookie_settings_ = cookie_settings; |
1350 } | 1352 } |
1351 | 1353 |
1352 void ProfileIOData::set_signin_names_for_testing( | 1354 void ProfileIOData::set_signin_names_for_testing( |
1353 SigninNamesOnIOThread* signin_names) { | 1355 SigninNamesOnIOThread* signin_names) { |
1354 signin_names_.reset(signin_names); | 1356 signin_names_.reset(signin_names); |
1355 } | 1357 } |
OLD | NEW |