Index: ui/views/examples/content_client/examples_main.cc |
=================================================================== |
--- ui/views/examples/content_client/examples_main.cc (revision 255719) |
+++ ui/views/examples/content_client/examples_main.cc (working copy) |
@@ -12,14 +12,21 @@ |
#if defined(OS_WIN) |
int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
+#else |
+int main(int argc, const char** argv) { |
+#endif |
+ views::examples::ExamplesMainDelegate delegate; |
+ content::ContentMainParams params(&delegate); |
+ |
+#if defined(OS_WIN) |
sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
content::InitializeSandboxInfo(&sandbox_info); |
- views::examples::ExamplesMainDelegate delegate; |
- return content::ContentMain(instance, &sandbox_info, &delegate); |
-} |
+ params.instance = instance; |
+ params.sandbox_info = &sandbox_info; |
#else |
-int main(int argc, const char** argv) { |
- views::examples::ExamplesMainDelegate delegate; |
- return content::ContentMain(argc, argv, &delegate); |
+ params.argc = argc; |
+ params.argv = argv; |
+#endif |
+ |
+ return content::ContentMain(params); |
} |
-#endif |