Fix crashes related to the extension uninstall dialog.

chrome/browser/ui/webui/ntp/app_launcher_handler.h

Index: chrome/browser/ui/webui/ntp/app_launcher_handler.h
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
index ed21da9828be99cb01623a7d89a7f29fbf898241..f7e8c1518e8ff1cafd84e42650bd1eaa8c1529e3 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_app_api.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
-#include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/extension_uninstall_ui.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/extensions/extension.h"
@@ -32,7 +32,7 @@ class Rect;
 
 // The handler for Javascript messages related to the "apps" view.
 class AppLauncherHandler : public WebUIMessageHandler,
-                           public ExtensionUninstallDialog::Delegate,
+                           public ExtensionUninstallUI::Delegate,
                            public ExtensionInstallUI::Delegate,
                            public NotificationObserver {
  public:
@@ -140,17 +140,17 @@ class AppLauncherHandler : public WebUIMessageHandler,
   // Prompts the user to re-enable the app for |extension_id|.
   void PromptToEnableApp(const std::string& extension_id);
 
-  // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  // ExtensionUninstallUI::Delegate:
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
   // ExtensionInstallUI::Delegate:
   virtual void InstallUIProceed() OVERRIDE;
   virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
-  // Returns the ExtensionUninstallDialog object for this class, creating it if
+  // Returns the ExtensionUninstallUI object for this class, creating it if
   // needed.
-  ExtensionUninstallDialog* GetExtensionUninstallDialog();
+  ExtensionUninstallUI* GetExtensionUninstallUI();
 
   // Returns the ExtensionInstallUI object for this class, creating it if
   // needed.
@@ -178,7 +178,7 @@ class AppLauncherHandler : public WebUIMessageHandler,
   PrefChangeRegistrar pref_change_registrar_;
 
   // Used to show confirmation UI for uninstalling extensions in incognito mode.
-  scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
+  scoped_ptr<ExtensionUninstallUI> extension_uninstall_ui_;
 
   // Used to show confirmation UI for enabling extensions in incognito mode.
   scoped_ptr<ExtensionInstallUI> extension_install_ui_;