diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 03:53:00 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 03:53:00 +0000 |
commit | 917defe16badc44a0d24348739a1657d6c13aca5 (patch) | |
tree | 4aecf9a612aff48274a8df392ff037015c0ff3e9 /chrome/browser/extensions/extension_process_manager.cc | |
parent | cf9a246cf386c7af0fb6524ac5d025c0d4e8563a (diff) | |
download | chromium_src-917defe16badc44a0d24348739a1657d6c13aca5.zip chromium_src-917defe16badc44a0d24348739a1657d6c13aca5.tar.gz chromium_src-917defe16badc44a0d24348739a1657d6c13aca5.tar.bz2 |
Reverting 20714.
Rietveld showed all green try bots, but looks like one ui test is failing
Review URL: http://codereview.chromium.org/149668
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_process_manager.cc')
-rw-r--r-- | chrome/browser/extensions/extension_process_manager.cc | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 3018ea8..4c2047b 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -9,11 +9,9 @@ #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" -#include "chrome/common/render_messages.h" static void CreateBackgroundHosts( ExtensionProcessManager* manager, const ExtensionList* extensions) { @@ -35,10 +33,6 @@ ExtensionProcessManager::ExtensionProcessManager(Profile* profile) NotificationService::AllSources()); registrar_.Add(this, NotificationType::EXTENSION_HOST_DESTROYED, Source<Profile>(profile)); - registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED, - NotificationService::AllSources()); - registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED, - NotificationService::AllSources()); } ExtensionProcessManager::~ExtensionProcessManager() { @@ -84,39 +78,6 @@ ExtensionHost* ExtensionProcessManager::CreateBackgroundHost( return host; } -void ExtensionProcessManager::RegisterExtensionProcess( - std::string extension_id, int process_id) { - ProcessIDMap::const_iterator it = process_ids_.find(extension_id); - if (it != process_ids_.end() && (*it).second == process_id) - return; - - process_ids_[extension_id] = process_id; - - ExtensionsService* extension_service = - browsing_instance_->profile()->GetExtensionsService(); - - std::vector<std::string> page_action_ids; - Extension* extension = extension_service->GetExtensionById(extension_id); - for (PageActionMap::const_iterator i = extension->page_actions().begin(); - i != extension->page_actions().end(); ++i) { - page_action_ids.push_back(i->first); - } - - RenderProcessHost* rph = RenderProcessHost::FromID(process_id); - rph->Send(new ViewMsg_Extension_UpdatePageActions(extension_id, - page_action_ids)); -} - -void ExtensionProcessManager::UnregisterExtensionProcess(int process_id) { - ProcessIDMap::iterator it = process_ids_.begin(); - while (it != process_ids_.end()) { - if (it->second == process_id) - process_ids_.erase(it++); - else - ++it; - } -} - SiteInstance* ExtensionProcessManager::GetSiteInstanceForURL(const GURL& url) { return browsing_instance_->GetSiteInstanceForURL(url); } @@ -161,13 +122,6 @@ void ExtensionProcessManager::Observe(NotificationType type, break; } - case NotificationType::RENDERER_PROCESS_TERMINATED: - case NotificationType::RENDERER_PROCESS_CLOSED: { - RenderProcessHost* host = Source<RenderProcessHost>(source).ptr(); - UnregisterExtensionProcess(host->pid()); - break; - } - default: NOTREACHED(); } |