OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 NET_PROXY_PROXY_RESOLVER_MOJO_H_ | 5 #ifndef NET_PROXY_PROXY_RESOLVER_MOJO_H_ |
6 #define NET_PROXY_PROXY_RESOLVER_MOJO_H_ | 6 #define NET_PROXY_PROXY_RESOLVER_MOJO_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/memory/weak_ptr.h" | |
12 #include "base/threading/thread_checker.h" | 13 #include "base/threading/thread_checker.h" |
13 #include "net/base/completion_callback.h" | 14 #include "net/base/completion_callback.h" |
14 #include "net/base/load_states.h" | 15 #include "net/base/load_states.h" |
15 #include "net/interfaces/host_resolver_service.mojom.h" | 16 #include "net/interfaces/host_resolver_service.mojom.h" |
16 #include "net/interfaces/proxy_resolver_service.mojom.h" | 17 #include "net/interfaces/proxy_resolver_service.mojom.h" |
17 #include "net/proxy/proxy_resolver.h" | 18 #include "net/proxy/proxy_resolver.h" |
18 #include "net/proxy/proxy_resolver_script_data.h" | 19 #include "net/proxy/proxy_resolver_script_data.h" |
19 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" | 20 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
20 | 21 |
21 class GURL; | 22 class GURL; |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
89 | 90 |
90 // DNS resolver, saved for creating a new Mojo proxy resolver when the | 91 // DNS resolver, saved for creating a new Mojo proxy resolver when the |
91 // existing one disconnects (i.e. when utility process crashes). | 92 // existing one disconnects (i.e. when utility process crashes). |
92 HostResolver* host_resolver_; | 93 HostResolver* host_resolver_; |
93 | 94 |
94 std::set<Job*> pending_jobs_; | 95 std::set<Job*> pending_jobs_; |
95 net::CancelableCompletionCallback set_pac_script_callback_; | 96 net::CancelableCompletionCallback set_pac_script_callback_; |
96 | 97 |
97 base::ThreadChecker thread_checker_; | 98 base::ThreadChecker thread_checker_; |
98 | 99 |
100 base::WeakPtrFactory<ProxyResolverMojo> weak_factory_; | |
eroman
2015/04/15 00:56:52
Please think about using WeakPointer less rather t
Sam McNally
2015/04/15 04:35:56
Removed it.
| |
101 | |
99 DISALLOW_COPY_AND_ASSIGN(ProxyResolverMojo); | 102 DISALLOW_COPY_AND_ASSIGN(ProxyResolverMojo); |
100 }; | 103 }; |
101 | 104 |
102 } // namespace net | 105 } // namespace net |
103 | 106 |
104 #endif // NET_PROXY_PROXY_RESOLVER_MOJO_H_ | 107 #endif // NET_PROXY_PROXY_RESOLVER_MOJO_H_ |
OLD | NEW |