OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 if (initialized_) | 234 if (initialized_) |
235 return; | 235 return; |
236 LazyInitializeInternal(); | 236 LazyInitializeInternal(); |
237 initialized_ = true; | 237 initialized_ = true; |
238 } | 238 } |
239 | 239 |
240 // static | 240 // static |
241 void ProfileIOData::ApplyProfileParamsToContext( | 241 void ProfileIOData::ApplyProfileParamsToContext( |
242 const ProfileParams& profile_params, | 242 const ProfileParams& profile_params, |
243 ChromeURLRequestContext* context) { | 243 ChromeURLRequestContext* context) { |
244 context->set_is_off_the_record(profile_params.is_off_the_record); | 244 context->set_is_incognito(profile_params.is_off_the_record); |
245 context->set_accept_language(profile_params.accept_language); | 245 context->set_accept_language(profile_params.accept_language); |
246 context->set_accept_charset(profile_params.accept_charset); | 246 context->set_accept_charset(profile_params.accept_charset); |
247 context->set_referrer_charset(profile_params.referrer_charset); | 247 context->set_referrer_charset(profile_params.referrer_charset); |
248 context->set_user_script_dir_path(profile_params.user_script_dir_path); | 248 context->set_user_script_dir_path(profile_params.user_script_dir_path); |
249 context->set_host_content_settings_map( | 249 context->set_host_content_settings_map( |
250 profile_params.host_content_settings_map); | 250 profile_params.host_content_settings_map); |
251 context->set_host_zoom_map(profile_params.host_zoom_map); | 251 context->set_host_zoom_map(profile_params.host_zoom_map); |
252 context->set_transport_security_state( | 252 context->set_transport_security_state( |
253 profile_params.transport_security_state); | 253 profile_params.transport_security_state); |
254 context->set_ssl_config_service(profile_params.ssl_config_service); | 254 context->set_ssl_config_service(profile_params.ssl_config_service); |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 | 337 |
338 #if defined(OS_CHROMEOS) | 338 #if defined(OS_CHROMEOS) |
339 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { | 339 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { |
340 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()-> | 340 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()-> |
341 RegisterNetworkProxyHandler(proxy_service); | 341 RegisterNetworkProxyHandler(proxy_service); |
342 } | 342 } |
343 #endif // defined(OS_CHROMEOS) | 343 #endif // defined(OS_CHROMEOS) |
344 | 344 |
345 return proxy_service; | 345 return proxy_service; |
346 } | 346 } |
OLD | NEW |