diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-07-05 21:58:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-09 13:47:30 +0200 |
| commit | ea1e55ad0f2ae04706c0103e6f613c253cfcb094 (patch) | |
| tree | f1335c4310797dd9f412a4bd9fed449b6dab1710 /patches/0001-Export-ContentMainRunner.patch | |
| parent | 1daab3653e56469868656b32fa87b7f9585ec577 (diff) | |
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 <simon.hausmann@digia.com>
Diffstat (limited to 'patches/0001-Export-ContentMainRunner.patch')
| -rw-r--r-- | patches/0001-Export-ContentMainRunner.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/0001-Export-ContentMainRunner.patch b/patches/0001-Export-ContentMainRunner.patch new file mode 100644 index 000000000..7cd402485 --- /dev/null +++ b/patches/0001-Export-ContentMainRunner.patch @@ -0,0 +1,33 @@ +From 0a3b4029af83089cb313b555a47c5c510dc94cc7 Mon Sep 17 00:00:00 2001 +From: Simon Hausmann <simon.hausmann@digia.com> +Date: Mon, 29 Apr 2013 11:25:37 +0200 +Subject: Export ContentMainRunner + +--- + content/public/app/content_main_runner.h | 3 ++- + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/content/public/app/content_main_runner.h b/content/public/app/content_main_runner.h +index bed5ff2..992e0d0 100644 +--- a/content/public/app/content_main_runner.h ++++ b/content/public/app/content_main_runner.h +@@ -8,6 +8,7 @@ + #include <string> + + #include "build/build_config.h" ++#include "content/common/content_export.h" + + #if defined(OS_WIN) + #include <windows.h> +@@ -22,7 +23,7 @@ namespace content { + class ContentMainDelegate; + + // This class is responsible for content initialization, running and shutdown. +-class ContentMainRunner { ++class CONTENT_EXPORT ContentMainRunner { + public: + virtual ~ContentMainRunner() {} + +-- +1.8.3 + |