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

Unified Diff: net/proxy/proxy_config_service_android.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_config_service_android.h ('k') | net/proxy/proxy_config_service_android_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_android.cc
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
index d27bc5ac548df2cbb9aafb9232fe3134bdbe4855..b294689f078ca47b08cf99dea3bae10e21fee0d0 100644
--- a/net/proxy/proxy_config_service_android.cc
+++ b/net/proxy/proxy_config_service_android.cc
@@ -277,7 +277,7 @@ class ProxyConfigServiceAndroid::Delegate
jobject jself,
jstring jhost,
jint jport,
- jstring jpac_url) OVERRIDE {
+ jstring jpac_url) override {
std::string host = ConvertJavaStringToUTF8(env, jhost);
std::string pac_url;
if (jpac_url)
@@ -285,7 +285,7 @@ class ProxyConfigServiceAndroid::Delegate
delegate_->ProxySettingsChangedTo(host, jport, pac_url);
}
- virtual void ProxySettingsChanged(JNIEnv* env, jobject self) OVERRIDE {
+ virtual void ProxySettingsChanged(JNIEnv* env, jobject self) override {
delegate_->ProxySettingsChanged();
}
« no previous file with comments | « net/proxy/proxy_config_service_android.h ('k') | net/proxy/proxy_config_service_android_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698