| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/shell/app/shell_main_delegate.h" | 6 #include "extensions/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 "extensions/shell/app/shell_main_mac.h" | 14 #include "extensions/shell/app/shell_main_mac.h" |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 #if defined(OS_MACOSX) | 17 #if defined(OS_MACOSX) |
| 18 int main(int argc, const char** argv) { | 18 int main(int argc, const char** argv) { |
| 19 // Do the delegate work in shell_main_mac to avoid having to export the | 19 // Do the delegate work in shell_main_mac to avoid having to export the |
| (...skipping 16 matching lines...) Expand all Loading... |
| 36 int main(int argc, const char** argv) { | 36 int main(int argc, const char** argv) { |
| 37 extensions::ShellMainDelegate delegate; | 37 extensions::ShellMainDelegate delegate; |
| 38 content::ContentMainParams params(&delegate); | 38 content::ContentMainParams params(&delegate); |
| 39 | 39 |
| 40 params.argc = argc; | 40 params.argc = argc; |
| 41 params.argv = argv; | 41 params.argv = argv; |
| 42 | 42 |
| 43 return content::ContentMain(params); | 43 return content::ContentMain(params); |
| 44 } | 44 } |
| 45 #endif | 45 #endif |
| OLD | NEW |