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

Unified Diff: chrome/app/chrome_main.cc

Issue 2949703002: Add OOP memory logging allocator shim (Closed)
Patch Set: More comments Created 3 years, 6 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/common/profiling/BUILD.gn » ('j') | chrome/common/profiling/memlog_allocator_shim.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 54524a637582253179bed17a895b563160ad0d17..25b891f3fe8af7ae67b86c6f9097377581f3a29e 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -16,6 +16,7 @@
#include "ui/gfx/switches.h"
#if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING)
+#include "chrome/common/profiling/memlog_sender.h"
#include "chrome/profiling/profiling_main.h"
#endif
@@ -107,8 +108,13 @@ int ChromeMain(int argc, const char** argv) {
#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
#if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING)
+#if !defined(OS_WIN) || defined(CHROME_MULTIPLE_DLL_BROWSER)
+ // The profiling server is only compiled into the browser process. On Windows,
+ // it should be called only for CHROME_MULTIPLE_DLL_BROWSER.
if (command_line->HasSwitch(switches::kMemlog))
return profiling::ProfilingMain(*command_line);
+#endif
+ profiling::InitMemlogSenderIfNecessary(*command_line);
#endif // ENABLE_OOP_HEAP_PROFILING
#if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
« no previous file with comments | « no previous file | chrome/common/profiling/BUILD.gn » ('j') | chrome/common/profiling/memlog_allocator_shim.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698