Fix crashes related to the extension uninstall dialog.

chrome/browser/ui/panels/panel_settings_menu_model.h

Index: chrome/browser/ui/panels/panel_settings_menu_model.h
diff --git a/chrome/browser/ui/panels/panel_settings_menu_model.h b/chrome/browser/ui/panels/panel_settings_menu_model.h
index 1e344bc47b541716bab59b84a864b0418b161761..f8744129b7dfb00ad6ea0dfc694154881f80ce9d 100644
--- a/chrome/browser/ui/panels/panel_settings_menu_model.h
+++ b/chrome/browser/ui/panels/panel_settings_menu_model.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_PANELS_PANEL_SETTINGS_MENU_MODEL_H_
 #pragma once
 
-#include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/extension_uninstall_ui.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class Extension;
@@ -14,7 +14,7 @@ class Panel;
 
 class PanelSettingsMenuModel : public ui::SimpleMenuModel,
                                public ui::SimpleMenuModel::Delegate,
-                               public ExtensionUninstallDialog::Delegate {
+                               public ExtensionUninstallUI::Delegate {
  public:
   explicit PanelSettingsMenuModel(Panel* panel);
   virtual ~PanelSettingsMenuModel();
@@ -27,9 +27,9 @@ class PanelSettingsMenuModel : public ui::SimpleMenuModel,
       int command_id, ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
-  // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  // ExtensionUninstallUI::Delegate:
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   friend class PanelBrowserTest;
@@ -43,7 +43,7 @@ class PanelSettingsMenuModel : public ui::SimpleMenuModel,
   };
 
   Panel* panel_;
-  scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
+  scoped_ptr<ExtensionUninstallUI> extension_uninstall_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelSettingsMenuModel);
 };