Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6706)

Unified Diff: chrome/common/chrome_paths.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/common/chrome_paths.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 9537376b47f4e2e9a27908eb3342680cb287ed82..af56236b4ed642995420578008df28d515b6605b 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -50,6 +50,16 @@
FILE_PATH_LITERAL("Macromed\\Flash");
#endif
+// File name of the internal PDF plugin on different platforms.
+const base::FilePath::CharType kInternalPDFPluginFileName[] =
+#if defined(OS_WIN)
+ FILE_PATH_LITERAL("pdf.dll");
+#elif defined(OS_MACOSX)
+ FILE_PATH_LITERAL("PDF.plugin");
+#else // Linux and Chrome OS
+ FILE_PATH_LITERAL("libpdf.so");
+#endif
+
const base::FilePath::CharType kInternalNaClPluginFileName[] =
FILE_PATH_LITERAL("internal-nacl-plugin");
@@ -284,6 +294,11 @@
return false;
cur = cur.Append(chrome::kPepperFlashPluginFilename);
break;
+ case chrome::FILE_PDF_PLUGIN:
+ if (!GetInternalPluginsDirectory(&cur))
+ return false;
+ cur = cur.Append(kInternalPDFPluginFileName);
+ break;
case chrome::FILE_EFFECTS_PLUGIN:
if (!GetInternalPluginsDirectory(&cur))
return false;
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698