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

Unified Diff: handler/main.cc

Issue 1402333004: win: Construct ExceptionHandlerServer() with its pipe argument (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Created 5 years, 2 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 | snapshot/win/exception_snapshot_win_test.cc » ('j') | util/win/exception_handler_server.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: handler/main.cc
diff --git a/handler/main.cc b/handler/main.cc
index 860951dc4476e7688e654b9a34c054bc173b4ede..64a49d563cc40e6be0330f228fcaf698598d9001 100644
--- a/handler/main.cc
+++ b/handler/main.cc
@@ -216,9 +216,9 @@ int HandlerMain(int argc, char* argv[]) {
}
#endif
+#if defined(OS_MACOSX)
ExceptionHandlerServer exception_handler_server;
-#if defined(OS_MACOSX)
CloseStdinAndStdout();
if (!ChildPortHandshake::RunClientForFD(
base::ScopedFD(options.handshake_fd),
@@ -226,6 +226,8 @@ int HandlerMain(int argc, char* argv[]) {
MACH_MSG_TYPE_MAKE_SEND)) {
return EXIT_FAILURE;
}
+#elif defined(OS_WIN)
+ ExceptionHandlerServer exception_handler_server(options.pipe_name);
#endif // OS_MACOSX
scoped_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
@@ -241,11 +243,7 @@ int HandlerMain(int argc, char* argv[]) {
CrashReportExceptionHandler exception_handler(
database.get(), &upload_thread, &options.annotations);
-#if defined(OS_MACOSX)
exception_handler_server.Run(&exception_handler);
-#elif defined(OS_WIN)
- exception_handler_server.Run(&exception_handler, options.pipe_name);
-#endif // OS_MACOSX
upload_thread.Stop();
« no previous file with comments | « no previous file | snapshot/win/exception_snapshot_win_test.cc » ('j') | util/win/exception_handler_server.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698