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

Unified Diff: android_webview/renderer/aw_content_settings_client.h

Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « no previous file | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/renderer/aw_content_settings_client.h
diff --git a/android_webview/renderer/aw_content_settings_client.h b/android_webview/renderer/aw_content_settings_client.h
index 90a947941bb8d71c4b8ead4ef254d2f1c7f71d68..5d44551858ea8d80d386dc1411c27eae045789ca 100644
--- a/android_webview/renderer/aw_content_settings_client.h
+++ b/android_webview/renderer/aw_content_settings_client.h
@@ -20,14 +20,14 @@
~AwContentSettingsClient() override;
// blink::WebContentSettingsClient implementation.
- bool allowDisplayingInsecureContent(
+ virtual bool allowDisplayingInsecureContent(
bool enabled_per_settings,
const blink::WebSecurityOrigin& origin,
- const blink::WebURL& url) override;
- bool allowRunningInsecureContent(
+ const blink::WebURL& url);
+ virtual bool allowRunningInsecureContent(
bool enabled_per_settings,
const blink::WebSecurityOrigin& origin,
- const blink::WebURL& url) override;
+ const blink::WebURL& url);
DISALLOW_COPY_AND_ASSIGN(AwContentSettingsClient);
};
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698