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

Unified Diff: chrome/browser/printing/print_dialog_gtk.cc

Issue 8549031: base::Bind: Convert PrintingContext::PrintSettingsCallback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win fix. Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/printing/print_dialog_gtk.h ('k') | chrome/browser/printing/print_job_worker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/print_dialog_gtk.cc
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
index 652a205b688c42c75355922e36467b4f8fc0fc2b..0625743d47f49a8c086d121a74a4b269a4c2dc6e 100644
--- a/chrome/browser/printing/print_dialog_gtk.cc
+++ b/chrome/browser/printing/print_dialog_gtk.cc
@@ -100,8 +100,7 @@ printing::PrintDialogGtkInterface* PrintDialogGtk::CreatePrintDialog(
}
PrintDialogGtk::PrintDialogGtk(PrintingContextGtk* context)
- : callback_(NULL),
- context_(context),
+ : context_(context),
dialog_(NULL),
gtk_settings_(NULL),
page_setup_(NULL),
@@ -232,7 +231,7 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& job_settings,
}
void PrintDialogGtk::ShowDialog(
- PrintingContextGtk::PrintSettingsCallback* callback) {
+ const PrintingContextGtk::PrintSettingsCallback& callback) {
callback_ = callback;
GtkWindow* parent = BrowserList::GetLastActive()->window()->GetNativeHandle();
@@ -343,14 +342,14 @@ void PrintDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
printing::PrintSettingsInitializerGtk::InitPrintSettings(
gtk_settings_, page_setup_, ranges_vector, false, &settings);
context_->InitWithSettings(settings);
- callback_->Run(PrintingContextGtk::OK);
- callback_ = NULL;
+ callback_.Run(PrintingContextGtk::OK);
+ callback_.Reset();
return;
}
case GTK_RESPONSE_DELETE_EVENT: // Fall through.
case GTK_RESPONSE_CANCEL: {
- callback_->Run(PrintingContextGtk::CANCEL);
- callback_ = NULL;
+ callback_.Run(PrintingContextGtk::CANCEL);
+ callback_.Reset();
return;
}
case GTK_RESPONSE_APPLY:
« no previous file with comments | « chrome/browser/printing/print_dialog_gtk.h ('k') | chrome/browser/printing/print_job_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698