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

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

Issue 7831041: Fix print preview workflow to reflect settings of selected printer. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Update per code review Created 9 years, 3 months 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
Index: chrome/browser/printing/printing_message_filter.cc
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
index 1f9ad53afe2bfa15ce6dad911b71f61e49e7f13c..4b7e3ee1e6d0495ae693773d18f95274a5396541 100644
--- a/chrome/browser/printing/printing_message_filter.cc
+++ b/chrome/browser/printing/printing_message_filter.cc
@@ -220,6 +220,7 @@ void PrintingMessageFilter::OnGetDefaultPrintSettingsReply(
RenderParamsFromPrintSettings(printer_query->settings(), &params);
params.document_cookie = printer_query->cookie();
}
+
kmadhusu 2011/09/14 01:37:25 nit: Please remove the blank line.
arthurhsu 2011/09/16 18:23:01 Done.
PrintHostMsg_GetDefaultPrintSettings::WriteReplyParams(reply_msg, params);
Send(reply_msg);
// If printing was enabled.
@@ -288,14 +289,14 @@ void PrintingMessageFilter::OnUpdatePrintSettings(
IPC::Message* reply_msg) {
scoped_refptr<printing::PrinterQuery> printer_query;
print_job_manager_->PopPrinterQuery(document_cookie, &printer_query);
- if (printer_query.get()) {
- CancelableTask* task = NewRunnableMethod(
- this,
- &PrintingMessageFilter::OnUpdatePrintSettingsReply,
- printer_query,
- reply_msg);
- printer_query->SetSettings(job_settings, task);
- }
+ if (!printer_query.get())
+ printer_query = new printing::PrinterQuery();
+ CancelableTask* task = NewRunnableMethod(
+ this,
+ &PrintingMessageFilter::OnUpdatePrintSettingsReply,
+ printer_query,
+ reply_msg);
+ printer_query->SetSettings(job_settings, task);
}
void PrintingMessageFilter::OnUpdatePrintSettingsReply(
@@ -310,8 +311,10 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
params.pages =
printing::PageRange::GetPages(printer_query->settings().ranges);
}
+
kmadhusu 2011/09/14 01:37:25 nit: Please remove the blank line.
arthurhsu 2011/09/16 18:23:01 Done.
PrintHostMsg_UpdatePrintSettings::WriteReplyParams(reply_msg, params);
Send(reply_msg);
+
kmadhusu 2011/09/14 01:37:25 nit: Please remove the blank line.
arthurhsu 2011/09/16 18:23:01 Done.
// If user hasn't cancelled.
if (printer_query->cookie() && printer_query->settings().dpi())
print_job_manager_->QueuePrinterQuery(printer_query.get());

Powered by Google App Engine
This is Rietveld 408576698