| 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 | 6 |
| 7 #include "content/shell/shell_main_delegate.h" | 7 #include "content/shell/shell_main_delegate.h" |
| 8 #include "sandbox/src/sandbox_types.h" | 8 #include "sandbox/src/sandbox_types.h" |
| 9 | 9 |
| 10 #if defined(OS_WIN) | 10 #if defined(OS_WIN) |
| 11 #include "content/public/app/startup_helper_win.h" | 11 #include "content/public/app/startup_helper_win.h" |
| 12 #endif | 12 #endif |
| 13 | 13 |
| 14 #if defined(OS_MACOSX) |
| 15 #include "content/shell/shell_content_main.h" |
| 16 #endif |
| 17 |
| 14 #if defined(OS_WIN) | 18 #if defined(OS_WIN) |
| 15 | 19 |
| 16 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { | 20 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
| 17 sandbox::SandboxInterfaceInfo sandbox_info = {0}; | 21 sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
| 18 content::InitializeSandboxInfo(&sandbox_info); | 22 content::InitializeSandboxInfo(&sandbox_info); |
| 19 ShellMainDelegate delegate; | 23 ShellMainDelegate delegate; |
| 20 return content::ContentMain(instance, &sandbox_info, &delegate); | 24 return content::ContentMain(instance, &sandbox_info, &delegate); |
| 21 } | 25 } |
| 22 #endif | |
| 23 | 26 |
| 24 #if defined(OS_POSIX) | 27 #else |
| 25 | 28 |
| 29 int main(int argc, const char** argv) { |
| 26 #if defined(OS_MACOSX) | 30 #if defined(OS_MACOSX) |
| 27 __attribute__((visibility("default"))) | 31 // Do the delegate work in shell_content_main to avoid having to export the |
| 28 int main(int argc, const char* argv[]) { | 32 // delegate types. |
| 33 return ::ContentMain(argc, argv); |
| 29 #else | 34 #else |
| 30 int main(int argc, const char** argv) { | |
| 31 #endif // OS_MACOSX | |
| 32 | |
| 33 ShellMainDelegate delegate; | 35 ShellMainDelegate delegate; |
| 34 return content::ContentMain(argc, argv, &delegate); | 36 return content::ContentMain(argc, argv, &delegate); |
| 37 #endif // OS_MACOSX |
| 35 } | 38 } |
| 36 | 39 |
| 37 #endif // OS_POSIX | 40 #endif // OS_POSIX |
| OLD | NEW |