extensions: Refactor ExtensionInstallUI class.

chrome/browser/extensions/extensions_ui.h

Index: chrome/browser/extensions/extensions_ui.h
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index 37a9d581e14b9a77f310cc5c281ed2ad87739c65..5df781c3b9e1335473cb6f8c4ae165de30cef402 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -11,6 +11,7 @@
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_install_ui.h"

[Aaron Boodman, 2011/03/23 21:06:54]

Is this header still needed?

+#include "chrome/browser/extensions/extension_generic_dialog.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"
@@ -60,14 +61,12 @@ class ExtensionsUIHTMLSource : public ChromeURLDataManager::DataSource {
 };
 
 // The handler for JavaScript messages related to the "extensions" view.
-class ExtensionsDOMHandler
-    : public WebUIMessageHandler,
-      public NotificationObserver,
-      public PackExtensionJob::Client,
-      public SelectFileDialog::Listener,
-      public ExtensionInstallUI::Delegate {
+class ExtensionsDOMHandler : public WebUIMessageHandler,
+                             public NotificationObserver,
+                             public PackExtensionJob::Client,
+                             public SelectFileDialog::Listener,
+                             public ExtensionGenericDialog::Delegate {
  public:
-
   explicit ExtensionsDOMHandler(ExtensionService* extension_service);
   virtual ~ExtensionsDOMHandler();
 
@@ -94,10 +93,9 @@ class ExtensionsDOMHandler
 
   virtual void OnPackFailure(const std::string& error);
 
-  // ExtensionInstallUI::Delegate implementation, used for receiving
-  // notification about uninstall confirmation dialog selections.
-  virtual void InstallUIProceed();
-  virtual void InstallUIAbort();
+  // ExtensionGenericDialog::Delegate:
+  virtual void ExtensionDialogAccepted();
+  virtual void ExtensionDialogCanceled();
 
  private:
   // Callback for "requestExtensionsData" message.
@@ -174,9 +172,9 @@ class ExtensionsDOMHandler
       const Extension* extension,
       std::vector<ExtensionPage> *result);
 
-  // Returns the ExtensionInstallUI object for this class, creating it if
+  // Returns the ExtensionGenericDialog object for this class, creating it if
   // needed.
-  ExtensionInstallUI* GetExtensionInstallUI();
+  ExtensionGenericDialog* GetExtensionGenericDialog();
 
   // Our model.
   scoped_refptr<ExtensionService> extensions_service_;
@@ -189,7 +187,7 @@ class ExtensionsDOMHandler
 
   // Used to show confirmation UI for uninstalling/enabling extensions in
   // incognito mode.
-  scoped_ptr<ExtensionInstallUI> install_ui_;
+  scoped_ptr<ExtensionGenericDialog> extension_generic_dialog_;
 
   // The id of the extension we are prompting the user about.
   std::string extension_id_prompting_;