Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4256)

Unified Diff: chrome/browser/ui/webui/options/extension_settings_handler.h

Issue 6721013: extensions: Refactor ExtensionInstallUI class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove the file Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/extension_settings_handler.h
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.h b/chrome/browser/ui/webui/options/extension_settings_handler.h
index 1ef59ce81c09f03824b96d516560327f901e28ba..6cce3d186f72c02d5ef1384bfbb2510e1aaf735e 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.h
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.h
@@ -11,6 +11,7 @@
#include "base/scoped_ptr.h"
#include "chrome/browser/extensions/extension_install_ui.h"
+#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,12 +61,11 @@ 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:
// Helper class that loads the icons for the extensions in the management UI.
@@ -128,10 +128,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.
@@ -219,9 +218,9 @@ class ExtensionsDOMHandler
// Called on the UI thread.
void OnIconsLoaded(DictionaryValue* json_data);
- // 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_;
@@ -237,7 +236,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_;

Powered by Google App Engine
This is Rietveld 408576698