Index: chrome/common/chrome_utility_printing_messages.h |
diff --git a/chrome/common/chrome_utility_printing_messages.h b/chrome/common/chrome_utility_printing_messages.h |
index 4858367792dafbc94ac3e7cb3d9ae1c4b14c7eb5..d0a964d895685c85bda68661e1ed197109e27d53 100644 |
--- a/chrome/common/chrome_utility_printing_messages.h |
+++ b/chrome/common/chrome_utility_printing_messages.h |
@@ -14,12 +14,10 @@ |
#include "printing/pdf_render_settings.h" |
#include "printing/pwg_raster_settings.h" |
-#if !defined(ENABLE_FULL_PRINTING) |
-#error "Full printing must be enabled" |
-#endif |
- |
#define IPC_MESSAGE_START ChromeUtilityPrintingMsgStart |
+#if defined(ENABLE_FULL_PRINTING) |
+ |
IPC_STRUCT_TRAITS_BEGIN(printing::PrinterCapsAndDefaults) |
IPC_STRUCT_TRAITS_MEMBER(printer_capabilities) |
IPC_STRUCT_TRAITS_MEMBER(caps_mime_type) |
@@ -85,17 +83,6 @@ IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_GetPrinterCapsAndDefaults, |
IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_GetPrinterSemanticCapsAndDefaults, |
std::string /* printer name */) |
-#if defined(OS_WIN) |
-// Tell the utility process to render the given PDF into a metafile. |
-// The metafile path will have ".%d" inserted where the %d is the page number. |
-// If no page range is specified, all pages will be converted. |
-IPC_MESSAGE_CONTROL4(ChromeUtilityMsg_RenderPDFPagesToMetafiles, |
- IPC::PlatformFileForTransit, // PDF file |
- base::FilePath, // Base location for output metafile |
- printing::PdfRenderSettings, // PDF render settings |
- std::vector<printing::PageRange>) |
-#endif // OS_WIN |
- |
//------------------------------------------------------------------------------ |
// Utility process host messages: |
// These are messages from the utility process to the browser. |
@@ -130,7 +117,18 @@ IPC_MESSAGE_CONTROL1( |
ChromeUtilityHostMsg_GetPrinterSemanticCapsAndDefaults_Failed, |
std::string /* printer name */) |
+#endif // ENABLE_FULL_PRINTING |
+ |
#if defined(OS_WIN) |
+// Tell the utility process to render the given PDF into a metafile. |
+// The metafile path will have ".%d" inserted where the %d is the page number. |
+// If no page range is specified, all pages will be converted. |
+IPC_MESSAGE_CONTROL4(ChromeUtilityMsg_RenderPDFPagesToMetafiles, |
+ IPC::PlatformFileForTransit, // PDF file |
+ base::FilePath, // Base location for output metafile |
+ printing::PdfRenderSettings, // PDF render settings |
+ std::vector<printing::PageRange>) |
+ |
// Reply when the utility process has succeeded in rendering the PDF. |
IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_RenderPDFPagesToMetafiles_Succeeded, |
std::vector<printing::PageRange>, // Pages rendered |
@@ -138,4 +136,5 @@ IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_RenderPDFPagesToMetafiles_Succeeded, |
// Reply when an error occurred rendering the PDF. |
IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_RenderPDFPagesToMetafile_Failed) |
+ |
#endif // OS_WIN |