Index: chrome/browser/printing/print_job_worker.cc |
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc |
index d87216a002e4116039a46843a82c8e90abd9d549..714523eb810d6978badcd7f76ec2a2ad7647d7ae 100644 |
--- a/chrome/browser/printing/print_job_worker.cc |
+++ b/chrome/browser/printing/print_job_worker.cc |
@@ -90,9 +90,11 @@ std::string PrintingContextDelegate::GetAppLocale() { |
void NotificationCallback(PrintJobWorkerOwner* print_job, |
JobEventDetails::Type detail_type, |
+ int job_id, |
PrintedDocument* document, |
PrintedPage* page) { |
- JobEventDetails* details = new JobEventDetails(detail_type, document, page); |
+ JobEventDetails* details = |
+ new JobEventDetails(detail_type, job_id, document, page); |
content::NotificationService::current()->Notify( |
chrome::NOTIFICATION_PRINT_JOB_EVENT, |
// We know that is is a PrintJob object in this circumstance. |
@@ -370,6 +372,7 @@ void PrintJobWorker::OnDocumentDone() { |
DCHECK_EQ(page_number_, PageNumber::npos()); |
DCHECK(document_.get()); |
+ int job_id = printing_context_->job_id(); |
if (printing_context_->DocumentDone() != PrintingContext::OK) { |
OnFailure(); |
return; |
@@ -377,7 +380,7 @@ void PrintJobWorker::OnDocumentDone() { |
owner_->PostTask(FROM_HERE, |
base::Bind(&NotificationCallback, base::RetainedRef(owner_), |
- JobEventDetails::DOC_DONE, |
+ JobEventDetails::DOC_DONE, job_id, |
base::RetainedRef(document_), nullptr)); |
// Makes sure the variables are reinitialized. |
@@ -392,8 +395,8 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) { |
owner_->PostTask( |
FROM_HERE, |
base::Bind(&NotificationCallback, base::RetainedRef(owner_), |
- JobEventDetails::NEW_PAGE, base::RetainedRef(document_), |
- base::RetainedRef(page))); |
+ JobEventDetails::NEW_PAGE, printing_context_->job_id(), |
+ base::RetainedRef(document_), base::RetainedRef(page))); |
// Preprocess. |
if (printing_context_->NewPage() != PrintingContext::OK) { |
@@ -418,8 +421,8 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) { |
owner_->PostTask( |
FROM_HERE, |
base::Bind(&NotificationCallback, base::RetainedRef(owner_), |
- JobEventDetails::PAGE_DONE, base::RetainedRef(document_), |
- base::RetainedRef(page))); |
+ JobEventDetails::PAGE_DONE, printing_context_->job_id(), |
+ base::RetainedRef(document_), base::RetainedRef(page))); |
} |
void PrintJobWorker::OnFailure() { |
@@ -430,7 +433,7 @@ void PrintJobWorker::OnFailure() { |
owner_->PostTask(FROM_HERE, |
base::Bind(&NotificationCallback, base::RetainedRef(owner_), |
- JobEventDetails::FAILED, |
+ JobEventDetails::FAILED, 0, |
base::RetainedRef(document_), nullptr)); |
Cancel(); |