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 e1132b41b789dcc35efc7bda9794a61be6d3a740..de5cb46e56da3739d6c467d8d9c8141d50ed1b65 100644 |
--- a/chrome/browser/printing/printing_message_filter.cc |
+++ b/chrome/browser/printing/printing_message_filter.cc |
@@ -96,9 +96,13 @@ bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message, |
IPC_MESSAGE_HANDLER(ViewHostMsg_TempFileForPrintingWritten, |
OnTempFileForPrintingWritten) |
#endif |
+ IPC_MESSAGE_HANDLER(ViewHostMsg_GetCurrentPrintSettings, |
+ OnGetCurrentPrintSettings) |
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_GetDefaultPrintSettings, |
OnGetDefaultPrintSettings) |
IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ScriptedPrint, OnScriptedPrint) |
+ IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_UpdatePrintSettings, |
+ OnUpdatePrintSettings) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
@@ -263,3 +267,58 @@ void PrintingMessageFilter::OnScriptedPrintReply( |
printer_query->StopWorker(); |
} |
} |
+ |
+void PrintingMessageFilter::OnGetCurrentPrintSettings(int document_cookie, |
+ ViewMsg_Print_Params* params) { |
+ scoped_refptr<printing::PrinterQuery> printer_query; |
+ print_job_manager_->PopPrinterQuery(document_cookie, &printer_query); |
+ if (!printer_query.get()) { |
+ memset(params, 0, sizeof(ViewMsg_Print_Params)); |
+ } else { |
+ RenderParamsFromPrintSettings(printer_query->settings(), params); |
+ params->document_cookie = printer_query->cookie(); |
+ |
+ if (printer_query->cookie() && printer_query->settings().dpi()) |
+ print_job_manager_->QueuePrinterQuery(printer_query.get()); |
+ else |
+ printer_query->StopWorker(); |
+ } |
+} |
+ |
+void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie, |
jam
2011/03/02 18:25:53
nit: (here and above) this style of tabbing is aga
kmadhusu
2011/03/04 19:39:02
Done.
|
+ const DictionaryValue& job_settings, 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); |
+ } |
+} |
+void PrintingMessageFilter::OnUpdatePrintSettingsReply( |
+ scoped_refptr<printing::PrinterQuery> printer_query, |
+ IPC::Message* reply_msg) { |
+ ViewMsg_Print_Params params; |
+ if (!printer_query.get() || |
+ printer_query->last_status() != printing::PrintingContext::OK) { |
Lei Zhang
2011/03/03 00:22:44
nit: indentation is wrong.
kmadhusu
2011/03/04 19:39:02
Done.
|
+ memset(¶ms, 0, sizeof(params)); |
+ } else { |
+ RenderParamsFromPrintSettings(printer_query->settings(), ¶ms); |
+ params.document_cookie = printer_query->cookie(); |
+ } |
+ ViewHostMsg_UpdatePrintSettings::WriteReplyParams(reply_msg, params); |
+ Send(reply_msg); |
+ // If printing was enabled. |
+ if (printer_query.get()) { |
+ // If user hasn't cancelled. |
+ if (printer_query->cookie() && printer_query->settings().dpi()) { |
+ print_job_manager_->QueuePrinterQuery(printer_query.get()); |
+ } else { |
+ printer_query->StopWorker(); |
+ } |
+ } |
+} |
+ |