From a5b04d1c6d10a3a6a1a246342761e55382da711b Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Wed, 20 May 2009 21:19:57 +0000 Subject: TBR: Revert "Hook up more of extension uninstall." This reverts commit 5b2fc12fbca26b20ed4176ac740c58fe49360c4a. Review URL: http://codereview.chromium.org/113664 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16538 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/plugin_service.cc | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'chrome/browser/plugin_service.cc') diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index a5c81b2..eb8ec2a 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -12,15 +12,11 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_plugin_host.h" #include "chrome/browser/chrome_thread.h" -#include "chrome/browser/extensions/extension.h" -#include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/plugin_process_host.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/notification_type.h" -#include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/plugin_list.h" @@ -57,13 +53,6 @@ PluginService::PluginService() hklm_watcher_.StartWatching(hklm_event_.get(), this); } #endif - - NotificationService::current()->AddObserver( - this, NotificationType::EXTENSIONS_LOADED, - NotificationService::AllSources()); - NotificationService::current()->AddObserver( - this, NotificationType::EXTENSION_UNLOADED, - NotificationService::AllSources()); } PluginService::~PluginService() { @@ -225,32 +214,3 @@ void PluginService::OnWaitableEventSignaled(base::WaitableEvent* waitable_event) } #endif } - -void PluginService::Observe(NotificationType type, - const NotificationSource& source, - const NotificationDetails& details) { - switch (type.value) { - case NotificationType::EXTENSIONS_LOADED: { - // TODO(mpcomplete): We also need to force a renderer to refresh its - // cache of the plugin list when we inject user scripts, since it could - // have a stale version by the time extensions are loaded. - // See: http://code.google.com/p/chromium/issues/detail?id=12306 - ExtensionList* extensions = Details(details).ptr(); - for (ExtensionList::iterator extension = extensions->begin(); - extension != extensions->end(); ++extension) - if (!(*extension)->plugins_dir().empty()) - AddExtraPluginDir((*extension)->plugins_dir()); - break; - } - - case NotificationType::EXTENSION_UNLOADED: { - // TODO(aa): Implement this. Also, will it be possible to delete the - // extension folder if this isn't unloaded? - // See: http://code.google.com/p/chromium/issues/detail?id=12306 - break; - } - - default: - DCHECK(false); - } -} -- cgit v1.1