| Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
| index 517be6b2cdd123e78831e3ff0757cf5b9fb8bb03..a7cb18f1e1f89420632e5c043542bccca19b84d5 100644
|
| --- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
| @@ -263,14 +263,6 @@ bool FrameLoaderClientImpl::allowImage(bool enabledPerSettings, const KURL& imag
|
| return enabledPerSettings;
|
| }
|
|
|
| -bool FrameLoaderClientImpl::allowDisplayingInsecureContent(bool enabledPerSettings, const KURL& url)
|
| -{
|
| - if (m_webFrame->contentSettingsClient())
|
| - return m_webFrame->contentSettingsClient()->allowDisplayingInsecureContent(enabledPerSettings, WebURL(url));
|
| -
|
| - return enabledPerSettings;
|
| -}
|
| -
|
| bool FrameLoaderClientImpl::allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin* context, const KURL& url)
|
| {
|
| if (m_webFrame->contentSettingsClient())
|
| @@ -287,6 +279,12 @@ bool FrameLoaderClientImpl::allowAutoplay(bool defaultValue)
|
| return defaultValue;
|
| }
|
|
|
| +void FrameLoaderClientImpl::passiveInsecureContentFound(const KURL& url)
|
| +{
|
| + if (m_webFrame->contentSettingsClient())
|
| + return m_webFrame->contentSettingsClient()->passiveInsecureContentFound(WebURL(url));
|
| +}
|
| +
|
| void FrameLoaderClientImpl::didNotAllowScript()
|
| {
|
| if (m_webFrame->contentSettingsClient())
|
|
|