Fix crashes related to the extension uninstall dialog.

chrome/browser/ui/webui/options/extension_settings_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_OPTIONS_EXTENSION_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_EXTENSION_SETTINGS_HANDLER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #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/ui/shell_dialogs.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/chrome_web_ui.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 class Extension;
 class ExtensionService;
@@ skipping 18 matching lines @@
       incognito(incognito) {}
   GURL url;
   int render_process_id;
   int render_view_id;
   bool incognito;
 };
 
 // Extension Settings UI handler.
 class ExtensionSettingsHandler : public OptionsPageUIHandler,
                                  public SelectFileDialog::Listener,
-                                 public ExtensionUninstallDialog::Delegate {
+                                 public ExtensionUninstallUI::Delegate {
  public:
   ExtensionSettingsHandler();
   virtual ~ExtensionSettingsHandler();
 
   // Extension Detail JSON Struct for page. (static for ease of testing).
   // Note: service can be NULL in unit tests.
   static base::DictionaryValue* CreateExtensionDetailValue(
       ExtensionService* service,
       const Extension* extension,
       const std::vector<ExtensionPage>& pages,
@@ skipping 73 matching lines @@
   // OptionsUIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void Initialize() OVERRIDE;
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
-  // ExtensionUninstallDialog::Delegate implementation, used for receiving
+  // ExtensionUninstallUI::Delegate implementation, used for receiving
   // notification about uninstall confirmation dialog selections.
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   // Helper that lists the current active html pages for an extension.
   std::vector<ExtensionPage> GetActivePagesForExtension(
       const Extension* extension);
   void GetActivePagesForExtensionProcess(
       RenderProcessHost* process,
       const Extension* extension,
       std::vector<ExtensionPage> *result);
 
-  // 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();
 
   // Our model.  Outlives us since it's owned by our containing profile.
   ExtensionService* extension_service_;
 
   // Used to pick the directory when loading an extension.
   scoped_refptr<SelectFileDialog> load_extension_dialog_;
 
   // Used to show confirmation UI for uninstalling extensions in incognito mode.
-  scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
+  scoped_ptr<ExtensionUninstallUI> extension_uninstall_ui_;
 
   // The id of the extension we are prompting the user about.
   std::string extension_id_prompting_;
 
   // If true, we will ignore notifications in ::Observe(). This is needed
   // to prevent reloading the page when we were the cause of the
   // notification.
   bool ignore_notifications_;
 
   // The page may be refreshed in response to a RENDER_VIEW_HOST_DELETED,
   // but the iteration over RenderViewHosts will include the host because the
   // notification is sent when it is in the process of being deleted (and before
   // it is removed from the process). Keep a pointer to it so we can exclude
   // it from the active views.
   RenderViewHost* deleting_rvh_;
 
   // We want to register for notifications only after we've responded at least
   // once to the page, otherwise we'd be calling javacsript functions on objects
   // that don't exist yet when notifications come in. This variable makes sure
   // we do so only once.
   bool registered_for_notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_EXTENSION_SETTINGS_HANDLER_H_