Commit 36623478 authored by Zoltan Arvai's avatar Zoltan Arvai Committed by The Qt Project
Browse files

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: default avatarAndras Becsi <andras.becsi@digia.com>
Reviewed-by: default avatarPierre Rossi <pierre.rossi@gmail.com>
Showing with 11 additions and 0 deletions
...@@ -43,12 +43,23 @@ ...@@ -43,12 +43,23 @@
#include "content_main_delegate_qt.h" #include "content_main_delegate_qt.h"
#include "content/public/app/content_main.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 { namespace QtWebEngine {
int processMain(int argc, const char **argv) 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); return content::ContentMain(argc, argv, new ContentMainDelegateQt);
#endif // OS_WIN
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment