AppShell support for Mac.

extensions/shell/app/shell_main_delegate.cc

Index: extensions/shell/app/shell_main_delegate.cc
diff --git a/extensions/shell/app/shell_main_delegate.cc b/extensions/shell/app/shell_main_delegate.cc
index 69f0e6181b661fb1d15aec4b6a4fca096d28abe4..c1479fa9fa4392db31c50497fb1d629bcf203e5c 100644
--- a/extensions/shell/app/shell_main_delegate.cc
+++ b/extensions/shell/app/shell_main_delegate.cc
@@ -22,7 +22,12 @@
 #include "chromeos/chromeos_paths.h"
 #endif
 
-#if !defined(DISABLE_NACL)
+#if defined(OS_MACOSX)
+#include "extensions/shell/app/paths_mac.h"
+#endif
+
+#if !defined(DISABLE_NACL) && defined(OS_POSIX) && !defined(OS_MACOSX) && \
+    !defined(OS_ANDROID)
 #include "components/nacl/common/nacl_switches.h"
 #if defined(OS_LINUX)
 #include "components/nacl/common/nacl_paths.h"
@@ -61,6 +66,12 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   content_client_.reset(CreateContentClient());
   SetContentClient(content_client_.get());
 
+#if defined(OS_MACOSX)
+  OverrideChildProcessFilePath();
+  // This must happen before InitializeResourceBundle.
+  OverrideFrameworkBundlePath();
+#endif
+
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif
@@ -125,10 +136,16 @@ ShellMainDelegate::CreateShellContentUtilityClient() {
 
 void ShellMainDelegate::InitializeResourceBundle() {
   base::FilePath extensions_shell_and_test_pak_path;
+#if defined(OS_MACOSX)
+  extensions_shell_and_test_pak_path = GetResourcesPakFilePath();
+#else
   PathService::Get(base::DIR_MODULE, &extensions_shell_and_test_pak_path);
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(
+  extensions_shell_and_test_pak_path =
       extensions_shell_and_test_pak_path.AppendASCII(
-          "extensions_shell_and_test.pak"));
+          "extensions_shell_and_test.pak");
+#endif  // OS_MACOSX
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(
+      extensions_shell_and_test_pak_path);
 }
 
 // static