| 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();
|
| }
|
|
|
|
|