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

Unified Diff: content/shell/app/shell_main.cc

Issue 394853002: Make content_shell.exe a console app in ASan/Win builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix whitespace Created 6 years, 5 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 | « content/content_shell.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main.cc
diff --git a/content/shell/app/shell_main.cc b/content/shell/app/shell_main.cc
index 4a04d8d826f44e47631811bd41e5da4d0204a49b..338570f56585d6559cc17f484bad0a8eb65c4b39 100644
--- a/content/shell/app/shell_main.cc
+++ b/content/shell/app/shell_main.cc
@@ -16,7 +16,14 @@
#if defined(OS_WIN)
+#if !defined(ADDRESS_SANITIZER)
int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
+#else
+// The AddressSanitizer build should be a console program as it prints out stuff
+// on stderr.
+int main() {
+ HINSTANCE instance = GetModuleHandle(NULL);
+#endif
sandbox::SandboxInterfaceInfo sandbox_info = {0};
content::InitializeSandboxInfo(&sandbox_info);
content::ShellMainDelegate delegate;
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698