Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Unified Diff: chrome/browser/zygote_main_linux.cc

Issue 6537022: Move media library path resolution into Chrome path provider. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/chrome_paths.h » ('j') | chrome/common/chrome_paths.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/zygote_main_linux.cc
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
index b03e59c3b19ac92adb2aa6eb576222ad4cf0492c..adb34d385cf0279eb4646b23619e47cc816cd58f 100644
--- a/chrome/browser/zygote_main_linux.cc
+++ b/chrome/browser/zygote_main_linux.cc
@@ -35,6 +35,7 @@
#include "build/build_config.h"
#include "chrome/browser/zygote_host_linux.h"
#include "chrome/common/chrome_descriptors.h"
+#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/font_config_ipc_linux.h"
#include "chrome/common/main_function_params.h"
@@ -595,9 +596,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);
+ // TODO(wez): It doesn't seem right that we CHECK() if we can't load the
+ // media libraries, but the alternative is to crash when something tries
+ // to use them. Should we store a flag so code can check this?
scherkus (not reviewing) 2011/02/17 17:57:10 we definitely shouldn't crash! the renderer proce
+ FilePath media_path;
+ CHECK(PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path));
+ CHECK(media::InitializeMediaLibrary(media_path));
// Ensure access to the Pepper plugins before the sandbox is turned on.
PepperPluginRegistry::PreloadModules();
« no previous file with comments | « no previous file | chrome/common/chrome_paths.h » ('j') | chrome/common/chrome_paths.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698