| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 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/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_WIN) | 14 #if defined(OS_WIN) |
| 15 | 15 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 28 int main(int argc, const char* argv[]) { | 28 int main(int argc, const char* argv[]) { |
| 29 #else | 29 #else |
| 30 int main(int argc, const char** argv) { | 30 int main(int argc, const char** argv) { |
| 31 #endif // OS_MACOSX | 31 #endif // OS_MACOSX |
| 32 | 32 |
| 33 ShellMainDelegate delegate; | 33 ShellMainDelegate delegate; |
| 34 return content::ContentMain(argc, argv, &delegate); | 34 return content::ContentMain(argc, argv, &delegate); |
| 35 } | 35 } |
| 36 | 36 |
| 37 #endif // OS_POSIX | 37 #endif // OS_POSIX |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 9375017:
Support sharing of ContentMain and BrowserMain code with embedded use cases (try #3). (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/