Fix crashes related to the extension uninstall dialog.

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
 #pragma once
 
 #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"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/browser/cancelable_request.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 class ExtensionPrefs;
 class ExtensionService;
 class PrefChangeRegistrar;
 class PrefsService;
 class Profile;
 struct WebApplicationInfo;
 
 namespace gfx {
 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:
   explicit AppLauncherHandler(ExtensionService* extension_service);
   virtual ~AppLauncherHandler();
 
   // Whether the app should be excluded from the "apps" list because
   // it is special (such as the Web Store app).
   static bool IsAppExcludedFromList(const Extension* extension);
 
@@ skipping 87 matching lines @@
 
   // Records an app launch in the corresponding |bucket| of the app launch
   // histogram if the |escaped_url| corresponds to an installed app.
   static void RecordAppLaunchByURL(Profile* profile,
                                    std::string escaped_url,
                                    extension_misc::AppLaunchBucket bucket);
 
   // 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.
   ExtensionInstallUI* GetExtensionInstallUI();
 
   // Helper that uninstalls all the default apps.
   void UninstallDefaultApps();
 
   // Continuation for installing a bookmark app after favicon lookup.
   void OnFaviconForApp(FaviconService::Handle handle,
                        history::FaviconData data);
 
   // Sends |highlight_app_id_| to the js.
   void SetAppToBeHighlighted();
 
   // The apps are represented in the extensions model, which
   // outlives us since it's owned by our containing profile.
   ExtensionService* const extension_service_;
 
   // We monitor changes to the extension system so that we can reload the apps
   // when necessary.
   NotificationRegistrar registrar_;
 
   // Monitor extension preference changes so that the Web UI can be notified.
   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_;
 
   // The id of the extension we are prompting the user about.
   std::string extension_id_prompting_;
 
   // Whether the promo is currently being shown.
   bool promo_active_;
 
@@ skipping 13 matching lines @@
   // when the app is added to the page (via getAppsCallback or appAdded).
   std::string highlight_app_id_;
 
   // Hold state for favicon requests.
   CancelableRequestConsumerTSimple<AppInstallInfo*> favicon_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_