From 88bec0e4d832ae7fd27ad1610d5f8e4e46e3b06a Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Tue, 13 Jul 2010 03:36:30 +0000 Subject: Revert 52161 -Accidental checkin. Load Pepper v2 internal pdf plugin. Also need to uncomment pepper_plugin_registry.cc Review URL: http://codereview.chromium.org/2804037 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/2968007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52165 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/zygote_main_linux.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'chrome/browser/zygote_main_linux.cc') diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc index 47f2cb7..1dbbbf5 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,7 +542,6 @@ static void PreSandboxInit() { bool rv = pdf_lib && pdf_lib->EnsureAlwaysLoaded(); DCHECK(rv) << "Couldn't load PDF plugin"; } -*/ } #if !defined(CHROMIUM_SELINUX) -- cgit v1.1