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

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

Issue 517693002: Add embedder-specific headers to HTTP CONNECT tunnel request (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments from mef and mmenke Created 6 years, 3 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 | « no previous file | chrome/browser/io_thread.cc » ('j') | net/base/proxy_delegate.h » ('J')
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 #include <vector> 9 #include <vector>
10 10
(...skipping 22 matching lines...) Expand all
33 class CommandLine; 33 class CommandLine;
34 } 34 }
35 35
36 namespace chrome_browser_net { 36 namespace chrome_browser_net {
37 class DnsProbeService; 37 class DnsProbeService;
38 } 38 }
39 39
40 #if defined(SPDY_PROXY_AUTH_ORIGIN) 40 #if defined(SPDY_PROXY_AUTH_ORIGIN)
41 namespace data_reduction_proxy { 41 namespace data_reduction_proxy {
42 class DataReductionProxyAuthRequestHandler; 42 class DataReductionProxyAuthRequestHandler;
43 class DataReductionProxyDelegate;
43 class DataReductionProxyParams; 44 class DataReductionProxyParams;
44 } 45 }
45 #endif // defined(SPDY_PROXY_AUTH_ORIGIN) 46 #endif // defined(SPDY_PROXY_AUTH_ORIGIN)
46 47
47 namespace extensions { 48 namespace extensions {
48 class EventRouterForwarder; 49 class EventRouterForwarder;
49 } 50 }
50 51
51 namespace net { 52 namespace net {
52 class CertVerifier; 53 class CertVerifier;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 bool enable_user_alternate_protocol_ports; 196 bool enable_user_alternate_protocol_ports;
196 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a 197 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a
197 // main frame load fails with a DNS error in order to provide more useful 198 // main frame load fails with a DNS error in order to provide more useful
198 // information to the renderer so it can show a more specific error page. 199 // information to the renderer so it can show a more specific error page.
199 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; 200 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service;
200 #if defined(SPDY_PROXY_AUTH_ORIGIN) 201 #if defined(SPDY_PROXY_AUTH_ORIGIN)
201 scoped_ptr<data_reduction_proxy::DataReductionProxyParams> 202 scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
202 data_reduction_proxy_params; 203 data_reduction_proxy_params;
203 scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> 204 scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
204 data_reduction_proxy_auth_request_handler; 205 data_reduction_proxy_auth_request_handler;
206 scoped_ptr<data_reduction_proxy::DataReductionProxyDelegate>
207 data_reduction_proxy_delegate;
205 #endif 208 #endif
206 }; 209 };
207 210
208 // |net_log| must either outlive the IOThread or be NULL. 211 // |net_log| must either outlive the IOThread or be NULL.
209 IOThread(PrefService* local_state, 212 IOThread(PrefService* local_state,
210 policy::PolicyService* policy_service, 213 policy::PolicyService* policy_service,
211 ChromeNetLog* net_log, 214 ChromeNetLog* net_log,
212 extensions::EventRouterForwarder* extension_event_router_forwarder); 215 extensions::EventRouterForwarder* extension_event_router_forwarder);
213 216
214 virtual ~IOThread(); 217 virtual ~IOThread();
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 bool is_spdy_disabled_by_policy_; 445 bool is_spdy_disabled_by_policy_;
443 446
444 base::WeakPtrFactory<IOThread> weak_factory_; 447 base::WeakPtrFactory<IOThread> weak_factory_;
445 448
446 const base::TimeTicks creation_time_; 449 const base::TimeTicks creation_time_;
447 450
448 DISALLOW_COPY_AND_ASSIGN(IOThread); 451 DISALLOW_COPY_AND_ASSIGN(IOThread);
449 }; 452 };
450 453
451 #endif // CHROME_BROWSER_IO_THREAD_H_ 454 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | net/base/proxy_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698