Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5014)

Unified Diff: chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc

Issue 263393002: Remove NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED from c/b/e/api (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
index a7da638f9bec07262252b2345fcf6c1bc1603dd5..30c0ede9cfbb70b59e76a5c6baf3a5c1850d4fdb 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
@@ -12,7 +12,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/values.h"
-#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -20,12 +19,8 @@
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/common/extensions/api/signed_in_devices.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
#include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension.h"
using browser_sync::DeviceInfo;
@@ -102,10 +97,12 @@ SignedInDevicesManager::GetFactoryInstance() {
}
SignedInDevicesManager::SignedInDevicesManager()
- : profile_(NULL) {}
+ : profile_(NULL), extension_registry_observer_(this) {
+}
SignedInDevicesManager::SignedInDevicesManager(content::BrowserContext* context)
- : profile_(Profile::FromBrowserContext(context)) {
+ : profile_(Profile::FromBrowserContext(context)),
+ extension_registry_observer_(this) {
extensions::EventRouter* router = extensions::EventRouter::Get(profile_);
if (router) {
router->RegisterObserver(
@@ -114,8 +111,7 @@ SignedInDevicesManager::SignedInDevicesManager(content::BrowserContext* context)
// Register for unload event so we could clear all our listeners when
// extensions have unloaded.
- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
- content::Source<Profile>(profile_->GetOriginalProfile()));
+ extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
}
SignedInDevicesManager::~SignedInDevicesManager() {}
@@ -142,7 +138,6 @@ void SignedInDevicesManager::OnListenerRemoved(
RemoveChangeObserverForExtension(details.extension_id);
}
-
void SignedInDevicesManager::RemoveChangeObserverForExtension(
const std::string& extension_id) {
for (ScopedVector<SignedInDevicesChangeObserver>::iterator it =
@@ -156,14 +151,11 @@ void SignedInDevicesManager::RemoveChangeObserverForExtension(
}
}
-void SignedInDevicesManager::Observe(
- int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
- DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED);
- UnloadedExtensionInfo* reason =
- content::Details<UnloadedExtensionInfo>(details).ptr();
- RemoveChangeObserverForExtension(reason->extension->id());
+void SignedInDevicesManager::OnExtensionUnloaded(
+ content::BrowserContext* browser_context,
+ const Extension* extension,
+ UnloadedExtensionInfo::Reason reason) {
+ RemoveChangeObserverForExtension(extension->id());
}
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698