summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/printing/print_dialog_gtk.cc9
-rw-r--r--chrome/browser/printing/print_dialog_gtk.h13
2 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
index 003cd7d..b8c0578 100644
--- a/chrome/browser/printing/print_dialog_gtk.cc
+++ b/chrome/browser/printing/print_dialog_gtk.cc
@@ -110,7 +110,7 @@ PrintDialogGtk::~PrintDialogGtk() {
g_print_dialog = NULL;
}
-void PrintDialogGtk::OnResponse(gint response_id) {
+void PrintDialogGtk::OnResponse(GtkWidget* dialog, gint response_id) {
gtk_widget_hide(dialog_);
switch (response_id) {
@@ -153,6 +153,13 @@ void PrintDialogGtk::OnResponse(gint response_id) {
OnJobCompleted(NULL, NULL);
}
+void PrintDialogGtk::OnJobCompletedThunk(GtkPrintJob* print_job,
+ gpointer user_data,
+ GError* error) {
+ reinterpret_cast<PrintDialogGtk*>(user_data)->OnJobCompleted(print_job,
+ error);
+}
+
void PrintDialogGtk::OnJobCompleted(GtkPrintJob* job, GError* error) {
gtk_widget_destroy(dialog_);
diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h
index 55f27b5..faeada9 100644
--- a/chrome/browser/printing/print_dialog_gtk.h
+++ b/chrome/browser/printing/print_dialog_gtk.h
@@ -8,6 +8,7 @@
#include <gtk/gtk.h>
+#include "app/gtk_signal.h"
#include "base/basictypes.h"
#include "base/file_path.h"
@@ -29,19 +30,11 @@ class PrintDialogGtk {
static void CreateDialogImpl(const FilePath& path);
- static void OnResponseThunk(GtkDialog* dialog,
- gint response_id,
- gpointer user_data) {
- reinterpret_cast<PrintDialogGtk*>(user_data)->OnResponse(response_id);
- }
- void OnResponse(gint response_id);
+ CHROMEGTK_CALLBACK_1(PrintDialogGtk, void, OnResponse, gint);
static void OnJobCompletedThunk(GtkPrintJob* print_job,
gpointer user_data,
- GError* error) {
- reinterpret_cast<PrintDialogGtk*>(user_data)->OnJobCompleted(print_job,
- error);
- }
+ GError* error);
void OnJobCompleted(GtkPrintJob* job, GError* error);
FilePath path_to_pdf_;