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

Side by Side Diff: net/proxy/multi_threaded_proxy_resolver.h

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 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 | « net/proxy/mock_proxy_script_fetcher.h ('k') | net/proxy/multi_threaded_proxy_resolver.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_MULTI_THREADED_PROXY_RESOLVER_H_ 5 #ifndef NET_PROXY_MULTI_THREADED_PROXY_RESOLVER_H_
6 #define NET_PROXY_MULTI_THREADED_PROXY_RESOLVER_H_ 6 #define NET_PROXY_MULTI_THREADED_PROXY_RESOLVER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 MultiThreadedProxyResolver(ProxyResolverFactory* resolver_factory, 88 MultiThreadedProxyResolver(ProxyResolverFactory* resolver_factory,
89 size_t max_num_threads); 89 size_t max_num_threads);
90 90
91 virtual ~MultiThreadedProxyResolver(); 91 virtual ~MultiThreadedProxyResolver();
92 92
93 // ProxyResolver implementation: 93 // ProxyResolver implementation:
94 virtual int GetProxyForURL(const GURL& url, 94 virtual int GetProxyForURL(const GURL& url,
95 ProxyInfo* results, 95 ProxyInfo* results,
96 const CompletionCallback& callback, 96 const CompletionCallback& callback,
97 RequestHandle* request, 97 RequestHandle* request,
98 const BoundNetLog& net_log) OVERRIDE; 98 const BoundNetLog& net_log) override;
99 virtual void CancelRequest(RequestHandle request) OVERRIDE; 99 virtual void CancelRequest(RequestHandle request) override;
100 virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE; 100 virtual LoadState GetLoadState(RequestHandle request) const override;
101 virtual void CancelSetPacScript() OVERRIDE; 101 virtual void CancelSetPacScript() override;
102 virtual int SetPacScript( 102 virtual int SetPacScript(
103 const scoped_refptr<ProxyResolverScriptData>& script_data, 103 const scoped_refptr<ProxyResolverScriptData>& script_data,
104 const CompletionCallback& callback) OVERRIDE; 104 const CompletionCallback& callback) override;
105 105
106 private: 106 private:
107 class Executor; 107 class Executor;
108 class Job; 108 class Job;
109 class SetPacScriptJob; 109 class SetPacScriptJob;
110 class GetProxyForURLJob; 110 class GetProxyForURLJob;
111 // FIFO queue of pending jobs waiting to be started. 111 // FIFO queue of pending jobs waiting to be started.
112 // TODO(eroman): Make this priority queue. 112 // TODO(eroman): Make this priority queue.
113 typedef std::deque<scoped_refptr<Job> > PendingJobsQueue; 113 typedef std::deque<scoped_refptr<Job> > PendingJobsQueue;
114 typedef std::vector<scoped_refptr<Executor> > ExecutorList; 114 typedef std::vector<scoped_refptr<Executor> > ExecutorList;
(...skipping 18 matching lines...) Expand all
133 const scoped_ptr<ProxyResolverFactory> resolver_factory_; 133 const scoped_ptr<ProxyResolverFactory> resolver_factory_;
134 const size_t max_num_threads_; 134 const size_t max_num_threads_;
135 PendingJobsQueue pending_jobs_; 135 PendingJobsQueue pending_jobs_;
136 ExecutorList executors_; 136 ExecutorList executors_;
137 scoped_refptr<ProxyResolverScriptData> current_script_data_; 137 scoped_refptr<ProxyResolverScriptData> current_script_data_;
138 }; 138 };
139 139
140 } // namespace net 140 } // namespace net
141 141
142 #endif // NET_PROXY_MULTI_THREADED_PROXY_RESOLVER_H_ 142 #endif // NET_PROXY_MULTI_THREADED_PROXY_RESOLVER_H_
OLDNEW
« no previous file with comments | « net/proxy/mock_proxy_script_fetcher.h ('k') | net/proxy/multi_threaded_proxy_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698