Tweak some #ifs to make builds with custom printing build flags work.

Flipping either enable_print_preview or enable_basic_printing to false
used to work on Linux. This fixes the small issues that arised due to
various refactoring breaking these untested configs.

Change-Id: I756d91b5f2f4494b807b4dd6f7b05a72d72b79c1
Reviewed-on: https://chromium-review.googlesource.com/677046Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503520}

chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc

@@ -8,13 +8,16 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
-#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/common/extensions/api/cloud_print_private.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/network_interfaces.h"
 #include "printing/features/features.h"
 
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
+#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
+#endif
+
 namespace extensions {
 
 namespace {

chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

@@ -17,8 +17,6 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/local_discovery/service_discovery_shared_client.h"
-#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
-#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/printing/cloud_print/privet_confirm_api_flow.h"
 #include "chrome/browser/printing/cloud_print/privet_constants.h"
 #include "chrome/browser/printing/cloud_print/privet_device_lister_impl.h"
@@ -42,6 +40,11 @@
 #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE
 #endif
 
+#if defined(CLOUD_PRINT_CONNECTOR_UI_AVAILABLE)
+#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
+#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
+#endif
+
 using cloud_print::CloudPrintPrinterList;
 using cloud_print::DeviceDescription;
 using cloud_print::GCDApiFlow;

chrome/browser/ui/webui/print_preview/print_preview_handler.cc

@@ -852,6 +852,7 @@ void PrintPreviewHandler::HandlePrint(const base::ListValue* args) {
 
 void PrintPreviewHandler::HandleHidePreview(const base::ListValue* /*args*/) {
   print_preview_ui()->OnHidePreviewDialog();
+#if BUILDFLAG(ENABLE_BASIC_PRINTING)
   if (settings_) {
     // Print preview is responding to a resolution of "print" promise. Send the
     // print message to the renderer.
@@ -872,6 +873,7 @@ void PrintPreviewHandler::HandleHidePreview(const base::ListValue* /*args*/) {
       print_view_manager->PrintPreviewDone();
     }
   }
+#endif
 }
 
 void PrintPreviewHandler::HandleCancelPendingPrintRequest(

chrome/browser/ui/webui/print_preview/print_preview_handler.h

@@ -363,9 +363,11 @@ class PrintPreviewHandler
 
   base::queue<std::string> preview_callbacks_;
 
+#if BUILDFLAG(ENABLE_BASIC_PRINTING)
   // Print settings to use in the local print request to send when
   // HandleHidePreview() is called.
   std::unique_ptr<base::DictionaryValue> settings_;
+#endif
 
   // Proxy for calls to the print backend.  Lazily initialized since web_ui() is
   // not available at construction time.