chrome/browser/extensions/component_loader.cc - Issue 899033002: Revert of Combine PDF plugin into the Chromium binary.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/component_loader.cc

Issue 899033002: Revert of Combine PDF plugin into the Chromium binary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/file_manager/open_with_browser.cc ('k') | chrome/browser/printing/print_preview_dialog_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index 2ee48167a4bf1d1f95db2d82d0818b884ecc8c15..3841dba2ef83476e45eb13b9c06b3ad01bfaf427 100644

--- a/chrome/browser/extensions/component_loader.cc

+++ b/chrome/browser/extensions/component_loader.cc

@@ -626,7 +626,12 @@

#endif // defined(GOOGLE_CHROME_BUILD)

#if defined(ENABLE_PLUGINS)

- if (switches::OutOfProcessPdfEnabled()) {

+ base::FilePath pdf_path;

+ content::PluginService* plugin_service =

+ content::PluginService::GetInstance();

+ if (switches::OutOfProcessPdfEnabled() &&

+ PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path) &&

+ plugin_service->GetRegisteredPpapiPluginInfo(pdf_path)) {

if (switches::PdfMaterialUIEnabled())

Add(IDR_PDF_MANIFEST_MATERIAL, base::FilePath(FILE_PATH_LITERAL("pdf")));

else