diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 11:49:25 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 11:49:25 +0000 |
| commit | 1a40dd7f41286f3d8220a3711ff7f89cf7b4efe5 (patch) | |
| tree | 7138c88a5e12fc12ff0c27d16a72c71acb91b68e /content/browser/zygote_main_linux.cc | |
| parent | 7c24af349c6756ada9398c77783794c067a639cc (diff) | |
| download | chromium_src-1a40dd7f41286f3d8220a3711ff7f89cf7b4efe5.zip chromium_src-1a40dd7f41286f3d8220a3711ff7f89cf7b4efe5.tar.gz chromium_src-1a40dd7f41286f3d8220a3711ff7f89cf7b4efe5.tar.bz2 | |
Move media library path resolution into Chrome path provider.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6537022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/zygote_main_linux.cc')
| -rw-r--r-- | content/browser/zygote_main_linux.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc index ba6bcb1..8a563b3 100644 --- a/content/browser/zygote_main_linux.cc +++ b/content/browser/zygote_main_linux.cc @@ -37,6 +37,7 @@ #include "base/sys_info.h" #include "build/build_config.h" #include "chrome/common/chrome_descriptors.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pepper_plugin_registry.h" #include "content/common/font_config_ipc_linux.h" @@ -597,9 +598,12 @@ static void PreSandboxInit() { // cached and there's no more need to access the file system. scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); - FilePath module_path; - if (PathService::Get(base::DIR_MODULE, &module_path)) - media::InitializeMediaLibrary(module_path); + // Each Renderer we spawn will re-attempt initialization of the media + // libraries, at which point failure will be detected and handled, so + // we do not need to cope with initialization failures here. + FilePath media_path; + if (PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path)) + media::InitializeMediaLibrary(media_path); // Remoting requires NSS to function properly. It is not used for other // reasons so load NSS only if remoting is enabled. |