diff options
Diffstat (limited to 'chrome/browser')
6 files changed, 7 insertions, 35 deletions
diff --git a/chrome/browser/cocoa/extension_install_prompt.mm b/chrome/browser/cocoa/extension_install_prompt.mm index ce19119..ae68d9d 100644 --- a/chrome/browser/cocoa/extension_install_prompt.mm +++ b/chrome/browser/cocoa/extension_install_prompt.mm @@ -41,13 +41,3 @@ void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl( delegate->InstallUIAbort(); } } - -void ExtensionInstallUI::ShowExtensionInstallError(const std::string& error) { - NSAlert* alert = [[[NSAlert alloc] init] autorelease]; - [alert addButtonWithTitle:l10n_util::GetNSString(IDS_OK)]; - [alert setMessageText:l10n_util::GetNSString( - IDS_EXTENSION_INSTALL_FAILURE_TITLE)]; - [alert setInformativeText:base::SysUTF8ToNSString(error)]; - [alert setAlertStyle:NSWarningAlertStyle]; - [alert runModal]; -} diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index 72a7c1e..c737f8f 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -21,6 +21,7 @@ #endif // TOOLKIT_VIEWS #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" +#include "chrome/common/platform_util.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" @@ -201,7 +202,11 @@ void ExtensionInstallUI::OnInstallSuccess(Extension* extension) { void ExtensionInstallUI::OnInstallFailure(const std::string& error) { DCHECK(ui_loop_ == MessageLoop::current()); - ShowExtensionInstallError(error); + Browser* browser = BrowserList::GetLastActiveWithProfile(profile_); + platform_util::SimpleErrorBox( + browser ? browser->window()->GetNativeHandle() : NULL, + l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALL_FAILURE_TITLE), + UTF8ToUTF16(error)); } void ExtensionInstallUI::OnOverinstallAttempted(Extension* extension) { diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h index 0267450..f2dc82a 100644 --- a/chrome/browser/extensions/extension_install_ui.h +++ b/chrome/browser/extensions/extension_install_ui.h @@ -46,9 +46,6 @@ class ExtensionInstallUI { SkBitmap* install_icon, const std::wstring& warning_text); - // NOTE: The implementations of this function is platform-specific. - static void ShowExtensionInstallError(const std::string& error); - explicit ExtensionInstallUI(Profile* profile); // This is called by the installer to verify whether the installation should diff --git a/chrome/browser/gtk/extension_install_prompt_gtk.cc b/chrome/browser/gtk/extension_install_prompt_gtk.cc index 2963820..bfeb878 100644 --- a/chrome/browser/gtk/extension_install_prompt_gtk.cc +++ b/chrome/browser/gtk/extension_install_prompt_gtk.cc @@ -129,12 +129,3 @@ void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl( ShowInstallPromptDialog(browser_window->window(), icon, extension, delegate, warning_ascii, is_uninstall); } - -void ExtensionInstallUI::ShowExtensionInstallError(const std::string& error) { - GtkWidget* dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", error.c_str()); - gtk_window_set_title(GTK_WINDOW(dialog), - l10n_util::GetStringUTF8(IDS_EXTENSION_INSTALL_FAILURE_TITLE).c_str()); - g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL); - gtk_widget_show_all(dialog); -} diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc index b35da24..a9d9cb4 100644 --- a/chrome/browser/printing/print_dialog_gtk.cc +++ b/chrome/browser/printing/print_dialog_gtk.cc @@ -27,7 +27,7 @@ class PdfUnsupportedInfoBarDelegate : public LinkInfoBarDelegate { browser_(browser) { } - ~PdfUnsupportedInfoBarDelegate() {} + virtual ~PdfUnsupportedInfoBarDelegate() {} virtual std::wstring GetMessageTextWithOffset(size_t* link_offset) const { std::wstring message(L"Oops! Your printer does not support PDF. Please " diff --git a/chrome/browser/views/extensions/extension_install_prompt.cc b/chrome/browser/views/extensions/extension_install_prompt.cc index c227040..8c5eb02 100644 --- a/chrome/browser/views/extensions/extension_install_prompt.cc +++ b/chrome/browser/views/extensions/extension_install_prompt.cc @@ -174,14 +174,3 @@ void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl( new InstallDialogContent(delegate, extension, icon, warning_text, is_uninstall))->Show(); } - -void ExtensionInstallUI::ShowExtensionInstallError(const std::string& error) { -#if defined(OS_WIN) - win_util::MessageBox(NULL, UTF8ToWide(error), - l10n_util::GetString(IDS_EXTENSION_INSTALL_FAILURE_TITLE), - MB_OK | MB_SETFOREGROUND); -#else - // TODO(port): Port this over to OS_* - NOTREACHED(); -#endif -} |