summaryrefslogtreecommitdiffstats
path: root/extensions/browser/process_manager.h
diff options
context:
space:
mode:
authorakuegel@chromium.org <akuegel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-05 13:29:30 +0000
committerakuegel@chromium.org <akuegel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-05 13:29:30 +0000
commit62d22ec9c7c5171e8c6d2de4899f2703118d6b28 (patch)
tree0c19c973b880fdae1ea4e8e033fb0ab8700f66b3 /extensions/browser/process_manager.h
parentbaa2b4d423792fac06656a0f39fb343500f68f41 (diff)
downloadchromium_src-62d22ec9c7c5171e8c6d2de4899f2703118d6b28.zip
chromium_src-62d22ec9c7c5171e8c6d2de4899f2703118d6b28.tar.gz
chromium_src-62d22ec9c7c5171e8c6d2de4899f2703118d6b28.tar.bz2
Revert of Resubmit: Remove deprecated extension notifications from ProcessManager (https://codereview.chromium.org/434593002/)
Reason for revert: Speculative revert, see http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Tests%20%282%29/builds/5773/steps/unit_tests/logs/GetHostZoomMap The stack trace mentions extensions::ExtensionRegistry::RemoveObserver Original issue's description: > Remove deprecated extension notifications from ProcessManager and use ExtensionRegistry instead. > > ProcessManagerTest inherts ExtensionsTest for the test settings. So now unit test is passed. > > R=rdevlin.cronin@chromium.org > BUG=354046 > TEST=extensions_unittests > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287521 TBR=rdevlin.cronin@chromium.org,limasdf@gmail.com NOTREECHECKS=true NOTRY=true BUG=354046 Review URL: https://codereview.chromium.org/443623002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/process_manager.h')
-rw-r--r--extensions/browser/process_manager.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/extensions/browser/process_manager.h b/extensions/browser/process_manager.h
index c37a1d9..a5422bc7 100644
--- a/extensions/browser/process_manager.h
+++ b/extensions/browser/process_manager.h
@@ -14,11 +14,9 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
-#include "base/scoped_observer.h"
#include "base/time/time.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
-#include "extensions/browser/extension_registry_observer.h"
#include "extensions/common/view_type.h"
class GURL;
@@ -42,8 +40,7 @@ class ProcessManagerObserver;
// Manages dynamic state of running Chromium extensions. There is one instance
// of this class per Profile. OTR Profiles have a separate instance that keeps
// track of split-mode extensions only.
-class ProcessManager : public content::NotificationObserver,
- public ExtensionRegistryObserver {
+class ProcessManager : public content::NotificationObserver {
public:
typedef std::set<extensions::ExtensionHost*> ExtensionHostSet;
typedef ExtensionHostSet::const_iterator const_iterator;
@@ -176,14 +173,6 @@ class ProcessManager : public content::NotificationObserver,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // ExtensionRegistryObserver:
- virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
- const Extension* extension) OVERRIDE;
- virtual void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const Extension* extension,
- UnloadedExtensionInfo::Reason reason) OVERRIDE;
-
content::NotificationRegistrar registrar_;
// The set of ExtensionHosts running viewless background extensions.
@@ -290,9 +279,6 @@ class ProcessManager : public content::NotificationObserver,
// Must be last member, see doc on WeakPtrFactory.
base::WeakPtrFactory<ProcessManager> weak_ptr_factory_;
- ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
- extension_registry_observer_;
-
DISALLOW_COPY_AND_ASSIGN(ProcessManager);
};