| Index: chrome/browser/printing/print_view_manager_base.h
|
| diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
| index ef48ed5c9e1fa53db38c04a92fcd3fdb065c372b..7a93fe1f3a4876f86f2a8cc2713e3ab3a75164b4 100644
|
| --- a/chrome/browser/printing/print_view_manager_base.h
|
| +++ b/chrome/browser/printing/print_view_manager_base.h
|
| @@ -131,12 +131,12 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
| // Release the PrinterQuery associated with our |cookie_|.
|
| void ReleasePrinterQuery();
|
|
|
| -#if defined(WIN_PDF_METAFILE_FOR_PRINTING)
|
| +#if defined(OS_WIN)
|
| // Called on completion of converting the pdf to emf.
|
| void OnPdfToEmfConverted(const PrintHostMsg_DidPrintPage_Params& params,
|
| double scale_factor,
|
| const std::vector<base::FilePath>& emf_file);
|
| -#endif
|
| +#endif // OS_WIN
|
|
|
| content::NotificationRegistrar registrar_;
|
|
|
| @@ -154,15 +154,14 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
| // print settings are being loaded.
|
| bool inside_inner_message_loop_;
|
|
|
| -#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || \
|
| - defined(WIN_PDF_METAFILE_FOR_PRINTING)
|
| +#if !defined(OS_MACOSX)
|
| // Set to true when OnDidPrintPage() should be expecting the first page.
|
| bool expecting_first_page_;
|
| -#endif
|
| +#endif // OS_MACOSX
|
|
|
| -#if defined(WIN_PDF_METAFILE_FOR_PRINTING)
|
| +#if defined(OS_WIN)
|
| scoped_ptr<PdfToEmfConverter> pdf_to_emf_converter_;
|
| -#endif
|
| +#endif // OS_WIN
|
|
|
| // The document cookie of the current PrinterQuery.
|
| int cookie_;
|
|
|