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