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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 2627753004: Move gin and v8 portion of profiling to child from common (Closed)
Patch Set: revert gin removal for now Created 3 years, 11 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
« no previous file with comments | « no previous file | chrome/child/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 5f8dea5917de3846cccec9c86598bc1b1b695f6d..7524657d0544667e2e76c0aedecaeea965bf2571 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -26,6 +26,7 @@
#include "build/build_config.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/defaults.h"
+#include "chrome/child/child_profiling.h"
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_content_client.h"
@@ -528,6 +529,9 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
chrome::common::mac::EnableCFBundleBlocker();
#endif
+#if !defined(CHROME_MULTIPLE_DLL_BROWSER)
Nico 2017/01/13 21:01:19 if this is mechanical, why does this have the !def
scottmg 2017/01/13 21:55:08 You're right, not entirely mechanical I guess. Thi
Nico 2017/01/17 13:10:42 Maybe add a comment explaining why this is ifdef'd
+ ChildProfiling::ProcessStarted();
+#endif
Profiling::ProcessStarted();
base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
@@ -1017,6 +1021,7 @@ void ChromeMainDelegate::ZygoteStarting(
}
void ChromeMainDelegate::ZygoteForked() {
+ ChildProfiling::ProcessStarted();
Profiling::ProcessStarted();
if (Profiling::BeingProfiled()) {
base::debug::RestartProfilingAfterFork();
« no previous file with comments | « no previous file | chrome/child/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698