Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(559)

Side by Side Diff: android_webview/renderer/aw_content_settings_client.cc

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Updated JNI mixed content settings getters for Android WebView Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 15 matching lines...) Expand all
26 26
27 AwContentSettingsClient::AwContentSettingsClient( 27 AwContentSettingsClient::AwContentSettingsClient(
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(
37 bool enabled_per_settings,
38 const blink::WebURL& url) {
39 return enabled_per_settings ? true : AllowMixedContent(url);
40 }
41
42 bool AwContentSettingsClient::allowRunningInsecureContent( 36 bool AwContentSettingsClient::allowRunningInsecureContent(
43 bool enabled_per_settings, 37 bool enabled_per_settings,
44 const blink::WebSecurityOrigin& origin, 38 const blink::WebSecurityOrigin& origin,
45 const blink::WebURL& url) { 39 const blink::WebURL& url) {
46 return enabled_per_settings ? true : AllowMixedContent(url); 40 return enabled_per_settings ? true : AllowMixedContent(url);
47 } 41 }
48 42
49 void AwContentSettingsClient::OnDestruct() { 43 void AwContentSettingsClient::OnDestruct() {
50 delete this; 44 delete this;
51 } 45 }
52 46
53 } // namespace android_webview 47 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698