| Index: ash/shell/content/shell_with_content_main.cc
|
| diff --git a/ash/shell/content/shell_with_content_main.cc b/ash/shell/content/shell_with_content_main.cc
|
| index 59bba9729e2de8d5700ef12eee78d1262b448106..55e159b44bd1932eb8547763d835f4b17eee48e6 100644
|
| --- a/ash/shell/content/shell_with_content_main.cc
|
| +++ b/ash/shell/content/shell_with_content_main.cc
|
| @@ -9,18 +9,7 @@
|
| #include "base/path_service.h"
|
| #include "content/public/app/content_main.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "content/public/app/sandbox_helper_win.h"
|
| -#include "sandbox/win/src/sandbox_types.h"
|
| -#endif
|
| -
|
| -#if defined(OS_WIN)
|
| -int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
|
| - int argc = 0;
|
| - char** argv = nullptr;
|
| -#else
|
| int main(int argc, const char** argv) {
|
| -#endif
|
| base::CommandLine::Init(argc, argv);
|
| base::AtExitManager exit_manager;
|
|
|
| @@ -35,16 +24,8 @@ int main(int argc, const char** argv) {
|
|
|
| ash::shell::ShellMainDelegate delegate;
|
| content::ContentMainParams params(&delegate);
|
| -
|
| -#if defined(OS_WIN)
|
| - sandbox::SandboxInterfaceInfo sandbox_info = {0};
|
| - content::InitializeSandboxInfo(&sandbox_info);
|
| - params.instance = instance;
|
| - params.sandbox_info = &sandbox_info;
|
| -#else
|
| params.argc = argc;
|
| params.argv = argv;
|
| -#endif
|
|
|
| return content::ContentMain(params);
|
| }
|
|
|