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

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

Issue 2297263002: Revert "Only allow HTTP/0.9 support on default ports." (Closed)
Patch Set: Created 4 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') | 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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 static net::URLRequestContext* ConstructSystemRequestContext( 298 static net::URLRequestContext* ConstructSystemRequestContext(
299 IOThread::Globals* globals, 299 IOThread::Globals* globals,
300 const net::HttpNetworkSession::Params& params, 300 const net::HttpNetworkSession::Params& params,
301 net::NetLog* net_log); 301 net::NetLog* net_log);
302 302
303 // Parse command line flags and use components/network_session_configurator to 303 // Parse command line flags and use components/network_session_configurator to
304 // configure |params|. 304 // configure |params|.
305 static void ConfigureParamsFromFieldTrialsAndCommandLine( 305 static void ConfigureParamsFromFieldTrialsAndCommandLine(
306 const base::CommandLine& command_line, 306 const base::CommandLine& command_line,
307 bool is_quic_allowed_by_policy, 307 bool is_quic_allowed_by_policy,
308 bool http_09_on_non_default_ports_enabled,
309 net::HttpNetworkSession::Params* params); 308 net::HttpNetworkSession::Params* params);
310 309
311 // TODO(willchan): Remove proxy script fetcher context since it's not 310 // TODO(willchan): Remove proxy script fetcher context since it's not
312 // necessary now that I got rid of refcounting URLRequestContexts. 311 // necessary now that I got rid of refcounting URLRequestContexts.
313 // See IOThread::Globals for details. 312 // See IOThread::Globals for details.
314 static net::URLRequestContext* ConstructProxyScriptFetcherContext( 313 static net::URLRequestContext* ConstructProxyScriptFetcherContext(
315 IOThread::Globals* globals, 314 IOThread::Globals* globals,
316 const net::HttpNetworkSession::Params& params, 315 const net::HttpNetworkSession::Params& params,
317 net::NetLog* net_log); 316 net::NetLog* net_log);
318 317
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 std::unique_ptr<net::ProxyConfigService> system_proxy_config_service_; 379 std::unique_ptr<net::ProxyConfigService> system_proxy_config_service_;
381 380
382 std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 381 std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
383 382
384 scoped_refptr<net::URLRequestContextGetter> 383 scoped_refptr<net::URLRequestContextGetter>
385 system_url_request_context_getter_; 384 system_url_request_context_getter_;
386 385
387 // True if QUIC is allowed by policy. 386 // True if QUIC is allowed by policy.
388 bool is_quic_allowed_by_policy_; 387 bool is_quic_allowed_by_policy_;
389 388
390 // True if HTTP/0.9 is allowed on non-default ports by policy.
391 bool http_09_on_non_default_ports_enabled_;
392
393 const base::TimeTicks creation_time_; 389 const base::TimeTicks creation_time_;
394 390
395 // Callback for updating data use prefs which needs to be initialized on UI 391 // Callback for updating data use prefs which needs to be initialized on UI
396 // thread and passed to |ChromeNetworkDelegate|. 392 // thread and passed to |ChromeNetworkDelegate|.
397 metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_; 393 metrics::UpdateUsagePrefCallbackType metrics_data_use_forwarder_;
398 394
399 base::WeakPtrFactory<IOThread> weak_factory_; 395 base::WeakPtrFactory<IOThread> weak_factory_;
400 396
401 DISALLOW_COPY_AND_ASSIGN(IOThread); 397 DISALLOW_COPY_AND_ASSIGN(IOThread);
402 }; 398 };
403 399
404 #endif // CHROME_BROWSER_IO_THREAD_H_ 400 #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