chrome/renderer/content_settings_observer.cc - Issue 78303005: ContentSettings API should not interact with <webview>

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

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 78303005: ContentSettings API should not interact with <webview> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed Jochen's remaining comments Created 7 years 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/chrome_content_browser_client.cc ('K') | « chrome/browser/guestview/guestview.cc ('k') | chrome/test/data/extensions/platform_apps/web_view/extension_api/content_script/README » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/content_settings_observer.cc

diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc

index 4f0a4b253f05bdcb0d57d30bdfa061cb403af105..67321b3a55e1869728503e105b1d5a407f7b753a 100644

--- a/chrome/renderer/content_settings_observer.cc

+++ b/chrome/renderer/content_settings_observer.cc

@@ -365,6 +365,11 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings(

if (EqualsASCII(origin.protocol(), chrome::kChromeInternalScheme))

return true;

+ // TODO(creis, fsamuel): Remove this once the concept of swapped out

+ // RenderViews goes away.

+ if (document_url == GURL(content::kSwappedOutURL))

+ return true;

// If the scheme is file:, an empty file name indicates a directory listing,

// which requires JavaScript to function properly.

if (EqualsASCII(origin.protocol(), chrome::kFileScheme)) {