summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-16 01:14:57 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-16 01:14:57 +0000
commit4c4fa0299be73c03988278d486dd4d19bd14167e (patch)
treea0bd4e2dc2ea75dc2f0f18b03fde4e45701f7b30
parent5d3e8364d020f1ff890c58edc5b97aa4fcd78865 (diff)
downloadchromium_src-4c4fa0299be73c03988278d486dd4d19bd14167e.zip
chromium_src-4c4fa0299be73c03988278d486dd4d19bd14167e.tar.gz
chromium_src-4c4fa0299be73c03988278d486dd4d19bd14167e.tar.bz2
Remove extension disabled infobar when extension is unloaded for any reason.
Not doing so could leave the infobar around even after the extension has been deleted, which is bad. BUG=105319 TEST=Follow steps in bug, comment 2; do not see a crash. Review URL: http://codereview.chromium.org/8966007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114735 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_disabled_infobar_delegate.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
index 1c851cd..96f45ff 100644
--- a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
+++ b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
@@ -163,9 +163,7 @@ void ExtensionDisabledInfobarDelegate::Observe(
DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_UNLOADED, type);
UnloadedExtensionInfo* info =
content::Details<UnloadedExtensionInfo>(details).ptr();
- if (info->reason == extension_misc::UNLOAD_REASON_DISABLE ||
- info->reason == extension_misc::UNLOAD_REASON_UNINSTALL)
- extension = info->extension;
+ extension = info->extension;
}
if (extension == extension_)
RemoveSelf();