diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-28 17:29:14 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 16:43:32 +0200 |
commit | b1d423a3fc2cb3eeacc2a3e91ac9bdd2211c2613 (patch) | |
tree | 53f39e4e7c6a76d19a92fc23fde0728e6df95fc7 /src/core/process_main.cpp | |
parent | f987b713b9f4e363056bf5174a762acb5b77ed79 (diff) |
Update the QtWebEngineCore library to run on top of Chromium 37
Most of the patch is about upstream classes/methods that changed.
Other important details:
- icu data files are now used by default
- cygwin is no longer required to build on Windows
- RenderFrameHost has been replacing RenderViewHost in a few places,
following the separate process iframes support in Chromium
- The user agent is accessed through ContentClient::GetUserAgent
instead of from the command line switches
Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/process_main.cpp')
-rw-r--r-- | src/core/process_main.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/core/process_main.cpp b/src/core/process_main.cpp index 56a79cb13..05aa756a9 100644 --- a/src/core/process_main.cpp +++ b/src/core/process_main.cpp @@ -52,14 +52,21 @@ namespace QtWebEngine { int processMain(int argc, const char **argv) { + ContentMainDelegateQt delegate; + content::ContentMainParams params(&delegate); + #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); + params.instance = instance_handle; + params.sandbox_info = &sandbox_info; #else - return content::ContentMain(argc, argv, new ContentMainDelegateQt); + params.argc = argc; + params.argv = argv; #endif // OS_WIN + + return content::ContentMain(params); } } |