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..9ae3362855a134415ddb72d376fb4805160cf8e3 100644 |
--- a/chrome/browser/extensions/extension_uninstall_dialog.cc |
+++ b/chrome/browser/extensions/extension_uninstall_dialog.cc |
@@ -48,8 +48,8 @@ ExtensionUninstallDialog::ExtensionUninstallDialog( |
ExtensionUninstallDialog::Delegate* delegate) |
: profile_(profile), |
delegate_(delegate), |
- extension_(NULL), |
- triggering_extension_(NULL), |
+ extension_(nullptr), |
+ triggering_extension_(nullptr), |
not at google - send to devlin
2015/05/15 16:09:38
not necessary to initialise these anymore really
Devlin
2015/05/15 16:14:21
Could point.
|
ui_loop_(base::MessageLoop::current()) { |
} |
@@ -71,7 +71,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 +83,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 +130,7 @@ std::string ExtensionUninstallDialog::GetHeadingText() { |
} |
bool ExtensionUninstallDialog::ShouldShowReportAbuseCheckbox() const { |
- return ManifestURL::UpdatesFromGallery(extension_); |
+ return ManifestURL::UpdatesFromGallery(extension_.get()); |
} |
void ExtensionUninstallDialog::OnDialogClosed(CloseAction action) { |