Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(391)

Unified Diff: chrome/app/chrome_main.cc

Issue 2345933002: Break chrome_initial's dependence on //components/startup_metric_utils/browser:lib (Closed)
Patch Set: fdoray feedback Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index d84f8d43ae4be629b9adca43c7fb13d3c80d40d5..c537c045515466e8cf090ce203788aa2b092fdea 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -2,9 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/app/chrome_main_delegate.h"
+#include <stdint.h>
#include "build/build_config.h"
+#include "base/time/time.h"
+#include "chrome/app/chrome_main_delegate.h"
#include "chrome/common/features.h"
#include "content/public/app/content_main.h"
@@ -23,7 +25,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);
}
#elif defined(OS_POSIX)
extern "C" {
@@ -34,9 +37,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 +52,8 @@ 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(
+ base::TimeTicks::FromInternalValue(exe_entry_point_ticks));
content::ContentMainParams params(&chrome_main_delegate);
#if defined(OS_WIN)

Powered by Google App Engine
This is Rietveld 408576698