diff options
Diffstat (limited to 'content/browser/frame_host/navigation_controller_impl.cc')
| -rw-r--r-- | content/browser/frame_host/navigation_controller_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc index 4be5a3ce4a..3f13f31df2 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; |