summaryrefslogtreecommitdiffstats
path: root/chromium/content/app/content_main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/app/content_main.cc')
-rw-r--r--chromium/content/app/content_main.cc20
1 files changed, 2 insertions, 18 deletions
diff --git a/chromium/content/app/content_main.cc b/chromium/content/app/content_main.cc
index c82d7904da4..77277ff6480 100644
--- a/chromium/content/app/content_main.cc
+++ b/chromium/content/app/content_main.cc
@@ -9,26 +9,10 @@
namespace content {
-#if defined(OS_WIN)
-int ContentMain(HINSTANCE instance,
- sandbox::SandboxInterfaceInfo* sandbox_info,
- ContentMainDelegate* delegate) {
-#else
-int ContentMain(int argc,
- const char** argv,
- ContentMainDelegate* delegate) {
-#endif // OS_WIN
-
+int ContentMain(const ContentMainParams& params) {
scoped_ptr<ContentMainRunner> main_runner(ContentMainRunner::Create());
- int exit_code;
-
-#if defined(OS_WIN)
- exit_code = main_runner->Initialize(instance, sandbox_info, delegate);
-#else
- exit_code = main_runner->Initialize(argc, argv, delegate);
-#endif // OS_WIN
-
+ int exit_code = main_runner->Initialize(params);
if (exit_code >= 0)
return exit_code;