Re-factored printing defines and build configs.

Renamed DISABLE_BASIC_PRINTING to ENABLE_BASIC_PRINTING.
Renamed ENABLE_FULL_PRINTING to ENABLE_PRINT_PREVIEW.

BUG=430281

Review URL: https://codereview.chromium.org/702603004

Cr-Commit-Position: refs/heads/master@{#302868}

3 files changed, 15 insertions, 15 deletions

diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 2d8759d..a813cef 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -41,7 +41,7 @@
 #include "chrome/utility/media_galleries/media_metadata_parser.h"
 #endif
 
-#if defined(ENABLE_FULL_PRINTING) || defined(OS_WIN)
+#if defined(ENABLE_PRINT_PREVIEW) || defined(OS_WIN)
 #include "chrome/utility/printing_handler.h"
 #endif
 
@@ -86,7 +86,7 @@ ChromeContentUtilityClient::ChromeContentUtilityClient()
   handlers_.push_back(new image_writer::ImageWriterHandler());
 #endif
 
-#if defined(ENABLE_FULL_PRINTING) || defined(OS_WIN)
+#if defined(ENABLE_PRINT_PREVIEW) || defined(OS_WIN)
   handlers_.push_back(new PrintingHandler());
 #endif
 
@@ -165,7 +165,7 @@ void ChromeContentUtilityClient::PreSandboxStartup() {
   extensions::ExtensionsHandler::PreSandboxStartup();
 #endif
 
-#if defined(ENABLE_FULL_PRINTING) || defined(OS_WIN)
+#if defined(ENABLE_PRINT_PREVIEW) || defined(OS_WIN)
   PrintingHandler::PreSandboxStartup();
 #endif
 
diff --git a/chrome/utility/printing_handler.cc b/chrome/utility/printing_handler.cc
index e989144..b69d6ea 100644
--- a/chrome/utility/printing_handler.cc
+++ b/chrome/utility/printing_handler.cc
@@ -22,7 +22,7 @@
 #include "ui/gfx/gdi_util.h"
 #endif
 
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
 #include "chrome/common/crash_keys.h"
 #include "printing/backend/print_backend.h"
 #endif
@@ -267,14 +267,14 @@ bool PrintingHandler::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToMetafiles_Stop,
                         OnRenderPDFPagesToMetafileStop)
 #endif  // OS_WIN
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToPWGRaster,
                         OnRenderPDFPagesToPWGRaster)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_GetPrinterCapsAndDefaults,
                         OnGetPrinterCapsAndDefaults)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_GetPrinterSemanticCapsAndDefaults,
                         OnGetPrinterSemanticCapsAndDefaults)
-#endif  // ENABLE_FULL_PRINTING
+#endif  // ENABLE_PRINT_PREVIEW
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -308,7 +308,7 @@ void PrintingHandler::OnRenderPDFPagesToMetafileStop() {
 
 #endif  // OS_WIN
 
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
 void PrintingHandler::OnRenderPDFPagesToPWGRaster(
     IPC::PlatformFileForTransit pdf_transit,
     const printing::PdfRenderSettings& settings,
@@ -324,7 +324,7 @@ void PrintingHandler::OnRenderPDFPagesToPWGRaster(
   }
   ReleaseProcessIfNeeded();
 }
-#endif  // ENABLE_FULL_PRINTING
+#endif  // ENABLE_PRINT_PREVIEW
 
 #if defined(OS_WIN)
 int PrintingHandler::LoadPDF(base::File pdf_file) {
@@ -395,7 +395,7 @@ bool PrintingHandler::RenderPdfPageToMetafile(int page_number,
 
 #endif  // OS_WIN
 
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
 bool PrintingHandler::RenderPDFPagesToPWGRaster(
     base::File pdf_file,
     const printing::PdfRenderSettings& settings,
@@ -526,4 +526,4 @@ void PrintingHandler::OnGetPrinterSemanticCapsAndDefaults(
   }
   ReleaseProcessIfNeeded();
 }
-#endif  // ENABLE_FULL_PRINTING
+#endif  // ENABLE_PRINT_PREVIEW
diff --git a/chrome/utility/printing_handler.h b/chrome/utility/printing_handler.h
index 48b6c34..cc490ba 100644
--- a/chrome/utility/printing_handler.h
+++ b/chrome/utility/printing_handler.h
@@ -11,7 +11,7 @@
 #include "ipc/ipc_platform_file.h"
 #include "printing/pdf_render_settings.h"
 
-#if !defined(ENABLE_FULL_PRINTING) && !defined(OS_WIN)
+#if !defined(ENABLE_PRINT_PREVIEW) && !defined(OS_WIN)
 #error "Windows or full printing must be enabled"
 #endif
 
@@ -42,13 +42,13 @@ class PrintingHandler : public UtilityMessageHandler {
       IPC::PlatformFileForTransit output_file);
   void OnRenderPDFPagesToMetafileStop();
 #endif  // OS_WIN
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
   void OnRenderPDFPagesToPWGRaster(
       IPC::PlatformFileForTransit pdf_transit,
       const printing::PdfRenderSettings& settings,
       const printing::PwgRasterSettings& bitmap_settings,
       IPC::PlatformFileForTransit bitmap_transit);
-#endif  // ENABLE_FULL_PRINTING
+#endif  // ENABLE_PRINT_PREVIEW
 
 #if defined(OS_WIN)
   int LoadPDF(base::File pdf_file);
@@ -56,7 +56,7 @@ class PrintingHandler : public UtilityMessageHandler {
                                base::File output_file,
                                float* scale_factor);
 #endif  // OS_WIN
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
   bool RenderPDFPagesToPWGRaster(
       base::File pdf_file,
       const printing::PdfRenderSettings& settings,
@@ -65,7 +65,7 @@ class PrintingHandler : public UtilityMessageHandler {
 
   void OnGetPrinterCapsAndDefaults(const std::string& printer_name);
   void OnGetPrinterSemanticCapsAndDefaults(const std::string& printer_name);
-#endif  // ENABLE_FULL_PRINTING
+#endif  // ENABLE_PRINT_PREVIEW
 
 #if defined(OS_WIN)
   std::vector<char> pdf_data_;