| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "android_webview/renderer/aw_content_settings_client.h" | 5 #include "android_webview/renderer/aw_content_settings_client.h" |
| 6 | 6 |
| 7 #include "content/public/renderer/render_frame.h" | 7 #include "content/public/renderer/render_frame.h" |
| 8 #include "third_party/WebKit/public/platform/WebURL.h" | 8 #include "third_party/WebKit/public/platform/WebURL.h" |
| 9 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 9 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
| 10 #include "url/gurl.h" | 10 #include "url/gurl.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 content::RenderFrame* render_frame) | 28 content::RenderFrame* render_frame) |
| 29 : content::RenderFrameObserver(render_frame) { | 29 : content::RenderFrameObserver(render_frame) { |
| 30 render_frame->GetWebFrame()->setContentSettingsClient(this); | 30 render_frame->GetWebFrame()->setContentSettingsClient(this); |
| 31 } | 31 } |
| 32 | 32 |
| 33 AwContentSettingsClient::~AwContentSettingsClient() { | 33 AwContentSettingsClient::~AwContentSettingsClient() { |
| 34 } | 34 } |
| 35 | 35 |
| 36 bool AwContentSettingsClient::allowDisplayingInsecureContent( | 36 bool AwContentSettingsClient::allowDisplayingInsecureContent( |
| 37 bool enabled_per_settings, | 37 bool enabled_per_settings, |
| 38 const blink::WebSecurityOrigin& origin, | |
| 39 const blink::WebURL& url) { | 38 const blink::WebURL& url) { |
| 40 return enabled_per_settings ? true : AllowMixedContent(url); | 39 return enabled_per_settings ? true : AllowMixedContent(url); |
| 41 } | 40 } |
| 42 | 41 |
| 43 bool AwContentSettingsClient::allowRunningInsecureContent( | 42 bool AwContentSettingsClient::allowRunningInsecureContent( |
| 44 bool enabled_per_settings, | 43 bool enabled_per_settings, |
| 45 const blink::WebSecurityOrigin& origin, | 44 const blink::WebSecurityOrigin& origin, |
| 46 const blink::WebURL& url) { | 45 const blink::WebURL& url) { |
| 47 return enabled_per_settings ? true : AllowMixedContent(url); | 46 return enabled_per_settings ? true : AllowMixedContent(url); |
| 48 } | 47 } |
| 49 | 48 |
| 50 } // namespace android_webview | 49 } // namespace android_webview |
| OLD | NEW |