diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-01-13 17:22:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-13 21:31:40 +0100 |
| commit | 36623478c63110bd41326d1a0425b0f331db96ac (patch) | |
| tree | 010236c17dcb399518c5af8553eebe10f882d194 /src | |
| parent | 7f400f183184c92871a6b876943e109f021ba67d (diff) | |
Fix ContentMain calling in processMain for Windows
ContentMain has a different parameter list for Windows.
Currently no sandbox is in use, just fitting in with the required
parameters. See chromium/content/app/content_main.cc.
Change-Id: I6c3918efaafbf48bd4a07f377be51c22c5355cd0
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/process_main.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/core/process_main.cpp b/src/core/process_main.cpp index a8c1b3ad5..56a79cb13 100644 --- a/src/core/process_main.cpp +++ b/src/core/process_main.cpp @@ -43,12 +43,23 @@ #include "content_main_delegate_qt.h" #include "content/public/app/content_main.h" +#if defined(OS_WIN) +#include "sandbox/win/src/sandbox_types.h" +#include "content/public/app/startup_helper_win.h" +#endif // OS_WIN namespace QtWebEngine { int processMain(int argc, const char **argv) { +#if defined(OS_WIN) + HINSTANCE instance_handle = NULL; + sandbox::SandboxInterfaceInfo sandbox_info = {0}; + content::InitializeSandboxInfo(&sandbox_info); + return content::ContentMain(instance_handle, &sandbox_info, new ContentMainDelegateQt); +#else return content::ContentMain(argc, argv, new ContentMainDelegateQt); +#endif // OS_WIN } } |