From e2b90ee28c49e50e36b8d6a0dd9c7f2c76c0f0a6 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2020 14:55:29 -0600 Subject: [PATCH] build: fix build with enable_pdf_viewer=false (#25507) Co-authored-by: Milan Burda --- electron_paks.gni | 6 ++++-- shell/browser/extensions/electron_extensions_api_client.cc | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/electron_paks.gni b/electron_paks.gni index 89b93a0d8966e..b541aa557e719 100644 --- a/electron_paks.gni +++ b/electron_paks.gni @@ -55,7 +55,6 @@ template("electron_extra_paks") { output = "${invoker.output_dir}/resources.pak" sources = [ "$root_gen_dir/chrome/dev_ui_browser_resources.pak", - "$root_gen_dir/chrome/print_preview_pdf_resources.pak", "$root_gen_dir/components/components_resources.pak", "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", "$root_gen_dir/content/browser/tracing/tracing_resources.pak", @@ -71,7 +70,6 @@ template("electron_extra_paks") { ] deps = [ "//chrome/browser:dev_ui_browser_resources", - "//chrome/browser/resources:print_preview_pdf_resources", "//components/resources", "//content:content_resources", "//content:dev_ui_content_resources", @@ -96,6 +94,10 @@ template("electron_extra_paks") { sources += [ "$root_gen_dir/content/browser/devtools/devtools_resources.pak" ] deps += [ "//content/browser/devtools:devtools_resources" ] + if (enable_pdf_viewer) { + sources += [ "$root_gen_dir/chrome/print_preview_pdf_resources.pak" ] + deps += [ "//chrome/browser/resources:print_preview_pdf_resources" ] + } if (enable_print_preview) { sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ] deps += [ "//chrome/browser/resources:print_preview_resources" ] diff --git a/shell/browser/extensions/electron_extensions_api_client.cc b/shell/browser/extensions/electron_extensions_api_client.cc index f79d8281059f4..dd276ba794f17 100644 --- a/shell/browser/extensions/electron_extensions_api_client.cc +++ b/shell/browser/extensions/electron_extensions_api_client.cc @@ -7,13 +7,14 @@ #include #include +#include "electron/buildflags/buildflags.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h" #include "printing/buildflags/buildflags.h" #include "shell/browser/extensions/api/management/electron_management_api_delegate.h" #include "shell/browser/extensions/electron_extension_web_contents_observer.h" #include "shell/browser/extensions/electron_messaging_delegate.h" -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) +#if BUILDFLAG(ENABLE_PDF_VIEWER) #include "components/pdf/browser/pdf_web_contents_helper.h" #include "shell/browser/electron_pdf_web_contents_helper_client.h" #endif @@ -54,7 +55,7 @@ void ElectronExtensionsAPIClient::AttachWebContentsHelpers( extensions::ElectronExtensionWebContentsObserver::CreateForWebContents( web_contents); -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) +#if BUILDFLAG(ENABLE_PDF_VIEWER) pdf::PDFWebContentsHelper::CreateForWebContentsWithClient( web_contents, std::make_unique()); #endif