Fix crashes related to the extension uninstall dialog.

chrome/browser/extensions/extensions_ui.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_EXTENSIONS_EXTENSIONS_UI_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSIONS_UI_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/extension_uninstall_ui.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.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;
@@ skipping 19 matching lines @@
   int render_process_id;
   int render_view_id;
   bool incognito;
 };
 
 // The handler for JavaScript messages related to the "extensions" view.
 class ExtensionsDOMHandler : public WebUIMessageHandler,
                              public NotificationObserver,
                              public PackExtensionJob::Client,
                              public SelectFileDialog::Listener,
-                             public ExtensionUninstallDialog::Delegate {
+                             public ExtensionUninstallUI::Delegate {
  public:
   explicit ExtensionsDOMHandler(ExtensionService* extension_service);
   virtual ~ExtensionsDOMHandler();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
   // 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,
       bool enabled,
       bool terminated);
 
   // ExtensionPackJob::Client
   virtual void OnPackSuccess(const FilePath& crx_file,
                              const FilePath& key_file) OVERRIDE;
 
   virtual void OnPackFailure(const std::string& error) OVERRIDE;
 
   // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionDialogAccepted() OVERRIDE;
-  virtual void ExtensionDialogCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() OVERRIDE;
+  virtual void ExtensionUninstallCanceled() OVERRIDE;
 
  private:
   // Callback for "requestExtensionsData" message.
   void HandleRequestExtensionsData(const base::ListValue* args);
 
   // Callback for "toggleDeveloperMode" message.
   void HandleToggleDeveloperMode(const base::ListValue* args);
 
   // Callback for "inspect" message.
   void HandleInspectMessage(const base::ListValue* args);
@@ skipping 56 matching lines @@
                        const NotificationDetails& details) OVERRIDE;
 
   // 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* const extension_service_;
 
   // Used to pick the directory when loading an extension.
   scoped_refptr<SelectFileDialog> load_extension_dialog_;
 
   // Used to package the extension.
   scoped_refptr<PackExtensionJob> pack_job_;
 
   // 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_;
 
   // We monitor changes to the extension system so that we can reload when
   // necessary.
   NotificationRegistrar registrar_;
 
   // If true, we will ignore notifications in ::Observe(). This is needed
   // to prevent reloading the page when we were the cause of the
@@ skipping 16 matching lines @@
 
   static RefCountedMemory* GetFaviconResourceBytes();
 
   static void RegisterUserPrefs(PrefService* prefs);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionsUI);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSIONS_UI_H_