summaryrefslogtreecommitdiffstats
path: root/chrome/browser/zygote_main_linux.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 03:34:21 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 03:34:21 +0000
commit603c0ff53fbad528646ff0577f940b3bc5a33912 (patch)
treecf5e12526539831d931b67a95852b64191a3a092 /chrome/browser/zygote_main_linux.cc
parentb691d6e5a21de1e84500b28011fdc7e709c16da1 (diff)
downloadchromium_src-603c0ff53fbad528646ff0577f940b3bc5a33912.zip
chromium_src-603c0ff53fbad528646ff0577f940b3bc5a33912.tar.gz
chromium_src-603c0ff53fbad528646ff0577f940b3bc5a33912.tar.bz2
Load Pepper v2 internal pdf plugin.
Also need to uncomment pepper_plugin_registry.cc Review URL: http://codereview.chromium.org/2804037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/zygote_main_linux.cc')
-rw-r--r--chrome/browser/zygote_main_linux.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
index 1dbbbf5..47f2cb7 100644
--- a/chrome/browser/zygote_main_linux.cc
+++ b/chrome/browser/zygote_main_linux.cc
@@ -532,7 +532,7 @@ static void PreSandboxInit() {
FilePath module_path;
if (PathService::Get(base::DIR_MODULE, &module_path))
media::InitializeMediaLibrary(module_path);
-
+/*
// Load the PDF plugin before the sandbox is turned on.
FilePath pdf;
if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) &&
@@ -542,6 +542,7 @@ static void PreSandboxInit() {
bool rv = pdf_lib && pdf_lib->EnsureAlwaysLoaded();
DCHECK(rv) << "Couldn't load PDF plugin";
}
+*/
}
#if !defined(CHROMIUM_SELINUX)