| 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 ef1e3bcfd86b3600d2add5f238b49094c080bbb2..d5bed37619d2d7ddc38f2f8aa34cc49e10a44350 100644
|
| --- a/chrome/browser/extensions/extension_uninstall_dialog.cc
|
| +++ b/chrome/browser/extensions/extension_uninstall_dialog.cc
|
| @@ -17,21 +17,19 @@
|
| // Size of extension icon in top left of dialog.
|
| static const int kIconSize = 69;
|
|
|
| -ExtensionUninstallDialog::ExtensionUninstallDialog(Profile* profile)
|
| +ExtensionUninstallDialog::ExtensionUninstallDialog(
|
| + Profile* profile,
|
| + ExtensionUninstallDialog::Delegate* delegate)
|
| : profile_(profile),
|
| - ui_loop_(MessageLoop::current()),
|
| - delegate_(NULL),
|
| + delegate_(delegate),
|
| extension_(NULL),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
|
| -}
|
| + ui_loop_(MessageLoop::current()),
|
| + ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {}
|
|
|
| -ExtensionUninstallDialog::~ExtensionUninstallDialog() {
|
| -}
|
| +ExtensionUninstallDialog::~ExtensionUninstallDialog() {}
|
|
|
| -void ExtensionUninstallDialog::ConfirmUninstall(Delegate* delegate,
|
| - const Extension* extension) {
|
| +void ExtensionUninstallDialog::ConfirmUninstall(const Extension* extension) {
|
| DCHECK(ui_loop_ == MessageLoop::current());
|
| - delegate_ = delegate;
|
| extension_ = extension;
|
|
|
| ExtensionResource image =
|
| @@ -64,5 +62,5 @@ void ExtensionUninstallDialog::OnImageLoaded(SkBitmap* image,
|
| int index) {
|
| SetIcon(image);
|
|
|
| - Show(profile_, delegate_, extension_, &icon_);
|
| + Show();
|
| }
|
|
|