diff options
| author | avi <avi@chromium.org> | 2015-12-07 07:35:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-07 15:35:47 +0000 |
| commit | 32ff552858e014d454ce8b181f5aca1dfcf8f8fd (patch) | |
| tree | fbc65a109549b7fa51359ef487554254103fd488 /android_webview | |
| parent | f9c471c76eae8c61550ab1e97861c927baa7c164 (diff) | |
| download | chromium_src-32ff552858e014d454ce8b181f5aca1dfcf8f8fd.zip chromium_src-32ff552858e014d454ce8b181f5aca1dfcf8f8fd.tar.gz chromium_src-32ff552858e014d454ce8b181f5aca1dfcf8f8fd.tar.bz2 | |
Enforce marking "override" for functions overriding Blink.
BUG=535367
TEST=it all stays working
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/1370923002
Cr-Commit-Position: refs/heads/master@{#363482}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/renderer/aw_content_settings_client.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android_webview/renderer/aw_content_settings_client.h b/android_webview/renderer/aw_content_settings_client.h index 5d44551..90a9479 100644 --- a/android_webview/renderer/aw_content_settings_client.h +++ b/android_webview/renderer/aw_content_settings_client.h @@ -20,14 +20,14 @@ class AwContentSettingsClient : public content::RenderFrameObserver, ~AwContentSettingsClient() override; // blink::WebContentSettingsClient implementation. - virtual bool allowDisplayingInsecureContent( + bool allowDisplayingInsecureContent( bool enabled_per_settings, const blink::WebSecurityOrigin& origin, - const blink::WebURL& url); - virtual bool allowRunningInsecureContent( + const blink::WebURL& url) override; + bool allowRunningInsecureContent( bool enabled_per_settings, const blink::WebSecurityOrigin& origin, - const blink::WebURL& url); + const blink::WebURL& url) override; DISALLOW_COPY_AND_ASSIGN(AwContentSettingsClient); }; |