diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 03:36:30 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-13 03:36:30 +0000 |
| commit | 88bec0e4d832ae7fd27ad1610d5f8e4e46e3b06a (patch) | |
| tree | f49a620e8b05881b64488eb6876080e97d080dad /chrome/browser/zygote_main_linux.cc | |
| parent | 603c0ff53fbad528646ff0577f940b3bc5a33912 (diff) | |
| download | chromium_src-88bec0e4d832ae7fd27ad1610d5f8e4e46e3b06a.zip chromium_src-88bec0e4d832ae7fd27ad1610d5f8e4e46e3b06a.tar.gz chromium_src-88bec0e4d832ae7fd27ad1610d5f8e4e46e3b06a.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/zygote_main_linux.cc')
| -rw-r--r-- | chrome/browser/zygote_main_linux.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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) |