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

fix: print from PDF viewer not working (#22760)

Browse source
This commit is contained in:
Shelley Vohr 2020-03-20 09:46:13 -07:00 • committed by GitHub
parent 9d4714f111
commit 24e21467b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chromium_src/BUILD.gn
View file

@ -242,6 +242,8 @@ static_library("chrome") {
"//chrome/renderer/extensions/extension_hooks_delegate.h", "//chrome/renderer/extensions/extension_hooks_delegate.h",
"//chrome/renderer/extensions/tabs_hooks_delegate.cc", "//chrome/renderer/extensions/tabs_hooks_delegate.cc",
"//chrome/renderer/extensions/tabs_hooks_delegate.h", "//chrome/renderer/extensions/tabs_hooks_delegate.h",
"//chrome/renderer/pepper/chrome_pdf_print_client.cc",
"//chrome/renderer/pepper/chrome_pdf_print_client.h",
] ]
} }
} }

5
shell/browser/extensions/api/resources_private/resources_private_api.cc
View file

@ -74,10 +74,7 @@ void AddAdditionalDataForPdf(base::DictionaryValue* dict) {
dict->SetKey("pdfTwoUpViewEnabled", dict->SetKey("pdfTwoUpViewEnabled",
base::Value(base::FeatureList::IsEnabled( base::Value(base::FeatureList::IsEnabled(
chrome_pdf::features::kPDFTwoUpView))); chrome_pdf::features::kPDFTwoUpView)));
dict->SetKey("printingEnabled", base::Value(true));
// TODO(nornagon): enable printing once it works.
bool enable_printing = false;
dict->SetKey("printingEnabled", base::Value(enable_printing));
#endif // BUILDFLAG(ENABLE_PDF) #endif // BUILDFLAG(ENABLE_PDF)
} }

4
shell/renderer/renderer_client_base.cc
View file

@ -68,6 +68,7 @@
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS) #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "chrome/renderer/pepper/chrome_pdf_print_client.h"
#include "content/public/common/webplugininfo.h" #include "content/public/common/webplugininfo.h"
#include "extensions/common/constants.h" #include "extensions/common/constants.h"
#include "extensions/common/extensions_client.h" #include "extensions/common/extensions_client.h"
@ -156,6 +157,9 @@ void RendererClientBase::RenderThreadStarted() {
extensions_renderer_client_.reset(new ElectronExtensionsRendererClient); extensions_renderer_client_.reset(new ElectronExtensionsRendererClient);
extensions::ExtensionsRendererClient::Set(extensions_renderer_client_.get()); extensions::ExtensionsRendererClient::Set(extensions_renderer_client_.get());
// Enables printing from Chrome PDF viewer.
pdf::PepperPDFHost::SetPrintClient(new ChromePDFPrintClient());
thread->AddObserver(extensions_renderer_client_->GetDispatcher()); thread->AddObserver(extensions_renderer_client_->GetDispatcher());
#endif #endif