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

Unified Diff: chrome/browser/extensions/extension_uninstall_dialog.cc

Issue 1140053004: [Extensions] Fix crash in extension uninstall dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Index: chrome/browser/extensions/extension_uninstall_dialog.cc
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc
index 1e39567227cea2182e760d4483d381bc5b33eea1..0f9b7282e33fa9ffb958ef7aeaa067aec922f7e0 100644
--- a/chrome/browser/extensions/extension_uninstall_dialog.cc
+++ b/chrome/browser/extensions/extension_uninstall_dialog.cc
@@ -48,8 +48,6 @@ ExtensionUninstallDialog::ExtensionUninstallDialog(
ExtensionUninstallDialog::Delegate* delegate)
: profile_(profile),
delegate_(delegate),
- extension_(NULL),
- triggering_extension_(NULL),
ui_loop_(base::MessageLoop::current()) {
}
@@ -71,7 +69,7 @@ void ExtensionUninstallDialog::ConfirmUninstall(const Extension* extension) {
? extension_misc::EXTENSION_ICON_SMALL * 2
: extension_misc::EXTENSION_ICON_LARGE;
ExtensionResource image = IconsInfo::GetIconResource(
- extension_, icon_size, ExtensionIconSet::MATCH_BIGGER);
+ extension_.get(), icon_size, ExtensionIconSet::MATCH_BIGGER);
// Load the image asynchronously. The response will be sent to OnImageLoaded.
ImageLoader* loader = ImageLoader::Get(profile_);
@@ -83,7 +81,7 @@ void ExtensionUninstallDialog::ConfirmUninstall(const Extension* extension) {
ImageLoader::ImageRepresentation::NEVER_RESIZE,
gfx::Size(),
ui::SCALE_FACTOR_100P));
- loader->LoadImagesAsync(extension_,
+ loader->LoadImagesAsync(extension_.get(),
images_list,
base::Bind(&ExtensionUninstallDialog::OnImageLoaded,
AsWeakPtr(),
@@ -130,7 +128,7 @@ std::string ExtensionUninstallDialog::GetHeadingText() {
}
bool ExtensionUninstallDialog::ShouldShowReportAbuseCheckbox() const {
- return ManifestURL::UpdatesFromGallery(extension_);
+ return ManifestURL::UpdatesFromGallery(extension_.get());
}
void ExtensionUninstallDialog::OnDialogClosed(CloseAction action) {

Powered by Google App Engine
This is Rietveld 408576698