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

Side by Side Diff: net/proxy/proxy_resolver_v8_tracing.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/proxy_resolver_v8.cc ('k') | net/proxy/proxy_resolver_v8_tracing.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_V8_TRACING_H_ 5 #ifndef NET_PROXY_PROXY_RESOLVER_V8_TRACING_H_
6 #define NET_PROXY_PROXY_RESOLVER_V8_TRACING_H_ 6 #define NET_PROXY_PROXY_RESOLVER_V8_TRACING_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 ProxyResolverErrorObserver* error_observer, 42 ProxyResolverErrorObserver* error_observer,
43 NetLog* net_log); 43 NetLog* net_log);
44 44
45 virtual ~ProxyResolverV8Tracing(); 45 virtual ~ProxyResolverV8Tracing();
46 46
47 // ProxyResolver implementation: 47 // ProxyResolver implementation:
48 virtual int GetProxyForURL(const GURL& url, 48 virtual int GetProxyForURL(const GURL& url,
49 ProxyInfo* results, 49 ProxyInfo* results,
50 const CompletionCallback& callback, 50 const CompletionCallback& callback,
51 RequestHandle* request, 51 RequestHandle* request,
52 const BoundNetLog& net_log) OVERRIDE; 52 const BoundNetLog& net_log) override;
53 virtual void CancelRequest(RequestHandle request) OVERRIDE; 53 virtual void CancelRequest(RequestHandle request) override;
54 virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE; 54 virtual LoadState GetLoadState(RequestHandle request) const override;
55 virtual void CancelSetPacScript() OVERRIDE; 55 virtual void CancelSetPacScript() override;
56 virtual int SetPacScript( 56 virtual int SetPacScript(
57 const scoped_refptr<ProxyResolverScriptData>& script_data, 57 const scoped_refptr<ProxyResolverScriptData>& script_data,
58 const CompletionCallback& callback) OVERRIDE; 58 const CompletionCallback& callback) override;
59 59
60 private: 60 private:
61 class Job; 61 class Job;
62 62
63 // The worker thread on which the ProxyResolverV8 will be run. 63 // The worker thread on which the ProxyResolverV8 will be run.
64 scoped_ptr<base::Thread> thread_; 64 scoped_ptr<base::Thread> thread_;
65 scoped_ptr<ProxyResolverV8> v8_resolver_; 65 scoped_ptr<ProxyResolverV8> v8_resolver_;
66 66
67 // Non-owned host resolver, which is to be operated on the origin thread. 67 // Non-owned host resolver, which is to be operated on the origin thread.
68 HostResolver* host_resolver_; 68 HostResolver* host_resolver_;
69 69
70 scoped_ptr<ProxyResolverErrorObserver> error_observer_; 70 scoped_ptr<ProxyResolverErrorObserver> error_observer_;
71 NetLog* net_log_; 71 NetLog* net_log_;
72 72
73 // The outstanding SetPacScript operation, or NULL. 73 // The outstanding SetPacScript operation, or NULL.
74 scoped_refptr<Job> set_pac_script_job_; 74 scoped_refptr<Job> set_pac_script_job_;
75 75
76 // The number of outstanding (non-cancelled) jobs. 76 // The number of outstanding (non-cancelled) jobs.
77 int num_outstanding_callbacks_; 77 int num_outstanding_callbacks_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8Tracing); 79 DISALLOW_COPY_AND_ASSIGN(ProxyResolverV8Tracing);
80 }; 80 };
81 81
82 } // namespace net 82 } // namespace net
83 83
84 #endif // NET_PROXY_PROXY_RESOLVER_V8_TRACING_H_ 84 #endif // NET_PROXY_PROXY_RESOLVER_V8_TRACING_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8.cc ('k') | net/proxy/proxy_resolver_v8_tracing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698