diff options
Diffstat (limited to 'chrome/browser/extensions')
14 files changed, 37 insertions, 15 deletions
diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc index 87b3ce2..51ea1f2 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.cc +++ b/chrome/browser/extensions/active_tab_permission_granter.cc @@ -94,7 +94,9 @@ void ActiveTabPermissionGranter::WebContentsDestroyed( } void ActiveTabPermissionGranter::OnExtensionUnloaded( - content::BrowserContext* browser_context, const Extension* extension) { + content::BrowserContext* browser_context, + const Extension* extension, + UnloadedExtensionInfo::Reason reason) { // Note: don't need to clear the permissions (nor tell the renderer about it) // because it's being unloaded anyway. granted_extensions_.Remove(extension->id()); diff --git a/chrome/browser/extensions/active_tab_permission_granter.h b/chrome/browser/extensions/active_tab_permission_granter.h index 24bb4ad..be02bd08 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.h +++ b/chrome/browser/extensions/active_tab_permission_granter.h @@ -50,7 +50,9 @@ class ActiveTabPermissionGranter // extensions::ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension, + UnloadedExtensionInfo::Reason reason) + OVERRIDE; // Clears any tab-specific permissions for all extensions on |tab_id_| and // notifies renderers. diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc index 3629f38..6b11c14 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc @@ -208,7 +208,8 @@ void GalleryWatchStateTracker::OnExtensionLoaded( void GalleryWatchStateTracker::OnExtensionUnloaded( content::BrowserContext* browser_context, - const Extension* extension) { + const Extension* extension, + UnloadedExtensionInfo::Reason reason) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); if (!ContainsKey(watched_extensions_map_, extension->id())) return; diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h index 985f63c..53e082b 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h @@ -93,7 +93,9 @@ class GalleryWatchStateTracker virtual void OnExtensionLoaded(content::BrowserContext* browser_context, const Extension* extension) OVERRIDE; virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension, + UnloadedExtensionInfo::Reason reason) + OVERRIDE; // Syncs media gallery watch data for the given extension to/from the state // storage. diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc index c689ad4..bdfc201 100644 --- a/chrome/browser/extensions/error_console/error_console.cc +++ b/chrome/browser/extensions/error_console/error_console.cc @@ -226,7 +226,8 @@ void ErrorConsole::OnPrefChanged() { } void ErrorConsole::OnExtensionUnloaded(content::BrowserContext* browser_context, - const Extension* extension) { + const Extension* extension, + UnloadedExtensionInfo::Reason reason) { CheckEnabled(); } diff --git a/chrome/browser/extensions/error_console/error_console.h b/chrome/browser/extensions/error_console/error_console.h index dacea85..3176ce9 100644 --- a/chrome/browser/extensions/error_console/error_console.h +++ b/chrome/browser/extensions/error_console/error_console.h @@ -131,7 +131,9 @@ class ErrorConsole : public content::NotificationObserver, // ExtensionRegistry implementation. If the Apps Developer Tools app is // installed or uninstalled, we may need to turn the ErrorConsole on/off. virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension, + UnloadedExtensionInfo::Reason reason) + OVERRIDE; virtual void OnExtensionLoaded(content::BrowserContext* browser_context, const Extension* extension) OVERRIDE; diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc index 2b4e43d..dcfa60b 100644 --- a/chrome/browser/extensions/error_console/error_console_unittest.cc +++ b/chrome/browser/extensions/error_console/error_console_unittest.cc @@ -118,7 +118,7 @@ TEST_F(ErrorConsoleUnitTest, EnableAndDisableErrorConsole) { // Unloading the Apps Developer Tools should disable error console. registry->RemoveEnabled(adt->id()); - registry->TriggerOnUnloaded(adt); + registry->TriggerOnUnloaded(adt, UnloadedExtensionInfo::REASON_DISABLE); EXPECT_FALSE(error_console_->enabled()); EXPECT_FALSE(error_console_->IsEnabledForChromeExtensionsPage()); EXPECT_FALSE(error_console_->IsEnabledForAppsDeveloperTools()); diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc index 781fd03..98e2466 100644 --- a/chrome/browser/extensions/extension_action_manager.cc +++ b/chrome/browser/extensions/extension_action_manager.cc @@ -82,7 +82,9 @@ ExtensionActionManager* ExtensionActionManager::Get(Profile* profile) { } void ExtensionActionManager::OnExtensionUnloaded( - content::BrowserContext* browser_context, const Extension* extension) { + content::BrowserContext* browser_context, + const Extension* extension, + UnloadedExtensionInfo::Reason reason) { page_actions_.erase(extension->id()); browser_actions_.erase(extension->id()); system_indicators_.erase(extension->id()); diff --git a/chrome/browser/extensions/extension_action_manager.h b/chrome/browser/extensions/extension_action_manager.h index d8f5b91..3315bdc 100644 --- a/chrome/browser/extensions/extension_action_manager.h +++ b/chrome/browser/extensions/extension_action_manager.h @@ -45,7 +45,9 @@ class ExtensionActionManager : public KeyedService, private: // Implement ExtensionRegistryObserver. virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension, + UnloadedExtensionInfo::Reason reason) + OVERRIDE; Profile* profile_; diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 5ab5f6f..9a05d90 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -1067,9 +1067,10 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) { void ExtensionService::NotifyExtensionUnloaded( const Extension* extension, UnloadedExtensionInfo::Reason reason) { - registry_->TriggerOnUnloaded(extension); - UnloadedExtensionInfo details(extension, reason); + + registry_->TriggerOnUnloaded(extension, reason); + content::NotificationService::current()->Notify( chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED, content::Source<Profile>(profile_), diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc index a5ddf47..ae42ee6 100644 --- a/chrome/browser/extensions/extension_storage_monitor.cc +++ b/chrome/browser/extensions/extension_storage_monitor.cc @@ -223,7 +223,8 @@ void ExtensionStorageMonitor::OnExtensionLoaded( void ExtensionStorageMonitor::OnExtensionUnloaded( content::BrowserContext* browser_context, - const Extension* extension) { + const Extension* extension, + UnloadedExtensionInfo::Reason reason) { DCHECK(extension); StopMonitoringStorage(extension->id()); } diff --git a/chrome/browser/extensions/extension_storage_monitor.h b/chrome/browser/extensions/extension_storage_monitor.h index 42cb8ed..245f6ed 100644 --- a/chrome/browser/extensions/extension_storage_monitor.h +++ b/chrome/browser/extensions/extension_storage_monitor.h @@ -54,7 +54,9 @@ class ExtensionStorageMonitor : public KeyedService, virtual void OnExtensionLoaded(content::BrowserContext* browser_context, const Extension* extension) OVERRIDE; virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension, + UnloadedExtensionInfo::Reason reason) + OVERRIDE; std::string GetNotificationId(const std::string& extension_id); diff --git a/chrome/browser/extensions/extension_warning_service.cc b/chrome/browser/extensions/extension_warning_service.cc index 17284e5..bfb9977 100644 --- a/chrome/browser/extensions/extension_warning_service.cc +++ b/chrome/browser/extensions/extension_warning_service.cc @@ -122,7 +122,9 @@ void ExtensionWarningService::NotifyWarningsChanged() { } void ExtensionWarningService::OnExtensionUnloaded( - content::BrowserContext* browser_context, const Extension* extension) { + content::BrowserContext* browser_context, + const Extension* extension, + UnloadedExtensionInfo::Reason reason) { // Unloading one extension might have solved the problems of others. // Therefore, we clear warnings of this type for all extensions. std::set<ExtensionWarning::WarningType> warning_types = diff --git a/chrome/browser/extensions/extension_warning_service.h b/chrome/browser/extensions/extension_warning_service.h index 99755ef..5a6ecf7 100644 --- a/chrome/browser/extensions/extension_warning_service.h +++ b/chrome/browser/extensions/extension_warning_service.h @@ -75,7 +75,9 @@ class ExtensionWarningService : public ExtensionRegistryObserver, // ExtensionRegistryObserver implementation. virtual void OnExtensionUnloaded(content::BrowserContext* browser_context, - const Extension* extension) OVERRIDE; + const Extension* extension, + UnloadedExtensionInfo::Reason reason) + OVERRIDE; // Currently existing warnings. ExtensionWarningSet warnings_; |