| 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/sandbox_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 #if !defined(ADDRESS_SANITIZER) |
| (...skipping 24 matching lines...) Expand all Loading... |
| 44 #else | 44 #else |
| 45 content::ShellMainDelegate delegate; | 45 content::ShellMainDelegate delegate; |
| 46 content::ContentMainParams params(&delegate); | 46 content::ContentMainParams params(&delegate); |
| 47 params.argc = argc; | 47 params.argc = argc; |
| 48 params.argv = argv; | 48 params.argv = argv; |
| 49 return content::ContentMain(params); | 49 return content::ContentMain(params); |
| 50 #endif // OS_MACOSX | 50 #endif // OS_MACOSX |
| 51 } | 51 } |
| 52 | 52 |
| 53 #endif // OS_POSIX | 53 #endif // OS_POSIX |
| OLD | NEW |