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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2222723002: Avoid calling into the ContentBrowserClient interface from ResourceDispatcherHostImpl to determine … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile failures Created 4 years, 4 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 8a8a08e0ac797d566a963164c9c58b563acdb623..2ad783482fb4e23835fd43b4dca36b5fafed09f2 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1131,18 +1131,6 @@ bool ChromeContentBrowserClient::CanCommitURL(
#endif
}
-bool ChromeContentBrowserClient::IsIllegalOrigin(
- content::ResourceContext* resource_context,
- int child_process_id,
- const GURL& origin) {
-#if defined(ENABLE_EXTENSIONS)
- return ChromeContentBrowserClientExtensionsPart::IsIllegalOrigin(
- resource_context, child_process_id, origin);
-#else
- return false;
-#endif
-}
-
bool ChromeContentBrowserClient::ShouldAllowOpenURL(
content::SiteInstance* site_instance, const GURL& url) {
GURL from_url = site_instance->GetSiteURL();
@@ -2274,6 +2262,9 @@ bool ChromeContentBrowserClient::CanCreateWindow(
void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ for (size_t i = 0; i < extra_parts_.size(); ++i)
+ extra_parts_[i]->ResourceDispatcherHostCreated();
+
return g_browser_process->ResourceDispatcherHostCreated();
}

Powered by Google App Engine
This is Rietveld 408576698