extensions: Refactor ExtensionInstallUI class.

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/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"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 class DictionaryValue;
@@ skipping 29 matching lines @@
                                 int request_id);
   virtual std::string GetMimeType(const std::string&) const;
 
  private:
   ~ExtensionsUIHTMLSource() {}
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsUIHTMLSource);
 };
 
 // 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();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages();
 
   // Extension Detail JSON Struct for page. (static for ease of testing).
   // Note: service can be NULL in unit tests.
   static DictionaryValue* CreateExtensionDetailValue(
       ExtensionService* service,
       const Extension* extension,
       const std::vector<ExtensionPage>& pages,
       bool enabled,
       bool terminated);
 
   // ContentScript JSON Struct for page. (static for ease of testing).
   static DictionaryValue* CreateContentScriptDetailValue(
       const UserScript& script,
       const FilePath& extension_path);
 
   // ExtensionPackJob::Client
   virtual void OnPackSuccess(const FilePath& crx_file,
                              const FilePath& key_file);
 
   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.
   void HandleRequestExtensionsData(const ListValue* args);
 
   // Callback for "toggleDeveloperMode" message.
   void HandleToggleDeveloperMode(const ListValue* args);
 
   // Callback for "inspect" message.
   void HandleInspectMessage(const ListValue* args);
@@ skipping 56 matching lines @@
                        const NotificationDetails& details);
 
   // 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 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_;
 
   // 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/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_;
 
   // 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_