| Index: chrome/renderer/content_settings_observer.cc
|
| diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
|
| index 63d772f4143f6b7ec9602ed1dc4790889896ff82..8bd0430b15b7f9d5a016f7fbce3a8d4e4dc0da13 100644
|
| --- a/chrome/renderer/content_settings_observer.cc
|
| +++ b/chrome/renderer/content_settings_observer.cc
|
| @@ -389,15 +389,6 @@ bool ContentSettingsObserver::allowMutationEvents(bool default_value) {
|
| return IsPlatformApp() ? false : default_value;
|
| }
|
|
|
| -bool ContentSettingsObserver::allowDisplayingInsecureContent(
|
| - bool allowed_per_settings,
|
| - const blink::WebURL& resource_url) {
|
| - DCHECK(allowed_per_settings);
|
| - ReportInsecureContent(SslInsecureContentType::DISPLAY);
|
| - FilteredReportInsecureContentDisplayed(GURL(resource_url));
|
| - return true;
|
| -}
|
| -
|
| bool ContentSettingsObserver::allowRunningInsecureContent(
|
| bool allowed_per_settings,
|
| const blink::WebSecurityOrigin& origin,
|
| @@ -424,6 +415,12 @@ bool ContentSettingsObserver::allowAutoplay(bool default_value) {
|
| CONTENT_SETTING_ALLOW;
|
| }
|
|
|
| +void ContentSettingsObserver::passiveInsecureContentFound(
|
| + const blink::WebURL& resource_url) {
|
| + ReportInsecureContent(SslInsecureContentType::DISPLAY);
|
| + FilteredReportInsecureContentDisplayed(GURL(resource_url));
|
| +}
|
| +
|
| void ContentSettingsObserver::didUseKeygen() {
|
| WebFrame* frame = render_frame()->GetWebFrame();
|
| Send(new ChromeViewHostMsg_DidUseKeygen(
|
|
|