Chromium Code Reviews| Index: chrome/app/chrome_main.cc |
| diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc |
| index d84f8d43ae4be629b9adca43c7fb13d3c80d40d5..902e77c8208d98ccab4feeefae31c5dd2b33e392 100644 |
| --- a/chrome/app/chrome_main.cc |
| +++ b/chrome/app/chrome_main.cc |
| @@ -23,7 +23,8 @@ |
| // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling. |
| extern "C" { |
| DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, |
| - sandbox::SandboxInterfaceInfo* sandbox_info); |
| + sandbox::SandboxInterfaceInfo* sandbox_info, |
| + int64_t exe_entry_point_ticks); |
|
fdoray
2016/09/19 17:03:28
#include <stdint.h>?
fdoray
2016/09/19 17:03:28
Could it be base::TimeTicks instead of int64_t? Or
grt (UTC plus 2)
2016/09/19 19:52:46
Done.
grt (UTC plus 2)
2016/09/19 19:52:46
It's safest to stick to primitive types when cross
|
| } |
| #elif defined(OS_POSIX) |
| extern "C" { |
| @@ -34,9 +35,11 @@ int ChromeMain(int argc, const char** argv); |
| #if defined(OS_WIN) |
| DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, |
| - sandbox::SandboxInterfaceInfo* sandbox_info) { |
| + sandbox::SandboxInterfaceInfo* sandbox_info, |
| + int64_t exe_entry_point_ticks) { |
| #elif defined(OS_POSIX) |
| int ChromeMain(int argc, const char** argv) { |
| + int64_t exe_entry_point_ticks = 0; |
| #endif |
| #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) |
| // VS2013 only checks the existence of FMA3 instructions, not the enabled-ness |
| @@ -47,7 +50,7 @@ int ChromeMain(int argc, const char** argv) { |
| _set_FMA3_enable(0); |
| #endif // WIN && ARCH_CPU_X86_64 |
| - ChromeMainDelegate chrome_main_delegate; |
| + ChromeMainDelegate chrome_main_delegate(exe_entry_point_ticks); |
| content::ContentMainParams params(&chrome_main_delegate); |
| #if defined(OS_WIN) |