| 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 5d44551858ea8d80d386dc1411c27eae045789ca..90a947941bb8d71c4b8ead4ef254d2f1c7f71d68 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);
|
| };
|
|
|