| Index: apps/shell/shell_main.cc
|
| diff --git a/apps/shell/shell_main.cc b/apps/shell/shell_main.cc
|
| index 4048c17524d3a2704138885ce08baf96018a3852..65e0bff5a376c095ff00889495b6abfe9d3db54b 100644
|
| --- a/apps/shell/shell_main.cc
|
| +++ b/apps/shell/shell_main.cc
|
| @@ -5,7 +5,25 @@
|
| #include "apps/shell/shell_main_delegate.h"
|
| #include "content/public/app/content_main.h"
|
|
|
| +#if defined(OS_WIN)
|
| +#include "content/public/app/startup_helper_win.h"
|
| +#include "sandbox/win/src/sandbox_types.h"
|
| +#endif
|
| +
|
| +#if defined(OS_WIN)
|
| +
|
| +int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
|
| + sandbox::SandboxInterfaceInfo sandbox_info = {0};
|
| + content::InitializeSandboxInfo(&sandbox_info);
|
| + apps::ShellMainDelegate delegate;
|
| + return content::ContentMain(instance, &sandbox_info, &delegate);
|
| +}
|
| +
|
| +#else
|
| +
|
| int main(int argc, const char** argv) {
|
| apps::ShellMainDelegate delegate;
|
| return content::ContentMain(argc, argv, &delegate);
|
| }
|
| +
|
| +#endif // OS_WIN
|
|
|