mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
49 lines
2.4 KiB
Diff
49 lines
2.4 KiB
Diff
diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
|
|
index bbc1d4d057291..a7c7d75f61df6 100644
|
|
--- content/browser/child_process_launcher_helper_linux.cc
|
|
+++ content/browser/child_process_launcher_helper_linux.cc
|
|
@@ -162,7 +162,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
|
|
base::File OpenFileToShare(const base::FilePath& path,
|
|
base::MemoryMappedFile::Region* region) {
|
|
base::FilePath exe_dir;
|
|
- bool result = base::PathService::Get(base::BasePathKey::DIR_EXE, &exe_dir);
|
|
+ bool result = base::PathService::Get(base::BasePathKey::DIR_ASSETS, &exe_dir);
|
|
DCHECK(result);
|
|
base::File file(exe_dir.Append(path),
|
|
base::File::FLAG_OPEN | base::File::FLAG_READ);
|
|
diff --git sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/client/setuid_sandbox_host.cc
|
|
index 7022a65e03578..c9aaf5d76e4a1 100644
|
|
--- sandbox/linux/suid/client/setuid_sandbox_host.cc
|
|
+++ sandbox/linux/suid/client/setuid_sandbox_host.cc
|
|
@@ -120,7 +120,7 @@ bool SetuidSandboxHost::IsDisabledViaEnvironment() {
|
|
base::FilePath SetuidSandboxHost::GetSandboxBinaryPath() {
|
|
base::FilePath sandbox_binary;
|
|
base::FilePath exe_dir;
|
|
- if (base::PathService::Get(base::DIR_EXE, &exe_dir)) {
|
|
+ if (base::PathService::Get(base::DIR_ASSETS, &exe_dir)) {
|
|
base::FilePath sandbox_candidate = exe_dir.AppendASCII("chrome-sandbox");
|
|
if (base::PathExists(sandbox_candidate))
|
|
sandbox_binary = sandbox_candidate;
|
|
diff --git ui/ozone/common/egl_util.cc ui/ozone/common/egl_util.cc
|
|
index e028d8cf8dec6..d172832589534 100644
|
|
--- ui/ozone/common/egl_util.cc
|
|
+++ ui/ozone/common/egl_util.cc
|
|
@@ -158,7 +158,7 @@ bool LoadDefaultEGLGLES2Bindings(
|
|
#if BUILDFLAG(ENABLE_SWIFTSHADER)
|
|
base::FilePath module_path;
|
|
#if !defined(OS_FUCHSIA)
|
|
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
|
|
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
|
|
return false;
|
|
module_path = module_path.Append(FILE_PATH_LITERAL("swiftshader/"));
|
|
#endif
|
|
@@ -171,7 +171,7 @@ bool LoadDefaultEGLGLES2Bindings(
|
|
} else if (implementation.gl == gl::kGLImplementationEGLANGLE) {
|
|
base::FilePath module_path;
|
|
#if !defined(OS_FUCHSIA)
|
|
- if (!base::PathService::Get(base::DIR_MODULE, &module_path))
|
|
+ if (!base::PathService::Get(base::DIR_ASSETS, &module_path))
|
|
return false;
|
|
#endif
|
|
|