From ea1e55ad0f2ae04706c0103e6f613c253cfcb094 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Fri, 5 Jul 2013 21:58:24 +0200 Subject: Get rid of or upstream chrome_path patch for zygote Override base::FILE_EXE in ContentMainDelegateQt::PreSandboxStartup() with the path to our child process and get rid of the command line argument and the content::CHILD_PROCESS_EXE override. This reduces 0001-My-local-fixes.patch to export ContentMainRunner so the patch can be renamed to better reflect it's purpose. This hunk is still needed since we need to access ContentMainRunner's Initialize() to set our ContentMainDelegate. Change-Id: I808cb114100300a33f8cb1b154c6cde89cbf5d98 Reviewed-by: Simon Hausmann --- patches/patch-chromium.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'patches/patch-chromium.sh') diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 6bc1c5e05..0ffe6860f 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -61,7 +61,7 @@ git submodule update --recursive cd $CHROMIUM_SRC_DIR echo "Entering $PWD" -git am $PATCH_DIR/0001-My-local-fixes.patch +git am $PATCH_DIR/0001-Export-ContentMainRunner.patch git am $PATCH_DIR/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch git am $PATCH_DIR/0001-Mac-Use-libc-instead-of-stdlibc.patch git am $PATCH_DIR/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch -- cgit v1.2.3