Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(924)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2454563003: Fix web accessible resource checks in ShouldAllowOpenURL (Closed)
Patch Set: Tighten check a bit more Created 4 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 748e95bfc5f053a028392aabcd654297396601a6..6d2603eb33223d143fa0b7bf4d177b56e37df850 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1196,17 +1196,16 @@ bool ChromeContentBrowserClient::CanCommitURL(
bool ChromeContentBrowserClient::ShouldAllowOpenURL(
content::SiteInstance* site_instance, const GURL& url) {
- GURL from_url = site_instance->GetSiteURL();
-
#if defined(ENABLE_EXTENSIONS)
bool result;
if (ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
- site_instance, from_url, url, &result))
+ site_instance, url, &result))
return result;
#endif
// Do not allow chrome://chrome-signin navigate to other chrome:// URLs, since
// the signin page may host untrusted web content.
+ GURL from_url = site_instance->GetSiteURL();
if (from_url.GetOrigin().spec() == chrome::kChromeUIChromeSigninURL &&
url.SchemeIs(content::kChromeUIScheme) &&
url.host_piece() != chrome::kChromeUIChromeSigninHost) {

Powered by Google App Engine
This is Rietveld 408576698