| 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 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 void ProfileIOData::ApplyProfileParamsToContext( | 592 void ProfileIOData::ApplyProfileParamsToContext( |
| 593 ChromeURLRequestContext* context) const { | 593 ChromeURLRequestContext* context) const { |
| 594 context->set_is_incognito(is_incognito()); | 594 context->set_is_incognito(is_incognito()); |
| 595 context->set_accept_language(profile_params_->accept_language); | 595 context->set_accept_language(profile_params_->accept_language); |
| 596 context->set_accept_charset(profile_params_->accept_charset); | 596 context->set_accept_charset(profile_params_->accept_charset); |
| 597 context->set_referrer_charset(profile_params_->referrer_charset); | 597 context->set_referrer_charset(profile_params_->referrer_charset); |
| 598 context->set_ssl_config_service(profile_params_->ssl_config_service); | 598 context->set_ssl_config_service(profile_params_->ssl_config_service); |
| 599 } | 599 } |
| 600 | 600 |
| 601 void ProfileIOData::SetUpJobFactoryDefaults( | 601 void ProfileIOData::SetUpJobFactoryDefaults( |
| 602 net::URLRequestJobFactory* job_factory, | 602 net::URLRequestJobFactoryImpl* job_factory, |
| 603 scoped_ptr<net::URLRequestJobFactory::Interceptor> | 603 scoped_ptr<net::URLRequestJobFactory::Interceptor> |
| 604 protocol_handler_interceptor, | 604 protocol_handler_interceptor, |
| 605 net::NetworkDelegate* network_delegate, | 605 net::NetworkDelegate* network_delegate, |
| 606 net::FtpTransactionFactory* ftp_transaction_factory, | 606 net::FtpTransactionFactory* ftp_transaction_factory, |
| 607 net::FtpAuthCache* ftp_auth_cache) const { | 607 net::FtpAuthCache* ftp_auth_cache) const { |
| 608 // NOTE(willchan): Keep these protocol handlers in sync with | 608 // NOTE(willchan): Keep these protocol handlers in sync with |
| 609 // ProfileIOData::IsHandledProtocol(). | 609 // ProfileIOData::IsHandledProtocol(). |
| 610 bool set_protocol = job_factory->SetProtocolHandler( | 610 bool set_protocol = job_factory->SetProtocolHandler( |
| 611 chrome::kFileScheme, new net::FileProtocolHandler()); | 611 chrome::kFileScheme, new net::FileProtocolHandler()); |
| 612 DCHECK(set_protocol); | 612 DCHECK(set_protocol); |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 params->http_pipelining_enabled = globals->http_pipelining_enabled; | 717 params->http_pipelining_enabled = globals->http_pipelining_enabled; |
| 718 params->testing_fixed_http_port = globals->testing_fixed_http_port; | 718 params->testing_fixed_http_port = globals->testing_fixed_http_port; |
| 719 params->testing_fixed_https_port = globals->testing_fixed_https_port; | 719 params->testing_fixed_https_port = globals->testing_fixed_https_port; |
| 720 | 720 |
| 721 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 721 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 722 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { | 722 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { |
| 723 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( | 723 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( |
| 724 switches::kTrustedSpdyProxy); | 724 switches::kTrustedSpdyProxy); |
| 725 } | 725 } |
| 726 } | 726 } |
| OLD | NEW |