First pass at content shell for the Mac. Doesn't work yet.

BUG=115784
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9513006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125254 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 7 deletions

diff --git a/content/shell/shell_main.cc b/content/shell/shell_main.cc
index 8c4892f..7e4eaf7 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