Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2535)

Unified Diff: ash/shell/content/shell_with_content_main.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell/content/client/shell_browser_main_parts.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « ash/shell/content/client/shell_browser_main_parts.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698