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

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

Issue 2986623002: Revert of Make ProfileIOData use URLRequestContextBuilder (Closed)
Patch Set: Created 3 years, 5 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') | 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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 class HostMappingRules; 82 class HostMappingRules;
83 class HostResolver; 83 class HostResolver;
84 class HttpAuthHandlerFactory; 84 class HttpAuthHandlerFactory;
85 class HttpAuthPreferences; 85 class HttpAuthPreferences;
86 class LoggingNetworkChangeObserver; 86 class LoggingNetworkChangeObserver;
87 class NetworkQualityEstimator; 87 class NetworkQualityEstimator;
88 class ProxyConfigService; 88 class ProxyConfigService;
89 class RTTAndThroughputEstimatesObserver; 89 class RTTAndThroughputEstimatesObserver;
90 class SSLConfigService; 90 class SSLConfigService;
91 class URLRequestContext; 91 class URLRequestContext;
92 class URLRequestContextBuilderMojo;
93 class URLRequestContextGetter; 92 class URLRequestContextGetter;
94 93
95 namespace ct { 94 namespace ct {
96 class STHObserver; 95 class STHObserver;
97 } 96 }
98 97
99 } // namespace net 98 } // namespace net
100 99
101 namespace net_log { 100 namespace net_log {
102 class ChromeNetLog; 101 class ChromeNetLog;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 // enabled. These features are controlled through 225 // enabled. These features are controlled through
227 // preferences/policy/commandline. 226 // preferences/policy/commandline.
228 // 227 //
229 // For a description of what these features are, and how they are 228 // For a description of what these features are, and how they are
230 // configured, see the comments in pref_names.cc for 229 // configured, see the comments in pref_names.cc for
231 // |kQuickCheckEnabled| and |kPacHttpsUrlStrippingEnabled 230 // |kQuickCheckEnabled| and |kPacHttpsUrlStrippingEnabled
232 // respectively. 231 // respectively.
233 bool WpadQuickCheckEnabled() const; 232 bool WpadQuickCheckEnabled() const;
234 bool PacHttpsUrlStrippingEnabled() const; 233 bool PacHttpsUrlStrippingEnabled() const;
235 234
236 // Configures |builder|'s ProxyService to use the specified
237 // |proxy_config_service| and sets a number of proxy-related options based on
238 // prefs, policies, and the command line.
239 void SetUpProxyConfigService(
240 net::URLRequestContextBuilderMojo* builder,
241 std::unique_ptr<net::ProxyConfigService> proxy_config_service) const;
242
243 private: 235 private:
244 friend class test::IOThreadPeer; 236 friend class test::IOThreadPeer;
245 friend class chrome::TestingIOThreadState; 237 friend class chrome::TestingIOThreadState;
246 238
247 // BrowserThreadDelegate implementation, runs on the IO thread. 239 // BrowserThreadDelegate implementation, runs on the IO thread.
248 // This handles initialization and destruction of state that must 240 // This handles initialization and destruction of state that must
249 // live on the IO thread. 241 // live on the IO thread.
250 void Init() override; 242 void Init() override;
251 void CleanUp() override; 243 void CleanUp() override;
252 244
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 bool http_09_on_non_default_ports_enabled_; 358 bool http_09_on_non_default_ports_enabled_;
367 359
368 const base::TimeTicks creation_time_; 360 const base::TimeTicks creation_time_;
369 361
370 base::WeakPtrFactory<IOThread> weak_factory_; 362 base::WeakPtrFactory<IOThread> weak_factory_;
371 363
372 DISALLOW_COPY_AND_ASSIGN(IOThread); 364 DISALLOW_COPY_AND_ASSIGN(IOThread);
373 }; 365 };
374 366
375 #endif // CHROME_BROWSER_IO_THREAD_H_ 367 #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