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

Unified Diff: content/shell/shell_main.cc

Issue 9513006: First pass at content shell for the Mac. Doesn't work yet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only, no code change Created 8 years, 10 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 | « content/shell/shell_content_main.cc ('k') | tools/checkperms/checkperms.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_main.cc
diff --git a/content/shell/shell_main.cc b/content/shell/shell_main.cc
index 8c4892f8affe0f8785cd55e8f4716a26ce8875a0..7e4eaf7244fefa3bd5cf7ed39921d9f4e5f5e52e 100644
--- a/content/shell/shell_main.cc
+++ b/content/shell/shell_main.cc
@@ -11,6 +11,10 @@
#include "content/public/app/startup_helper_win.h"
#endif
+#if defined(OS_MACOSX)
+#include "content/shell/shell_content_main.h"
+#endif
+
#if defined(OS_WIN)
int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
@@ -19,19 +23,18 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
ShellMainDelegate delegate;
return content::ContentMain(instance, &sandbox_info, &delegate);
}
-#endif
-#if defined(OS_POSIX)
+#else
+int main(int argc, const char** argv) {
#if defined(OS_MACOSX)
-__attribute__((visibility("default")))
-int main(int argc, const char* argv[]) {
+ // Do the delegate work in shell_content_main to avoid having to export the
+ // delegate types.
+ return ::ContentMain(argc, argv);
#else
-int main(int argc, const char** argv) {
-#endif // OS_MACOSX
-
ShellMainDelegate delegate;
return content::ContentMain(argc, argv, &delegate);
+#endif // OS_MACOSX
}
#endif // OS_POSIX
« no previous file with comments | « content/shell/shell_content_main.cc ('k') | tools/checkperms/checkperms.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698