Index: content/browser/frame_host/navigation_controller_impl.cc |
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc |
index f4f184ba42b9889896b76abd0b6682735ed53464..270053eb82b0e89276702a8015813f5c023aff57 100644 |
--- a/content/browser/frame_host/navigation_controller_impl.cc |
+++ b/content/browser/frame_host/navigation_controller_impl.cc |
@@ -129,7 +129,9 @@ bool AreURLsInPageNavigation(const GURL& existing_url, |
// for now. |
existing_url == GURL(url::kAboutBlankURL) || |
existing_url.GetOrigin() == new_url.GetOrigin() || |
- !prefs.web_security_enabled; |
+ !prefs.web_security_enabled || |
+ (prefs.allow_universal_access_from_file_urls && |
+ existing_url.SchemeIs(url::kFileScheme)); |
if (!is_same_origin && renderer_says_in_page) |
rfh->GetProcess()->ReceivedBadMessage(); |
return is_same_origin && renderer_says_in_page; |