Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 11154006: Change initialization interface of URLRequestJobFactory objects. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add missing include. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "net/cookies/cookie_monster.h" 59 #include "net/cookies/cookie_monster.h"
60 #include "net/http/http_transaction_factory.h" 60 #include "net/http/http_transaction_factory.h"
61 #include "net/http/http_util.h" 61 #include "net/http/http_util.h"
62 #include "net/proxy/proxy_config_service_fixed.h" 62 #include "net/proxy/proxy_config_service_fixed.h"
63 #include "net/proxy/proxy_script_fetcher_impl.h" 63 #include "net/proxy/proxy_script_fetcher_impl.h"
64 #include "net/proxy/proxy_service.h" 64 #include "net/proxy/proxy_service.h"
65 #include "net/url_request/data_protocol_handler.h" 65 #include "net/url_request/data_protocol_handler.h"
66 #include "net/url_request/file_protocol_handler.h" 66 #include "net/url_request/file_protocol_handler.h"
67 #include "net/url_request/ftp_protocol_handler.h" 67 #include "net/url_request/ftp_protocol_handler.h"
68 #include "net/url_request/url_request.h" 68 #include "net/url_request/url_request.h"
69 #include "net/url_request/url_request_job_factory_impl.h"
69 70
70 #if !defined(OS_ANDROID) 71 #if !defined(OS_ANDROID)
71 #include "chrome/browser/managed_mode.h" 72 #include "chrome/browser/managed_mode.h"
72 #endif 73 #endif
73 74
74 #if defined(OS_CHROMEOS) 75 #if defined(OS_CHROMEOS)
75 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h" 76 #include "chrome/browser/chromeos/drive/drive_protocol_handler.h"
76 #include "chrome/browser/chromeos/gview_request_interceptor.h" 77 #include "chrome/browser/chromeos/gview_request_interceptor.h"
77 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 78 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
78 #include "chrome/browser/chromeos/settings/cros_settings.h" 79 #include "chrome/browser/chromeos/settings/cros_settings.h"
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 578
578 void ProfileIOData::ApplyProfileParamsToContext( 579 void ProfileIOData::ApplyProfileParamsToContext(
579 ChromeURLRequestContext* context) const { 580 ChromeURLRequestContext* context) const {
580 context->set_is_incognito(is_incognito()); 581 context->set_is_incognito(is_incognito());
581 context->set_accept_language(profile_params_->accept_language); 582 context->set_accept_language(profile_params_->accept_language);
582 context->set_accept_charset(profile_params_->accept_charset); 583 context->set_accept_charset(profile_params_->accept_charset);
583 context->set_ssl_config_service(profile_params_->ssl_config_service); 584 context->set_ssl_config_service(profile_params_->ssl_config_service);
584 } 585 }
585 586
586 void ProfileIOData::SetUpJobFactoryDefaults( 587 void ProfileIOData::SetUpJobFactoryDefaults(
587 net::URLRequestJobFactory* job_factory, 588 net::URLRequestJobFactoryImpl* job_factory,
588 scoped_ptr<net::URLRequestJobFactory::Interceptor> 589 scoped_ptr<net::URLRequestJobFactory::Interceptor>
589 protocol_handler_interceptor, 590 protocol_handler_interceptor,
590 net::NetworkDelegate* network_delegate, 591 net::NetworkDelegate* network_delegate,
591 net::FtpTransactionFactory* ftp_transaction_factory, 592 net::FtpTransactionFactory* ftp_transaction_factory,
592 net::FtpAuthCache* ftp_auth_cache) const { 593 net::FtpAuthCache* ftp_auth_cache) const {
593 // NOTE(willchan): Keep these protocol handlers in sync with 594 // NOTE(willchan): Keep these protocol handlers in sync with
594 // ProfileIOData::IsHandledProtocol(). 595 // ProfileIOData::IsHandledProtocol().
595 bool set_protocol = job_factory->SetProtocolHandler( 596 bool set_protocol = job_factory->SetProtocolHandler(
596 chrome::kFileScheme, new net::FileProtocolHandler()); 597 chrome::kFileScheme, new net::FileProtocolHandler());
597 DCHECK(set_protocol); 598 DCHECK(set_protocol);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 params->http_pipelining_enabled = globals->http_pipelining_enabled; 703 params->http_pipelining_enabled = globals->http_pipelining_enabled;
703 params->testing_fixed_http_port = globals->testing_fixed_http_port; 704 params->testing_fixed_http_port = globals->testing_fixed_http_port;
704 params->testing_fixed_https_port = globals->testing_fixed_https_port; 705 params->testing_fixed_https_port = globals->testing_fixed_https_port;
705 706
706 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 707 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
707 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { 708 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) {
708 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( 709 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII(
709 switches::kTrustedSpdyProxy); 710 switches::kTrustedSpdyProxy);
710 } 711 }
711 } 712 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698