summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/browser.cc8
-rw-r--r--chrome/browser/ui/views/extensions/extension_installed_bubble.cc3
2 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 44c28b6d..9d0353c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -213,8 +213,6 @@ Browser::Browser(Type type, Profile* profile)
NotificationService::AllSources());
registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
NotificationService::AllSources());
- registrar_.Add(this, NotificationType::EXTENSION_UNLOADED_DISABLED,
- NotificationService::AllSources());
registrar_.Add(this, NotificationType::EXTENSION_PROCESS_TERMINATED,
NotificationService::AllSources());
registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
@@ -3212,12 +3210,12 @@ void Browser::Observe(NotificationType type,
break;
}
- case NotificationType::EXTENSION_UNLOADED:
- case NotificationType::EXTENSION_UNLOADED_DISABLED: {
+ case NotificationType::EXTENSION_UNLOADED: {
window()->GetLocationBar()->UpdatePageActions();
// Close any tabs from the unloaded extension.
- const Extension* extension = Details<const Extension>(details).ptr();
+ const Extension* extension =
+ Details<UnloadedExtensionInfo>(details)->extension;
TabStripModel* model = tab_handler_->GetTabStripModel();
for (int i = model->count() - 1; i >= 0; --i) {
TabContents* tc = model->GetTabContentsAt(i)->tab_contents();
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index bbac784..1b549d3 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -268,7 +268,8 @@ void ExtensionInstalledBubble::Observe(NotificationType type,
&ExtensionInstalledBubble::ShowInternal));
}
} else if (type == NotificationType::EXTENSION_UNLOADED) {
- const Extension* extension = Details<const Extension>(details).ptr();
+ const Extension* extension =
+ Details<UnloadedExtensionInfo>(details)->extension;
if (extension == extension_)
extension_ = NULL;
} else {