Index: chrome/browser/ui/webui/app_launcher_handler.h |
diff --git a/chrome/browser/ui/webui/app_launcher_handler.h b/chrome/browser/ui/webui/app_launcher_handler.h |
index e5622563373f5d0dcc99b8c942caddc6571b0f12..8d31788b582d86d3bd754a99e06bec60f2ba16b3 100644 |
--- a/chrome/browser/ui/webui/app_launcher_handler.h |
+++ b/chrome/browser/ui/webui/app_launcher_handler.h |
@@ -8,6 +8,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/prefs/pref_change_registrar.h" |
#include "chrome/common/extensions/extension.h" |
#include "chrome/common/extensions/extension_constants.h" |
@@ -26,10 +27,9 @@ namespace gfx { |
} |
// The handler for Javascript messages related to the "apps" view. |
-class AppLauncherHandler |
- : public WebUIMessageHandler, |
- public ExtensionInstallUI::Delegate, |
- public NotificationObserver { |
+class AppLauncherHandler : public WebUIMessageHandler, |
+ public ExtensionGenericDialog::Delegate, |
+ public NotificationObserver { |
public: |
explicit AppLauncherHandler(ExtensionService* extension_service); |
virtual ~AppLauncherHandler(); |
@@ -97,14 +97,13 @@ class AppLauncherHandler |
// Prompts the user to re-enable the app for |extension_id|. |
void PromptToEnableApp(std::string extension_id); |
- // 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(); |
- // 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(); |
// Helper that uninstalls all the default apps. |
void UninstallDefaultApps(); |
@@ -121,13 +120,13 @@ class AppLauncherHandler |
// 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_; |
// The type of prompt we are showing the user. |
- ExtensionInstallUI::PromptType extension_prompt_type_; |
+ ExtensionGenericDialog::DialogType extension_dialog_type_; |
// Whether the promo is currently being shown. |
bool promo_active_; |