diff options
author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 08:11:11 +0000 |
---|---|---|
committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 08:11:11 +0000 |
commit | f4d5f5d8f0133f1684b4bb954e61e1e33480d6f5 (patch) | |
tree | 78390beccb810ec1df73be78c05bcec140ac82fe /chrome/browser | |
parent | 9087aa3c473281af9c216d060d00baa4e1af4216 (diff) | |
download | chromium_src-f4d5f5d8f0133f1684b4bb954e61e1e33480d6f5.zip chromium_src-f4d5f5d8f0133f1684b4bb954e61e1e33480d6f5.tar.gz chromium_src-f4d5f5d8f0133f1684b4bb954e61e1e33480d6f5.tar.bz2 |
Flip the "unique file:// URI origin" flag to on. Add the
--allow-file-access-from-files developer switch. Turn on this flag for the UI
tests, which depend on the old behaviour.
BUG=4197
TEST=WebKit test submitted upstream
TBR=abarth
Review URL: http://codereview.chromium.org/648003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc index 7ce522d..9b3be5d 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -188,6 +188,8 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks); web_prefs.geolocation_enabled = command_line.HasSwitch(switches::kEnableGeolocation); + web_prefs.allow_file_access_from_file_urls = + command_line.HasSwitch(switches::kAllowFileAccessFromFiles); } web_prefs.uses_universal_detector = |