AppShell support for Mac.

extensions/shell/app/shell_main_mac.cc

Index: extensions/shell/app/shell_main_mac.cc
diff --git a/athena/main/athena_main.cc b/extensions/shell/app/shell_main_mac.cc
similarity index 59%
copy from athena/main/athena_main.cc
copy to extensions/shell/app/shell_main_mac.cc
index 1eab12834d91880bac0f081dee247302f3165e10..9416f4f65b495422cb3fd5843159638be1c597d1 100644
--- a/athena/main/athena_main.cc
+++ b/extensions/shell/app/shell_main_mac.cc
@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "athena/main/athena_main_delegate.h"
+#include "extensions/shell/app/shell_main_mac.h"
+
 #include "content/public/app/content_main.h"
+#include "extensions/shell/app/shell_main_delegate.h"
 
-int main(int argc, const char** argv) {
-  athena::AthenaMainDelegate delegate;
+#if defined(OS_MACOSX)
+int ContentMain(int argc, const char** argv) {
+  extensions::ShellMainDelegate delegate;

[James Cook, 2014/12/10 21:05:00]

ugh, this seems like the worst of both worlds -- ifdef soup in the other file
and code duplication in this file.  Is this the way content_shell handles it? 
What about either duplicating the ShellMainDelegate part three times, or
consolidating all the code in shell_main.cc?

[Yoyo Zhou, 2014/12/11 02:40:50]

This is the way content_shell does it. It's little enough code that I'm not too
concerned, but I agree it's not ideal.

   content::ContentMainParams params(&delegate);
-
   params.argc = argc;
   params.argv = argv;
-
   return content::ContentMain(params);
 }
+#endif  // OS_MACOSX