mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: fix build with enable_pdf_viewer=false (#25494)

Browse source
This commit is contained in:
Milan Burda 2020-09-17 00:15:01 +02:00 committed by GitHub
parent 993eab691f
commit e0a25cb1e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
electron_paks.gni
View file

@ -55,7 +55,6 @@ template("electron_extra_paks") {
output = "${invoker.output_dir}/resources.pak" output = "${invoker.output_dir}/resources.pak"
sources = [ sources = [
"$root_gen_dir/chrome/dev_ui_browser_resources.pak", "$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/components/components_resources.pak",
"$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
"$root_gen_dir/content/browser/tracing/tracing_resources.pak", "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
@ -71,7 +70,6 @@ template("electron_extra_paks") {
] ]
deps = [ deps = [
"//chrome/browser:dev_ui_browser_resources", "//chrome/browser:dev_ui_browser_resources",
"//chrome/browser/resources:print_preview_pdf_resources",
"//components/resources", "//components/resources",
"//content:content_resources", "//content:content_resources",
"//content:dev_ui_content_resources", "//content:dev_ui_content_resources",
@ -96,6 +94,10 @@ template("electron_extra_paks") {
sources += sources +=
[ "$root_gen_dir/content/browser/devtools/devtools_resources.pak" ] [ "$root_gen_dir/content/browser/devtools/devtools_resources.pak" ]
deps += [ "//content/browser/devtools:devtools_resources" ] 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) { if (enable_print_preview) {
sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ] sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ]
deps += [ "//chrome/browser/resources:print_preview_resources" ] deps += [ "//chrome/browser/resources:print_preview_resources" ]

5
shell/browser/extensions/electron_extensions_api_client.cc
View file

@ -7,13 +7,14 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "electron/buildflags/buildflags.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h"
#include "printing/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h"
#include "shell/browser/extensions/api/management/electron_management_api_delegate.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_extension_web_contents_observer.h"
#include "shell/browser/extensions/electron_messaging_delegate.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 "components/pdf/browser/pdf_web_contents_helper.h"
#include "shell/browser/electron_pdf_web_contents_helper_client.h" #include "shell/browser/electron_pdf_web_contents_helper_client.h"
#endif #endif
@ -54,7 +55,7 @@ void ElectronExtensionsAPIClient::AttachWebContentsHelpers(
extensions::ElectronExtensionWebContentsObserver::CreateForWebContents( extensions::ElectronExtensionWebContentsObserver::CreateForWebContents(
web_contents); web_contents);
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PDF_VIEWER)
pdf::PDFWebContentsHelper::CreateForWebContentsWithClient( pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(
web_contents, std::make_unique<ElectronPDFWebContentsHelperClient>()); web_contents, std::make_unique<ElectronPDFWebContentsHelperClient>());
#endif #endif