OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/ref_counted.h" | 9 #include "base/ref_counted.h" |
10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
11 #include "base/task.h" | 11 #include "base/task.h" |
12 #include "chrome/browser/browser_process_sub_thread.h" | 12 #include "chrome/browser/browser_process_sub_thread.h" |
13 #include "chrome/common/net/dns.h" | 13 #include "chrome/common/net/dns.h" |
14 #include "net/base/host_resolver.h" | 14 #include "net/base/host_resolver.h" |
15 | 15 |
| 16 class ChromeNetLog; |
16 class ListValue; | 17 class ListValue; |
17 | 18 |
18 namespace chrome_browser_net { | 19 namespace chrome_browser_net { |
19 class DnsMaster; | 20 class DnsMaster; |
20 } // namespace chrome_browser_net | 21 } // namespace chrome_browser_net |
21 | 22 |
22 namespace net { | 23 namespace net { |
23 class HttpAuthHandlerFactory; | 24 class HttpAuthHandlerFactory; |
24 class NetworkChangeNotifier; | 25 class NetworkChangeNotifier; |
25 } // namespace net | 26 } // namespace net |
26 | 27 |
27 class IOThread : public BrowserProcessSubThread { | 28 class IOThread : public BrowserProcessSubThread { |
28 public: | 29 public: |
29 struct Globals { | 30 struct Globals { |
| 31 scoped_ptr<ChromeNetLog> net_log; |
30 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier; | 32 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier; |
31 // TODO(willchan): Stop reference counting HostResolver. It's owned by | 33 // TODO(willchan): Stop reference counting HostResolver. It's owned by |
32 // IOThread now. | 34 // IOThread now. |
33 scoped_refptr<net::HostResolver> host_resolver; | 35 scoped_refptr<net::HostResolver> host_resolver; |
34 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; | 36 scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; |
35 }; | 37 }; |
36 | 38 |
37 IOThread(); | 39 IOThread(); |
38 | 40 |
39 virtual ~IOThread(); | 41 virtual ~IOThread(); |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 // These member variables are initialized by a task posted to the IO thread, | 86 // These member variables are initialized by a task posted to the IO thread, |
85 // which gets posted by calling certain member functions of IOThread. | 87 // which gets posted by calling certain member functions of IOThread. |
86 | 88 |
87 net::HostResolver::Observer* prefetch_observer_; | 89 net::HostResolver::Observer* prefetch_observer_; |
88 chrome_browser_net::DnsMaster* dns_master_; | 90 chrome_browser_net::DnsMaster* dns_master_; |
89 | 91 |
90 DISALLOW_COPY_AND_ASSIGN(IOThread); | 92 DISALLOW_COPY_AND_ASSIGN(IOThread); |
91 }; | 93 }; |
92 | 94 |
93 #endif // CHROME_BROWSER_IO_THREAD_H_ | 95 #endif // CHROME_BROWSER_IO_THREAD_H_ |
OLD | NEW |