Skip to content

Commit

Permalink
fix: print from PDF viewer not working (#22760)
Browse files Browse the repository at this point in the history
  • Loading branch information
codebytere committed Mar 20, 2020
1 parent 9d4714f commit 24e2146
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions chromium_src/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ static_library("chrome") {
"//chrome/renderer/extensions/extension_hooks_delegate.h",
"//chrome/renderer/extensions/tabs_hooks_delegate.cc",
"//chrome/renderer/extensions/tabs_hooks_delegate.h",
"//chrome/renderer/pepper/chrome_pdf_print_client.cc",
"//chrome/renderer/pepper/chrome_pdf_print_client.h",
]
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@ void AddAdditionalDataForPdf(base::DictionaryValue* dict) {
dict->SetKey("pdfTwoUpViewEnabled",
base::Value(base::FeatureList::IsEnabled(
chrome_pdf::features::kPDFTwoUpView)));

// TODO(nornagon): enable printing once it works.
bool enable_printing = false;
dict->SetKey("printingEnabled", base::Value(enable_printing));
dict->SetKey("printingEnabled", base::Value(true));
#endif // BUILDFLAG(ENABLE_PDF)
}

Expand Down
4 changes: 4 additions & 0 deletions shell/renderer/renderer_client_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@

#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
#include "base/strings/utf_string_conversions.h"
#include "chrome/renderer/pepper/chrome_pdf_print_client.h"
#include "content/public/common/webplugininfo.h"
#include "extensions/common/constants.h"
#include "extensions/common/extensions_client.h"
Expand Down Expand Up @@ -156,6 +157,9 @@ void RendererClientBase::RenderThreadStarted() {
extensions_renderer_client_.reset(new ElectronExtensionsRendererClient);
extensions::ExtensionsRendererClient::Set(extensions_renderer_client_.get());

// Enables printing from Chrome PDF viewer.
pdf::PepperPDFHost::SetPrintClient(new ChromePDFPrintClient());

thread->AddObserver(extensions_renderer_client_->GetDispatcher());
#endif

Expand Down

0 comments on commit 24e2146

Please sign in to comment.