| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/public/app/content_main.h" | 5 #include "content/public/app/content_main.h" |
| 6 #include "content/shell/app/shell_main_delegate.h" | 6 #include "content/shell/app/shell_main_delegate.h" |
| 7 | 7 |
| 8 #if defined(OS_WIN) | 8 #if defined(OS_WIN) |
| 9 #include "content/public/app/startup_helper_win.h" | 9 #include "content/public/app/startup_helper_win.h" |
| 10 #include "sandbox/win/src/sandbox_types.h" | 10 #include "sandbox/win/src/sandbox_types.h" |
| 11 #endif | 11 #endif |
| 12 | 12 |
| 13 #if defined(OS_MACOSX) | 13 #if defined(OS_MACOSX) |
| 14 #include "content/shell/app/shell_content_main.h" | 14 #include "content/shell/app/shell_content_main.h" |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
| 18 | 18 |
| 19 #if !defined(ADDRESS_SANITIZER) |
| 19 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { | 20 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
| 21 #else |
| 22 // The AddressSanitizer build should be a console program as it prints out stuff |
| 23 // on stderr. |
| 24 int main() { |
| 25 HINSTANCE instance = GetModuleHandle(NULL); |
| 26 #endif |
| 20 sandbox::SandboxInterfaceInfo sandbox_info = {0}; | 27 sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
| 21 content::InitializeSandboxInfo(&sandbox_info); | 28 content::InitializeSandboxInfo(&sandbox_info); |
| 22 content::ShellMainDelegate delegate; | 29 content::ShellMainDelegate delegate; |
| 23 | 30 |
| 24 content::ContentMainParams params(&delegate); | 31 content::ContentMainParams params(&delegate); |
| 25 params.instance = instance; | 32 params.instance = instance; |
| 26 params.sandbox_info = &sandbox_info; | 33 params.sandbox_info = &sandbox_info; |
| 27 return content::ContentMain(params); | 34 return content::ContentMain(params); |
| 28 } | 35 } |
| 29 | 36 |
| 30 #else | 37 #else |
| 31 | 38 |
| 32 int main(int argc, const char** argv) { | 39 int main(int argc, const char** argv) { |
| 33 #if defined(OS_MACOSX) | 40 #if defined(OS_MACOSX) |
| 34 // Do the delegate work in shell_content_main to avoid having to export the | 41 // Do the delegate work in shell_content_main to avoid having to export the |
| 35 // delegate types. | 42 // delegate types. |
| 36 return ::ContentMain(argc, argv); | 43 return ::ContentMain(argc, argv); |
| 37 #else | 44 #else |
| 38 content::ShellMainDelegate delegate; | 45 content::ShellMainDelegate delegate; |
| 39 content::ContentMainParams params(&delegate); | 46 content::ContentMainParams params(&delegate); |
| 40 params.argc = argc; | 47 params.argc = argc; |
| 41 params.argv = argv; | 48 params.argv = argv; |
| 42 return content::ContentMain(params); | 49 return content::ContentMain(params); |
| 43 #endif // OS_MACOSX | 50 #endif // OS_MACOSX |
| 44 } | 51 } |
| 45 | 52 |
| 46 #endif // OS_POSIX | 53 #endif // OS_POSIX |
| OLD | NEW |