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

Unified Diff: apps/shell/shell_main.cc

Issue 149463002: [App Shell] Port app_shell to windows aura.(not use) (Closed) Base URL: https://github.com/mirrors/chromium.git@master
Patch Set: Created 6 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
« apps/DEPS ('K') | « apps/apps.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/shell_main.cc
diff --git a/apps/shell/shell_main.cc b/apps/shell/shell_main.cc
index 4048c17524d3a2704138885ce08baf96018a3852..fd1bac9afe667cada93b7f46b2cb6b6c06c0b548 100644
--- a/apps/shell/shell_main.cc
+++ b/apps/shell/shell_main.cc
@@ -4,8 +4,26 @@
#include "apps/shell/shell_main_delegate.h"
#include "content/public/app/content_main.h"
+#include "sandbox/win/src/sandbox_types.h"
James Cook 2014/01/29 20:42:00 should this go inside the ifdef below?
Haojian Wu 2014/01/30 06:28:47 Yes. Done.
+
+#if defined(OS_WIN)
+#include "content/public/app/startup_helper_win.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
James Cook 2014/01/29 20:42:00 optional nit: consider // defined(OS_WIN) since th
Haojian Wu 2014/01/30 06:28:47 Done.
« apps/DEPS ('K') | « apps/apps.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698