summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chrome_content_browser_client.cc25
-rw-r--r--chrome/browser/chrome_content_browser_client.h6
-rw-r--r--chrome/browser/chrome_content_browser_client_parts.h4
-rw-r--r--chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc38
-rw-r--r--chrome/browser/extensions/chrome_content_browser_client_extensions_part.h6
-rw-r--r--chrome/browser/extensions/url_request_util.cc6
6 files changed, 0 insertions, 85 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 17b99db..d81d481 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1111,20 +1111,6 @@ void ChromeContentBrowserClient::SiteInstanceDeleting(
extra_parts_[i]->SiteInstanceDeleting(site_instance);
}
-void ChromeContentBrowserClient::WorkerProcessCreated(
- SiteInstance* site_instance,
- int worker_process_id) {
- for (size_t i = 0; i < extra_parts_.size(); ++i)
- extra_parts_[i]->WorkerProcessCreated(site_instance, worker_process_id);
-}
-
-void ChromeContentBrowserClient::WorkerProcessTerminated(
- SiteInstance* site_instance,
- int worker_process_id) {
- for (size_t i = 0; i < extra_parts_.size(); ++i)
- extra_parts_[i]->WorkerProcessTerminated(site_instance, worker_process_id);
-}
-
bool ChromeContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
SiteInstance* site_instance,
const GURL& current_url,
@@ -2086,17 +2072,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
return true;
}
-std::string ChromeContentBrowserClient::GetWorkerProcessTitle(
- const GURL& url, content::ResourceContext* context) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-#if defined(ENABLE_EXTENSIONS)
- return ChromeContentBrowserClientExtensionsPart::GetWorkerProcessTitle(
- url, context);
-#else
- return std::string();
-#endif
-}
-
void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
prerender_tracker_ = g_browser_process->prerender_tracker();
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 63249dc..1d76dc8 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -103,10 +103,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
content::SiteInstance* site_instance) OVERRIDE;
virtual void SiteInstanceDeleting(content::SiteInstance* site_instance)
OVERRIDE;
- virtual void WorkerProcessCreated(content::SiteInstance* site_instance,
- int worker_process_id) OVERRIDE;
- virtual void WorkerProcessTerminated(content::SiteInstance* site_instance,
- int worker_process_id) OVERRIDE;
virtual bool ShouldSwapBrowsingInstancesForNavigation(
content::SiteInstance* site_instance,
const GURL& current_url,
@@ -237,8 +233,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
int render_process_id,
int opener_id,
bool* no_javascript_access) OVERRIDE;
- virtual std::string GetWorkerProcessTitle(
- const GURL& url, content::ResourceContext* context) OVERRIDE;
virtual void ResourceDispatcherHostCreated() OVERRIDE;
virtual content::SpeechRecognitionManagerDelegate*
GetSpeechRecognitionManagerDelegate() OVERRIDE;
diff --git a/chrome/browser/chrome_content_browser_client_parts.h b/chrome/browser/chrome_content_browser_client_parts.h
index 9ec65c6..def457f 100644
--- a/chrome/browser/chrome_content_browser_client_parts.h
+++ b/chrome/browser/chrome_content_browser_client_parts.h
@@ -42,10 +42,6 @@ class ChromeContentBrowserClientParts {
virtual void RenderProcessWillLaunch(content::RenderProcessHost* host) {}
virtual void SiteInstanceGotProcess(content::SiteInstance* site_instance) {}
virtual void SiteInstanceDeleting(content::SiteInstance* site_instance) {}
- virtual void WorkerProcessCreated(content::SiteInstance* site_instance,
- int worker_process_id) {}
- virtual void WorkerProcessTerminated(content::SiteInstance* site_instance,
- int worker_process_id) {}
virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh,
const GURL& url,
content::WebPreferences* web_prefs) {}
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 9e6b95c..e947032 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -335,17 +335,6 @@ bool ChromeContentBrowserClientExtensionsPart::ShouldSwapProcessesForRedirect(
}
// static
-std::string ChromeContentBrowserClientExtensionsPart::GetWorkerProcessTitle(
- const GURL& url, content::ResourceContext* context) {
- // Check if it's an extension-created worker, in which case we want to use
- // the name of the extension.
- ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
- const Extension* extension =
- io_data->GetExtensionInfoMap()->extensions().GetByID(url.host());
- return extension ? extension->name() : std::string();
-}
-
-// static
bool ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL(
content::SiteInstance* site_instance,
const GURL& from_url,
@@ -466,33 +455,6 @@ void ChromeContentBrowserClientExtensionsPart::SiteInstanceDeleting(
site_instance->GetId()));
}
-void ChromeContentBrowserClientExtensionsPart::WorkerProcessCreated(
- SiteInstance* site_instance,
- int worker_process_id) {
- ExtensionRegistry* extension_registry =
- ExtensionRegistry::Get(site_instance->GetBrowserContext());
- if (!extension_registry)
- return;
- const Extension* extension =
- extension_registry->enabled_extensions().GetExtensionOrAppByURL(
- site_instance->GetSiteURL());
- if (!extension)
- return;
- ExtensionSystem* extension_system =
- ExtensionSystem::Get(site_instance->GetBrowserContext());
- extension_system->info_map()->RegisterExtensionWorkerProcess(
- extension->id(), worker_process_id, site_instance->GetId());
-}
-
-void ChromeContentBrowserClientExtensionsPart::WorkerProcessTerminated(
- SiteInstance* site_instance,
- int worker_process_id) {
- ExtensionSystem* extension_system =
- ExtensionSystem::Get(site_instance->GetBrowserContext());
- extension_system->info_map()->UnregisterExtensionWorkerProcess(
- worker_process_id);
-}
-
void ChromeContentBrowserClientExtensionsPart::OverrideWebkitPrefs(
RenderViewHost* rvh,
const GURL& url,
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
index 2c0a12f..2200a39 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.h
@@ -43,8 +43,6 @@ class ChromeContentBrowserClientExtensionsPart
content::ResourceContext* resource_context,
const GURL& current_url,
const GURL& new_url);
- static std::string GetWorkerProcessTitle(const GURL& url,
- content::ResourceContext* context);
// Similiar to ChromeContentBrowserClient::ShouldAllowOpenURL(), but the
// return value indicates whether to use |result| or not.
@@ -64,10 +62,6 @@ class ChromeContentBrowserClientExtensionsPart
content::SiteInstance* site_instance) OVERRIDE;
virtual void SiteInstanceDeleting(
content::SiteInstance* site_instance) OVERRIDE;
- virtual void WorkerProcessCreated(content::SiteInstance* site_instance,
- int worker_process_id) OVERRIDE;
- virtual void WorkerProcessTerminated(content::SiteInstance* site_instance,
- int worker_process_id) OVERRIDE;
virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh,
const GURL& url,
content::WebPreferences* web_prefs) OVERRIDE;
diff --git a/chrome/browser/extensions/url_request_util.cc b/chrome/browser/extensions/url_request_util.cc
index f0c2d09..3f63e6b 100644
--- a/chrome/browser/extensions/url_request_util.cc
+++ b/chrome/browser/extensions/url_request_util.cc
@@ -140,12 +140,6 @@ bool AllowCrossRendererResourceLoad(net::URLRequest* request,
const content::ResourceRequestInfo* info =
content::ResourceRequestInfo::ForRequest(request);
- // Check workers so that importScripts works from extension workers.
- if (extension_info_map->worker_process_map().Contains(request->url().host(),
- info->GetChildID())) {
- return true;
- }
-
bool is_guest = false;
// Extensions with webview: allow loading certain resources by guest renderers
generated by cgit v1.1 at 2025-02-09 07:21:25 +0000