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 6af14f7f13139f166d1dea644f004294a9b5dcdd..75e0d3bb59425d838c0cd6c07152a3138ed4cd1d 100644 |
--- a/chrome/browser/printing/printing_message_filter.cc |
+++ b/chrome/browser/printing/printing_message_filter.cc |
@@ -34,6 +34,7 @@ |
#if defined(OS_ANDROID) |
#include "base/strings/string_number_conversions.h" |
+#include "chrome/browser/android/tab_android.h" |
#include "chrome/browser/printing/print_view_manager_basic.h" |
#include "printing/printing_context_android.h" |
#endif |
@@ -280,7 +281,7 @@ void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) { |
// Loads default settings. This is asynchronous, only the IPC message sender |
// will hang until the settings are retrieved. |
printer_query->GetSettings( |
- PrinterQuery::DEFAULTS, |
+ GetSettingsAskParam::DEFAULTS, |
0, |
false, |
DEFAULT_MARGINS, |
@@ -323,21 +324,41 @@ void PrintingMessageFilter::OnScriptedPrint( |
printer_query = |
queue_->CreatePrinterQuery(render_process_id_, reply_msg->routing_id()); |
} |
+ |
+ DLOG(INFO) << "DGN OnScriptedPrint - cookie: " << params.cookie; |
+ |
+ GetSettingsAskParam ask_param; |
+ if (params.use_system_specific_flow) { |
+ ask_param = GetSettingsAskParam::SYSTEM_SPECIFIC; |
+ } else { |
+ ask_param = GetSettingsAskParam::ASK_USER; |
+ } |
printer_query->GetSettings( |
- PrinterQuery::ASK_USER, |
- params.expected_pages_count, |
- params.has_selection, |
- params.margin_type, |
- base::Bind(&PrintingMessageFilter::OnScriptedPrintReply, |
- this, |
- printer_query, |
- reply_msg)); |
+ ask_param, |
+ params.expected_pages_count, |
+ params.has_selection, |
+ params.margin_type, |
+ base::Bind(&PrintingMessageFilter::OnScriptedPrintReply, |
+ this, |
+ printer_query, |
+ reply_msg)); |
} |
void PrintingMessageFilter::OnScriptedPrintReply( |
scoped_refptr<PrinterQuery> printer_query, |
IPC::Message* reply_msg) { |
PrintMsg_PrintPages_Params params; |
+ |
+ DLOG(INFO) << "DGN OnScriptedPrintReply"; |
+ |
+ // TODO integerate to normal flow |
+ // if (printer_query->last_status() == PrintingContext::SYSTEM_DIALOG_DONE) { |
+ // DLOG(INFO) << "DGN OnScriptedPrintReply - SYSTEM_DIALOG_DONE"; |
+ // Send(reply_msg); |
+ // queue_->QueuePrinterQuery(printer_query.get()); |
+ // return; |
+ // } |
+ |
#if defined(OS_ANDROID) |
// We need to save the routing ID here because Send method below deletes the |
// |reply_msg| before we can get the routing ID for the Android code. |
@@ -373,6 +394,9 @@ void PrintingMessageFilter::OnScriptedPrintReply( |
#if defined(OS_ANDROID) |
void PrintingMessageFilter::UpdateFileDescriptor(int render_view_id, int fd) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
+ |
+ DLOG(INFO) << "DGN UpdateFileDescriptor"; |
+ |
content::WebContents* wc = GetWebContentsForRenderView(render_view_id); |
if (!wc) |
return; |