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

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

Issue 1288383002: Use common code to set HttpNetworkSession::Param pointers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Accidentally deleted code is restored. Created 5 years, 4 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') | chrome/browser/io_thread.cc » ('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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 static net::QuicTagVector GetQuicConnectionOptions( 416 static net::QuicTagVector GetQuicConnectionOptions(
417 const base::CommandLine& command_line, 417 const base::CommandLine& command_line,
418 const VariationParameters& quic_trial_params); 418 const VariationParameters& quic_trial_params);
419 419
420 // Returns the alternative service probability threshold specified by 420 // Returns the alternative service probability threshold specified by
421 // any flags in |command_line| or |quic_trial_params|. 421 // any flags in |command_line| or |quic_trial_params|.
422 static double GetAlternativeProtocolProbabilityThreshold( 422 static double GetAlternativeProtocolProbabilityThreshold(
423 const base::CommandLine& command_line, 423 const base::CommandLine& command_line,
424 const VariationParameters& quic_trial_params); 424 const VariationParameters& quic_trial_params);
425 425
426 static net::URLRequestContext* ConstructSystemRequestContext(
427 IOThread::Globals* globals,
428 net::NetLog* net_log);
429
430 static net::URLRequestContext* ConstructProxyScriptFetcherContext(
431 IOThread::Globals* globals,
432 net::NetLog* net_log);
433
426 // The NetLog is owned by the browser process, to allow logging from other 434 // The NetLog is owned by the browser process, to allow logging from other
427 // threads during shutdown, but is used most frequently on the IOThread. 435 // threads during shutdown, but is used most frequently on the IOThread.
428 ChromeNetLog* net_log_; 436 ChromeNetLog* net_log_;
429 437
430 #if defined(ENABLE_EXTENSIONS) 438 #if defined(ENABLE_EXTENSIONS)
431 // The extensions::EventRouterForwarder allows for sending events to 439 // The extensions::EventRouterForwarder allows for sending events to
432 // extensions from the IOThread. 440 // extensions from the IOThread.
433 extensions::EventRouterForwarder* extension_event_router_forwarder_; 441 extensions::EventRouterForwarder* extension_event_router_forwarder_;
434 #endif 442 #endif
435 443
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 bool is_quic_allowed_by_policy_; 490 bool is_quic_allowed_by_policy_;
483 491
484 const base::TimeTicks creation_time_; 492 const base::TimeTicks creation_time_;
485 493
486 base::WeakPtrFactory<IOThread> weak_factory_; 494 base::WeakPtrFactory<IOThread> weak_factory_;
487 495
488 DISALLOW_COPY_AND_ASSIGN(IOThread); 496 DISALLOW_COPY_AND_ASSIGN(IOThread);
489 }; 497 };
490 498
491 #endif // CHROME_BROWSER_IO_THREAD_H_ 499 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | chrome/browser/io_thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698