diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 17:35:07 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 17:35:07 +0000 |
| commit | 177730472a38fc47e58053374740324cbb86960c (patch) | |
| tree | 4d4e341fb9c307ea39bf4bf9b4733001cc36a263 /chrome/browser/zygote_main_linux.cc | |
| parent | 8eb8a60ba65bfafada0996bd5b844caf59ae9ebe (diff) | |
| download | chromium_src-177730472a38fc47e58053374740324cbb86960c.zip chromium_src-177730472a38fc47e58053374740324cbb86960c.tar.gz chromium_src-177730472a38fc47e58053374740324cbb86960c.tar.bz2 | |
Linux: bit hacky way to ensure Pepper plugins get loaded by zygote.
BUG=49702
TEST=Integrated PDF plugin should work on Linux Chrome, and --register-pepper-plugins works on Linux even with sandbox enabled.
Review URL: http://codereview.chromium.org/3031011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/zygote_main_linux.cc')
| -rw-r--r-- | chrome/browser/zygote_main_linux.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc index dee2839..506825c 100644 --- a/chrome/browser/zygote_main_linux.cc +++ b/chrome/browser/zygote_main_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -37,6 +37,7 @@ #include "chrome/common/chrome_descriptors.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/main_function_params.h" +#include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/process_watcher.h" #include "chrome/common/sandbox_methods_linux.h" @@ -547,6 +548,9 @@ static void PreSandboxInit() { FilePath module_path; if (PathService::Get(base::DIR_MODULE, &module_path)) media::InitializeMediaLibrary(module_path); + + // Ensure access to the Pepper plugins before the sandbox is turned on. + PepperPluginRegistry::PreloadModules(); } #if !defined(CHROMIUM_SELINUX) |