content/browser/web_contents/web_contents_impl.cc - Issue 11116013: [content shell] allow universal access from file URLs in layout tests

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: content/browser/web_contents/web_contents_impl.cc

Issue 11116013: [content shell] allow universal access from file URLs in layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updates Created 8 years, 2 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:

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index a6415f2b085e2e685187c2dc27acbca71d7c8245..8eebca83024ed45164a4d601a02bb9f04104c44c 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -525,6 +525,8 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,

command_line.HasSwitch(switches::kEnablePrivilegedWebGLExtensions);

prefs.site_specific_quirks_enabled =

!command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);

+ prefs.allow_universal_access_from_file_urls =

+ command_line.HasSwitch(switches::kAllowUniversalAccessFromFiles);

prefs.allow_file_access_from_file_urls =

command_line.HasSwitch(switches::kAllowFileAccessFromFiles);

prefs.show_composited_layer_borders =