| Index: chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
|
| diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
|
| index d211a534abe14c336f4337304198e32a775ed248..c402e8b72e1fbd973f86ce8ac0aba46f2a4999d1 100644
|
| --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
|
| +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
|
| @@ -69,8 +69,7 @@ class ExtensionUninstallDialogDelegateView : public views::DialogDelegateView {
|
| public:
|
| ExtensionUninstallDialogDelegateView(
|
| ExtensionUninstallDialogViews* dialog_view,
|
| - const extensions::Extension* extension,
|
| - const extensions::Extension* triggering_extension,
|
| + bool triggered_by_extension,
|
| gfx::ImageSkia* image);
|
| ~ExtensionUninstallDialogDelegateView() override;
|
|
|
| @@ -135,7 +134,7 @@ void ExtensionUninstallDialogViews::Show() {
|
| }
|
|
|
| view_ = new ExtensionUninstallDialogDelegateView(
|
| - this, extension_, triggering_extension_, &icon_);
|
| + this, triggering_extension_.get() != nullptr, &icon_);
|
| constrained_window::CreateBrowserModalDialogViews(view_, parent_)->Show();
|
| }
|
|
|
| @@ -162,11 +161,10 @@ void ExtensionUninstallDialogViews::ExtensionUninstallCanceled() {
|
|
|
| ExtensionUninstallDialogDelegateView::ExtensionUninstallDialogDelegateView(
|
| ExtensionUninstallDialogViews* dialog_view,
|
| - const extensions::Extension* extension,
|
| - const extensions::Extension* triggering_extension,
|
| + bool triggered_by_extension,
|
| gfx::ImageSkia* image)
|
| : dialog_(dialog_view),
|
| - triggered_by_extension_(triggering_extension != NULL),
|
| + triggered_by_extension_(triggered_by_extension),
|
| report_abuse_checkbox_(nullptr) {
|
| // Scale down to icon size, but allow smaller icons (don't scale up).
|
| gfx::Size size(image->width(), image->height());
|
|
|