diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/printing/print_job_worker.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/printing/print_job_worker.h | 3 | ||||
| -rw-r--r-- | chrome/browser/printing/printer_query.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/printing/printer_query.h | 1 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/resource_message_filter.cc | 2 |
5 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 3a91f0c..34d14dc 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -67,13 +67,15 @@ void PrintJobWorker::SetNewOwner(PrintJobWorkerOwner* new_owner) { void PrintJobWorker::GetSettings(bool ask_user_for_settings, gfx::NativeWindow parent_window, int document_page_count, - bool has_selection) { + bool has_selection, + bool use_overlays) { DCHECK_EQ(message_loop(), MessageLoop::current()); DCHECK_EQ(page_number_, PageNumber::npos()); // Recursive task processing is needed for the dialog in case it needs to be // destroyed by a task. MessageLoop::current()->SetNestableTasksAllowed(true); + printing_context_.SetUseOverlays(use_overlays); if (ask_user_for_settings) { #if defined(OS_MACOSX) diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h index 15f16da..8eb15dd 100644 --- a/chrome/browser/printing/print_job_worker.h +++ b/chrome/browser/printing/print_job_worker.h @@ -36,7 +36,8 @@ class PrintJobWorker : public base::Thread { void GetSettings(bool ask_user_for_settings, gfx::NativeWindow parent_window, int document_page_count, - bool has_selection); + bool has_selection, + bool use_overlays); // Starts the printing loop. Every pages are printed as soon as the data is // available. Makes sure the new_document is the right one. diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc index 4fdadbe..86c0f67 100644 --- a/chrome/browser/printing/printer_query.cc +++ b/chrome/browser/printing/printer_query.cc @@ -65,6 +65,7 @@ void PrinterQuery::GetSettings(GetSettingsAskParam ask_user_for_settings, gfx::NativeWindow parent_window, int expected_page_count, bool has_selection, + bool use_overlays, CancelableTask* callback) { DCHECK_EQ(ui_message_loop_, MessageLoop::current()); DCHECK(!is_print_dialog_box_shown_); @@ -93,7 +94,8 @@ void PrinterQuery::GetSettings(GetSettingsAskParam ask_user_for_settings, is_print_dialog_box_shown_, parent_window, expected_page_count, - has_selection)); + has_selection, + use_overlays)); } void PrinterQuery::StopWorker() { diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h index b9c2734..847611c 100644 --- a/chrome/browser/printing/printer_query.h +++ b/chrome/browser/printing/printer_query.h @@ -50,6 +50,7 @@ class PrinterQuery : public PrintJobWorkerOwner { gfx::NativeWindow parent_window, int expected_page_count, bool has_selection, + bool use_overlays, CancelableTask* callback); // Stops the worker thread since the client is done with this object. diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 65b6469..f25be7c 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -1070,6 +1070,7 @@ void ResourceMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) { NULL, 0, false, + true, task); } @@ -1133,6 +1134,7 @@ void ResourceMessageFilter::OnScriptedPrint( host_window, params.expected_pages_count, params.has_selection, + params.use_overlays, task); } |