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

Unified Diff: headless/lib/headless_content_main_delegate.cc

Issue 2835913002: Added crashpad support for Windows (Closed)
Patch Set: Added comment Created 3 years, 7 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 | « headless/app/headless_shell.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: headless/lib/headless_content_main_delegate.cc
diff --git a/headless/lib/headless_content_main_delegate.cc b/headless/lib/headless_content_main_delegate.cc
index 15048dbe291af70985da6c444f08d4f7af88bc3e..7acd3d6c11e302809f775c2b40e71ffc98faced9 100644
--- a/headless/lib/headless_content_main_delegate.cc
+++ b/headless/lib/headless_content_main_delegate.cc
@@ -32,7 +32,7 @@
#include "headless/embedded_resource_pak.h"
#endif
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_WIN)
#include "components/crash/content/app/crashpad.h"
#endif
@@ -179,8 +179,13 @@ void HeadlessContentMainDelegate::InitCrashReporter(
if (process_type != switches::kZygoteProcess)
breakpad::InitCrashReporter(process_type);
#elif defined(OS_MACOSX)
- const bool browser_process = process_type.empty();
- crash_reporter::InitializeCrashpad(browser_process, process_type);
+ crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
+// Avoid adding this dependency in Windows Chrome component build, since it
+// chrashpad is already enabled.
+// TODO(dvallet): Ideally we would also want to avoid this for component build.
+#elif defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL)
+ crash_reporter::InitializeCrashpadWithEmbeddedHandler(process_type.empty(),
+ process_type);
#endif // defined(HEADLESS_USE_BREAKPAD)
}
« no previous file with comments | « headless/app/headless_shell.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698