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

Unified Diff: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

Issue 2486843003: Allow navigations to non-web-accessible resources from chrome schemes. (Closed)
Patch Set: Created 4 years, 1 month 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/extensions/chrome_content_browser_client_extensions_part.cc
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
index e192ef01251f3407f0f3897a8cdbe1d22b34b17d..3ee16a0b2809db2a362fc309ba20a15f9bb098ee 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -25,6 +25,7 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_process_policy.h"
+#include "chrome/common/url_constants.h"
#include "components/guest_view/browser/guest_view_message_filter.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/browser_url_handler.h"
@@ -36,6 +37,7 @@
#include "content/public/browser/vpn_service_proxy.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
#include "extensions/browser/api/web_request/web_request_api.h"
#include "extensions/browser/api/web_request/web_request_api_helpers.h"
#include "extensions/browser/bad_message.h"
@@ -521,7 +523,6 @@ bool ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
const GURL& to_url,
bool* result) {
DCHECK(result);
-
// Using url::Origin is important to properly handle blob: and filesystem:
// URLs.
url::Origin to_origin(to_url);
@@ -531,6 +532,15 @@ bool ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
return false;
}
+ // Navigations from chrome:// or chrome-search:// pages need to be allowed,
+ // even if |to_url| is not web-accessible. See https://crbug.com/662602.
+ GURL site_url(site_instance->GetSiteURL());
+ if (site_url.SchemeIs(content::kChromeUIScheme) ||
+ site_url.SchemeIs(chrome::kChromeSearchScheme)) {
ncarter (slow) 2016/11/09 18:44:21 Are we sure we want to allow this for extension bl
alexmos 2016/11/09 22:20:31 Done, given the observation that Blink already blo
+ *result = true;
+ return true;
+ }
+
// Do not allow pages from the web or other extensions navigate to
// non-web-accessible extension resources.
@@ -543,7 +553,6 @@ bool ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
return true;
}
- GURL site_url(site_instance->GetSiteURL());
const Extension* from_extension =
registry->enabled_extensions().GetExtensionOrAppByURL(site_url);
if (from_extension && from_extension == to_extension) {
« no previous file with comments | « no previous file | chrome/browser/extensions/window_open_apitest.cc » ('j') | chrome/browser/extensions/window_open_apitest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698