OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "apps/shell/app/shell_main_delegate.h" | 5 #include "apps/shell/app/shell_main_delegate.h" |
| 6 #include "apps/shell/browser/default_shell_browser_main_delegate.h" |
6 #include "content/public/app/content_main.h" | 7 #include "content/public/app/content_main.h" |
7 | 8 |
8 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
9 #include "content/public/app/startup_helper_win.h" | 10 #include "content/public/app/startup_helper_win.h" |
10 #include "sandbox/win/src/sandbox_types.h" | 11 #include "sandbox/win/src/sandbox_types.h" |
11 #endif | 12 #endif |
12 | 13 |
13 #if defined(OS_WIN) | 14 #if defined(OS_WIN) |
14 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { | 15 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
15 #else | 16 #else |
16 int main(int argc, const char** argv) { | 17 int main(int argc, const char** argv) { |
17 #endif | 18 #endif |
18 apps::ShellMainDelegate delegate; | 19 apps::DefaultShellBrowserMainDelegate browser_main_delegate; |
| 20 apps::ShellMainDelegate delegate(&browser_main_delegate); |
19 content::ContentMainParams params(&delegate); | 21 content::ContentMainParams params(&delegate); |
20 | 22 |
21 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
22 sandbox::SandboxInterfaceInfo sandbox_info = {0}; | 24 sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
23 content::InitializeSandboxInfo(&sandbox_info); | 25 content::InitializeSandboxInfo(&sandbox_info); |
24 params.instance = instance; | 26 params.instance = instance; |
25 params.sandbox_info = &sandbox_info; | 27 params.sandbox_info = &sandbox_info; |
26 #else | 28 #else |
27 params.argc = argc; | 29 params.argc = argc; |
28 params.argv = argv; | 30 params.argv = argv; |
29 #endif | 31 #endif |
30 | 32 |
31 return content::ContentMain(params); | 33 return content::ContentMain(params); |
32 } | 34 } |
OLD | NEW |