| Index: chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc
|
| index 4a1351e1edf3ee7fbe4a5fc99fb0851c56fa0452..4c736fff3c5bbf7031a8389abc79638830012b14 100644
|
| --- a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc
|
| @@ -49,35 +49,35 @@ void AddResourceIcon(const SkBitmap* icon, void* data) {
|
| }
|
|
|
| // Displays the dialog when constructed, deletes itself when dialog is
|
| -// dismissed. Success/failure is passed back through the ExtensionInstallUI::
|
| -// Delegate instance.
|
| +// dismissed. Success/failure is passed back through the
|
| +// ExtensionInstallPrompt::Delegate instance.
|
| class ExtensionInstallDialog {
|
| public:
|
| ExtensionInstallDialog(GtkWindow* parent,
|
| - ExtensionInstallUI::Delegate *delegate,
|
| - const ExtensionInstallUI::Prompt& prompt);
|
| + ExtensionInstallPrompt::Delegate *delegate,
|
| + const ExtensionInstallPrompt::Prompt& prompt);
|
| private:
|
| ~ExtensionInstallDialog();
|
|
|
| CHROMEGTK_CALLBACK_1(ExtensionInstallDialog, void, OnResponse, int);
|
| CHROMEGTK_CALLBACK_0(ExtensionInstallDialog, void, OnStoreLinkClick);
|
|
|
| - ExtensionInstallUI::Delegate* delegate_;
|
| + ExtensionInstallPrompt::Delegate* delegate_;
|
| std::string extension_id_; // Set for INLINE_INSTALL_PROMPT.
|
| GtkWidget* dialog_;
|
| };
|
|
|
| ExtensionInstallDialog::ExtensionInstallDialog(
|
| GtkWindow* parent,
|
| - ExtensionInstallUI::Delegate *delegate,
|
| - const ExtensionInstallUI::Prompt& prompt)
|
| + ExtensionInstallPrompt::Delegate *delegate,
|
| + const ExtensionInstallPrompt::Prompt& prompt)
|
| : delegate_(delegate),
|
| dialog_(NULL) {
|
| bool show_permissions = prompt.GetPermissionCount() > 0;
|
| bool is_inline_install =
|
| - prompt.type() == ExtensionInstallUI::INLINE_INSTALL_PROMPT;
|
| + prompt.type() == ExtensionInstallPrompt::INLINE_INSTALL_PROMPT;
|
| bool is_bundle_install =
|
| - prompt.type() == ExtensionInstallUI::BUNDLE_INSTALL_PROMPT;
|
| + prompt.type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT;
|
|
|
| if (is_inline_install)
|
| extension_id_ = prompt.extension()->id();
|
| @@ -264,8 +264,8 @@ void ExtensionInstallDialog::OnStoreLinkClick(GtkWidget* sender) {
|
|
|
| void ShowExtensionInstallDialogImpl(
|
| Profile* profile,
|
| - ExtensionInstallUI::Delegate* delegate,
|
| - const ExtensionInstallUI::Prompt& prompt) {
|
| + ExtensionInstallPrompt::Delegate* delegate,
|
| + const ExtensionInstallPrompt::Prompt& prompt) {
|
| Browser* browser = browser::FindLastActiveWithProfile(profile);
|
| if (!browser) {
|
| delegate->InstallUIAbort(false);
|
|
|