diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 23:09:25 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-16 23:09:25 +0000 |
| commit | dc5d811af9b60fdf23be5e70627382e186acf7c0 (patch) | |
| tree | 080c44a73eaa56d497b35a782161fea4e81792ed | |
| parent | 0ba669b87471c7faab9c4470b3b46db72075b2ea (diff) | |
| download | chromium_src-dc5d811af9b60fdf23be5e70627382e186acf7c0.zip chromium_src-dc5d811af9b60fdf23be5e70627382e186acf7c0.tar.gz chromium_src-dc5d811af9b60fdf23be5e70627382e186acf7c0.tar.bz2 | |
Merge 114735 - 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
TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8981004
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@114873 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_disabled_infobar_delegate.cc | 4 |
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(); |