Chromium Code Reviews| Index: chrome/browser/io_thread.h |
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h |
| index 2d3327c287430daffaed52cdd5b3a7d192738cb1..9937b991c8de55ad9af2311b7c97846d4dc9dd81 100644 |
| --- a/chrome/browser/io_thread.h |
| +++ b/chrome/browser/io_thread.h |
| @@ -331,19 +331,22 @@ class IOThread : public content::BrowserThreadDelegate { |
| const base::CommandLine& command_line, |
| base::StringPiece quic_trial_group, |
| const VariationParameters& quic_trial_params, |
| + bool quic_disabled_by_policy, |
| Globals* globals); |
| // Returns true if QUIC should be enabled, either as a result |
| // of a field trial or a command line flag. |
| static bool ShouldEnableQuic( |
| const base::CommandLine& command_line, |
| - base::StringPiece quic_trial_group); |
| + base::StringPiece quic_trial_group, |
| + bool quic_disabled_by_policy); |
| // Returns true if QUIC should be enabled for proxies, either as a result |
| // of a field trial or a command line flag. |
| static bool ShouldEnableQuicForProxies( |
| const base::CommandLine& command_line, |
| - base::StringPiece quic_trial_group); |
| + base::StringPiece quic_trial_group, |
| + bool quic_disabled_by_policy); |
| // Returns true if the selection of the ephemeral port in bind() should be |
| // performed by Chromium, and false if the OS should select the port. The OS |
| @@ -474,6 +477,9 @@ class IOThread : public content::BrowserThreadDelegate { |
| // True if SPDY is disabled by policy. |
| bool is_spdy_disabled_by_policy_; |
| + // True if QUIC is disabled by policy. |
| + bool is_quic_allowed_by_policy_; |
|
Andrew T Wilson (Slow)
2015/03/13 14:00:51
name of this variable doesn't match the comment. c
peletskyi
2015/03/18 15:42:30
I've fixed comments. I think I would be better if
|
| + |
| const base::TimeTicks creation_time_; |
| base::WeakPtrFactory<IOThread> weak_factory_; |