Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
| 16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" |
| 18 #include "base/prefs/pref_member.h" | 18 #include "base/prefs/pref_member.h" |
| 19 #include "base/strings/string_piece.h" | 19 #include "base/strings/string_piece.h" |
| 20 #include "base/time/time.h" | 20 #include "base/time/time.h" |
| 21 #include "chrome/browser/net/chrome_network_delegate.h" | 21 #include "chrome/browser/net/chrome_network_delegate.h" |
| 22 #include "chrome/browser/net/ssl_config_service_manager.h" | 22 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 23 #include "components/data_usage/core/data_use_aggregator.h" | |
| 23 #include "content/public/browser/browser_thread.h" | 24 #include "content/public/browser/browser_thread.h" |
| 24 #include "content/public/browser/browser_thread_delegate.h" | 25 #include "content/public/browser/browser_thread_delegate.h" |
| 25 #include "net/base/network_change_notifier.h" | 26 #include "net/base/network_change_notifier.h" |
| 26 #include "net/http/http_network_session.h" | 27 #include "net/http/http_network_session.h" |
| 27 #include "net/socket/next_proto.h" | 28 #include "net/socket/next_proto.h" |
| 28 | 29 |
| 29 class PrefProxyConfigTracker; | 30 class PrefProxyConfigTracker; |
| 30 class PrefService; | 31 class PrefService; |
| 31 class PrefRegistrySimple; | 32 class PrefRegistrySimple; |
| 32 class SystemURLRequestContextGetter; | 33 class SystemURLRequestContextGetter; |
| 33 | 34 |
| 34 namespace base { | 35 namespace base { |
| 35 class CommandLine; | 36 class CommandLine; |
| 36 } | 37 } |
| 37 | 38 |
| 38 namespace chrome_browser_net { | 39 namespace chrome_browser_net { |
| 39 class DnsProbeService; | 40 class DnsProbeService; |
| 40 } | 41 } |
| 41 | 42 |
| 42 namespace extensions { | 43 namespace extensions { |
| 43 class EventRouterForwarder; | 44 class EventRouterForwarder; |
| 44 } | 45 } |
| 45 | 46 |
| 46 namespace data_usage { | |
| 47 class DataUseAggregator; | |
| 48 } | |
| 49 | |
| 50 namespace net { | 47 namespace net { |
| 51 class CertPolicyEnforcer; | 48 class CertPolicyEnforcer; |
| 52 class CertVerifier; | 49 class CertVerifier; |
| 53 class ChannelIDService; | 50 class ChannelIDService; |
| 54 class CookieStore; | 51 class CookieStore; |
| 55 class CTVerifier; | 52 class CTVerifier; |
| 56 class FtpTransactionFactory; | 53 class FtpTransactionFactory; |
| 57 class HostMappingRules; | 54 class HostMappingRules; |
| 58 class HostResolver; | 55 class HostResolver; |
| 59 class HttpAuthHandlerFactory; | 56 class HttpAuthHandlerFactory; |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 122 private: | 119 private: |
| 123 Globals* const globals_; | 120 Globals* const globals_; |
| 124 }; | 121 }; |
| 125 | 122 |
| 126 Globals(); | 123 Globals(); |
| 127 ~Globals(); | 124 ~Globals(); |
| 128 | 125 |
| 129 // Global aggregator of data use. It must outlive the | 126 // Global aggregator of data use. It must outlive the |
| 130 // |system_network_delegate|. | 127 // |system_network_delegate|. |
| 131 scoped_ptr<data_usage::DataUseAggregator> data_use_aggregator; | 128 scoped_ptr<data_usage::DataUseAggregator> data_use_aggregator; |
| 129 // An external observer of data use. | |
| 130 scoped_ptr<data_usage::DataUseAggregator::Observer> | |
| 131 external_data_use_observer; | |
|
mmenke
2015/10/12 16:59:26
Actually, can this just be in IOThread? If you ne
tbansal1
2015/10/12 17:05:18
No, I do not think I need any of those properties.
tbansal1
2015/10/12 22:39:14
Done.
tbansal1
2015/10/12 22:39:14
Done.
| |
| 132 // The "system" NetworkDelegate, used for Profile-agnostic network events. | 132 // The "system" NetworkDelegate, used for Profile-agnostic network events. |
| 133 scoped_ptr<net::NetworkDelegate> system_network_delegate; | 133 scoped_ptr<net::NetworkDelegate> system_network_delegate; |
| 134 scoped_ptr<net::HostResolver> host_resolver; | 134 scoped_ptr<net::HostResolver> host_resolver; |
| 135 scoped_ptr<net::CertVerifier> cert_verifier; | 135 scoped_ptr<net::CertVerifier> cert_verifier; |
| 136 // The ChannelIDService must outlive the HttpTransactionFactory. | 136 // The ChannelIDService must outlive the HttpTransactionFactory. |
| 137 scoped_ptr<net::ChannelIDService> system_channel_id_service; | 137 scoped_ptr<net::ChannelIDService> system_channel_id_service; |
| 138 // This TransportSecurityState doesn't load or save any state. It's only | 138 // This TransportSecurityState doesn't load or save any state. It's only |
| 139 // used to enforce pinning for system requests and will only use built-in | 139 // used to enforce pinning for system requests and will only use built-in |
| 140 // pins. | 140 // pins. |
| 141 scoped_ptr<net::TransportSecurityState> transport_security_state; | 141 scoped_ptr<net::TransportSecurityState> transport_security_state; |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 514 bool is_quic_allowed_by_policy_; | 514 bool is_quic_allowed_by_policy_; |
| 515 | 515 |
| 516 const base::TimeTicks creation_time_; | 516 const base::TimeTicks creation_time_; |
| 517 | 517 |
| 518 base::WeakPtrFactory<IOThread> weak_factory_; | 518 base::WeakPtrFactory<IOThread> weak_factory_; |
| 519 | 519 |
| 520 DISALLOW_COPY_AND_ASSIGN(IOThread); | 520 DISALLOW_COPY_AND_ASSIGN(IOThread); |
| 521 }; | 521 }; |
| 522 | 522 |
| 523 #endif // CHROME_BROWSER_IO_THREAD_H_ | 523 #endif // CHROME_BROWSER_IO_THREAD_H_ |
| OLD | NEW |