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

Side by Side Diff: net/proxy/proxy_resolver_v8_tracing.cc

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_tracing.h ('k') | net/proxy/proxy_resolver_v8_tracing_unittest.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 #include "net/proxy/proxy_resolver_v8_tracing.h" 5 #include "net/proxy/proxy_resolver_v8_tracing.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop_proxy.h" 8 #include "base/message_loop/message_loop_proxy.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/synchronization/cancellation_flag.h" 10 #include "base/synchronization/cancellation_flag.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 const CompletionCallback& callback); 141 const CompletionCallback& callback);
142 142
143 void ExecuteBlocking(); 143 void ExecuteBlocking();
144 void ExecuteNonBlocking(); 144 void ExecuteNonBlocking();
145 int ExecuteProxyResolver(); 145 int ExecuteProxyResolver();
146 146
147 // Implementation of ProxyResolverv8::JSBindings 147 // Implementation of ProxyResolverv8::JSBindings
148 virtual bool ResolveDns(const std::string& host, 148 virtual bool ResolveDns(const std::string& host,
149 ResolveDnsOperation op, 149 ResolveDnsOperation op,
150 std::string* output, 150 std::string* output,
151 bool* terminate) OVERRIDE; 151 bool* terminate) override;
152 virtual void Alert(const base::string16& message) OVERRIDE; 152 virtual void Alert(const base::string16& message) override;
153 virtual void OnError(int line_number, const base::string16& error) OVERRIDE; 153 virtual void OnError(int line_number, const base::string16& error) override;
154 154
155 bool ResolveDnsBlocking(const std::string& host, 155 bool ResolveDnsBlocking(const std::string& host,
156 ResolveDnsOperation op, 156 ResolveDnsOperation op,
157 std::string* output); 157 std::string* output);
158 158
159 bool ResolveDnsNonBlocking(const std::string& host, 159 bool ResolveDnsNonBlocking(const std::string& host,
160 ResolveDnsOperation op, 160 ResolveDnsOperation op,
161 std::string* output, 161 std::string* output,
162 bool* terminate); 162 bool* terminate);
163 163
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 DCHECK(!set_pac_script_job_.get()); 1001 DCHECK(!set_pac_script_job_.get());
1002 CHECK_EQ(0, num_outstanding_callbacks_); 1002 CHECK_EQ(0, num_outstanding_callbacks_);
1003 1003
1004 set_pac_script_job_ = new Job(this); 1004 set_pac_script_job_ = new Job(this);
1005 set_pac_script_job_->StartSetPacScript(script_data, callback); 1005 set_pac_script_job_->StartSetPacScript(script_data, callback);
1006 1006
1007 return ERR_IO_PENDING; 1007 return ERR_IO_PENDING;
1008 } 1008 }
1009 1009
1010 } // namespace net 1010 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8_tracing.h ('k') | net/proxy/proxy_resolver_v8_tracing_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698