Chromium Code Reviews| Index: chrome/browser/printing/print_job.cc |
| diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc |
| index d65b7bfb7d687ac59c7152207dcd7e358e50ef10..50459b764128ac039e172ef8d2d232cb111d16ec 100644 |
| --- a/chrome/browser/printing/print_job.cc |
| +++ b/chrome/browser/printing/print_job.cc |
| @@ -21,8 +21,8 @@ namespace printing { |
| PrintJob::PrintJob() |
| : ui_message_loop_(MessageLoop::current()), |
| - worker_(), |
| source_(NULL), |
| + worker_(), |
| settings_(), |
| is_job_pending_(false), |
| is_print_dialog_box_shown_(false), |
| @@ -284,6 +284,7 @@ void PrintJob::OnDocumentDone() { |
| void PrintJob::ControlledWorkerShutdown() { |
| DCHECK_EQ(ui_message_loop_, MessageLoop::current()); |
| +#if defined(OS_WIN) |
|
pink (ping after 24hrs)
2009/10/13 21:04:51
add a todo to come back to this on mac and comment
stuartmorgan
2009/10/13 22:07:43
I don't think we'll ever need to come back to this
|
| // We could easily get into a deadlock case if worker_->Stop() is used; the |
| // printer driver created a window as a child of the browser window. By |
| // canceling the job, the printer driver initiated dialog box is destroyed, |
| @@ -323,6 +324,7 @@ void PrintJob::ControlledWorkerShutdown() { |
| break; |
| } |
| } |
| +#endif |
| // Now make sure the thread object is cleaned up. |
| worker_->Stop(); |