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

Side by Side Diff: chrome/browser/io_thread.h

Issue 15665006: Allow specifying proxy scripts using file:// URLs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Look for ERR_ string Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | 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 #ifndef CHROME_BROWSER_IO_THREAD_H_ 5 #ifndef CHROME_BROWSER_IO_THREAD_H_
6 #define CHROME_BROWSER_IO_THREAD_H_ 6 #define CHROME_BROWSER_IO_THREAD_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 class NetworkDelegate; 50 class NetworkDelegate;
51 class NetworkTimeNotifier; 51 class NetworkTimeNotifier;
52 class ServerBoundCertService; 52 class ServerBoundCertService;
53 class ProxyConfigService; 53 class ProxyConfigService;
54 class ProxyService; 54 class ProxyService;
55 class SdchManager; 55 class SdchManager;
56 class SSLConfigService; 56 class SSLConfigService;
57 class TransportSecurityState; 57 class TransportSecurityState;
58 class URLRequestContext; 58 class URLRequestContext;
59 class URLRequestContextGetter; 59 class URLRequestContextGetter;
60 class URLRequestJobFactory;
60 class URLRequestThrottlerManager; 61 class URLRequestThrottlerManager;
61 class URLSecurityManager; 62 class URLSecurityManager;
62 } // namespace net 63 } // namespace net
63 64
64 namespace policy { 65 namespace policy {
65 class PolicyService; 66 class PolicyService;
66 } // namespace policy 67 } // namespace policy
67 68
68 // Contains state associated with, initialized and cleaned up on, and 69 // Contains state associated with, initialized and cleaned up on, and
69 // primarily used on, the IO thread. 70 // primarily used on, the IO thread.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // This TransportSecurityState doesn't load or save any state. It's only 116 // This TransportSecurityState doesn't load or save any state. It's only
116 // used to enforce pinning for system requests and will only use built-in 117 // used to enforce pinning for system requests and will only use built-in
117 // pins. 118 // pins.
118 scoped_ptr<net::TransportSecurityState> transport_security_state; 119 scoped_ptr<net::TransportSecurityState> transport_security_state;
119 scoped_refptr<net::SSLConfigService> ssl_config_service; 120 scoped_refptr<net::SSLConfigService> ssl_config_service;
120 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; 121 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
121 scoped_ptr<net::HttpServerProperties> http_server_properties; 122 scoped_ptr<net::HttpServerProperties> http_server_properties;
122 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service; 123 scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service;
123 scoped_ptr<net::HttpTransactionFactory> 124 scoped_ptr<net::HttpTransactionFactory>
124 proxy_script_fetcher_http_transaction_factory; 125 proxy_script_fetcher_http_transaction_factory;
126 scoped_ptr<net::FtpTransactionFactory>
127 proxy_script_fetcher_ftp_transaction_factory;
128 scoped_ptr<net::URLRequestJobFactory>
129 proxy_script_fetcher_url_request_job_factory;
125 scoped_ptr<net::URLRequestThrottlerManager> throttler_manager; 130 scoped_ptr<net::URLRequestThrottlerManager> throttler_manager;
126 scoped_ptr<net::URLSecurityManager> url_security_manager; 131 scoped_ptr<net::URLSecurityManager> url_security_manager;
127 // TODO(willchan): Remove proxy script fetcher context since it's not 132 // TODO(willchan): Remove proxy script fetcher context since it's not
128 // necessary now that I got rid of refcounting URLRequestContexts. 133 // necessary now that I got rid of refcounting URLRequestContexts.
129 // 134 //
130 // The first URLRequestContext is |system_url_request_context|. We introduce 135 // The first URLRequestContext is |system_url_request_context|. We introduce
131 // |proxy_script_fetcher_context| for the second context. It has a direct 136 // |proxy_script_fetcher_context| for the second context. It has a direct
132 // ProxyService, since we always directly connect to fetch the PAC script. 137 // ProxyService, since we always directly connect to fetch the PAC script.
133 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context; 138 scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context;
134 scoped_ptr<net::ProxyService> system_proxy_service; 139 scoped_ptr<net::ProxyService> system_proxy_service;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 303
299 // True if SPDY is disabled by policy. 304 // True if SPDY is disabled by policy.
300 bool is_spdy_disabled_by_policy_; 305 bool is_spdy_disabled_by_policy_;
301 306
302 base::WeakPtrFactory<IOThread> weak_factory_; 307 base::WeakPtrFactory<IOThread> weak_factory_;
303 308
304 DISALLOW_COPY_AND_ASSIGN(IOThread); 309 DISALLOW_COPY_AND_ASSIGN(IOThread);
305 }; 310 };
306 311
307 #endif // CHROME_BROWSER_IO_THREAD_H_ 312 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698