Chromium Code Reviews| 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..44bdacffde338b0f22c207f5032477a17db2a276 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,10 +281,11 @@ 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, |
| + PrinterQuery::GetSettingsAskParam::DEFAULTS, |
| 0, |
| false, |
| DEFAULT_MARGINS, |
| + true, |
|
dgn
2014/12/12 18:42:48
called from PrintWebViewHelper::CalculateNumberOfP
|
| base::Bind(&PrintingMessageFilter::OnGetDefaultPrintSettingsReply, |
| this, |
| printer_query, |
| @@ -323,11 +325,13 @@ void PrintingMessageFilter::OnScriptedPrint( |
| printer_query = |
| queue_->CreatePrinterQuery(render_process_id_, reply_msg->routing_id()); |
| } |
| + |
| printer_query->GetSettings( |
| - PrinterQuery::ASK_USER, |
| + PrinterQuery::GetSettingsAskParam::ASK_USER, |
| params.expected_pages_count, |
| params.has_selection, |
| params.margin_type, |
| + params.is_scripted, |
| base::Bind(&PrintingMessageFilter::OnScriptedPrintReply, |
| this, |
| printer_query, |