android_webview/renderer/aw_permission_client.cc - Issue 547093002: Return WebLocalFrame from RenderFrame::GetWebFrame().

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 547093002: Return WebLocalFrame from RenderFrame::GetWebFrame(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

« no previous file with comments | « no previous file | android_webview/renderer/aw_render_frame_ext.cc » ('j') | no next file with comments »

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_permission_client.h"	5 #include "android_webview/renderer/aw_permission_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/WebFrame.h"	9 #include "third_party/WebKit/public/web/WebLocalFrame.h"

10 #include "url/gurl.h"	10 #include "url/gurl.h"

11	11

12 namespace android_webview {	12 namespace android_webview {

13	13

14 namespace {	14 namespace {

15	15

16 bool AllowMixedContent(const blink::WebURL& url) {	16 bool AllowMixedContent(const blink::WebURL& url) {

17 // We treat non-standard schemes as "secure" in the WebView to allow them to	17 // We treat non-standard schemes as "secure" in the WebView to allow them to

18 // be used for request interception.	18 // be used for request interception.

19 // TODO(benm): Tighten this restriction by requiring embedders to register	19 // TODO(benm): Tighten this restriction by requiring embedders to register

(...skipping 20 matching lines...) Expand all Loading...
40 }	40 }

41	41

42 bool AwPermissionClient::allowRunningInsecureContent(	42 bool AwPermissionClient::allowRunningInsecureContent(

43 bool enabled_per_settings,	43 bool enabled_per_settings,

44 const blink::WebSecurityOrigin& origin,	44 const blink::WebSecurityOrigin& origin,

45 const blink::WebURL& url) {	45 const blink::WebURL& url) {

46 return enabled_per_settings ? true : AllowMixedContent(url);	46 return enabled_per_settings ? true : AllowMixedContent(url);

47 }	47 }

48	48

49 } // namespace android_webview	49 } // namespace android_webview

OLD	NEW