Chromium Code Reviews| 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..78bed6e3b8d85687f04f092a6d5cbd8633ea373c 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)) ; |
|
Charlie Reis
2015/01/23 06:53:37
nit: No space before semicolon.
nhu
2015/01/23 13:41:12
Done.
|
| if (!is_same_origin && renderer_says_in_page) |
| rfh->GetProcess()->ReceivedBadMessage(); |
| return is_same_origin && renderer_says_in_page; |