Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-aura implementations.

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 d7aa5abe558d25de86e83904e22879e89fcab362..69f0e6181b661fb1d15aec4b6a4fca096d28abe4 100644
--- a/extensions/shell/app/shell_main_delegate.cc
+++ b/extensions/shell/app/shell_main_delegate.cc
@@ -26,8 +26,10 @@
 #include "components/nacl/common/nacl_switches.h"
 #if defined(OS_LINUX)
 #include "components/nacl/common/nacl_paths.h"
-#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
 #endif  // OS_LINUX
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
+#endif  // OS_POSIX && !OS_MACOSX && !OS_ANDROID
 #endif  // !DISABLE_NACL
 
 namespace {
@@ -140,6 +142,9 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle(
 #if !defined(DISABLE_NACL)
          process_type == switches::kNaClLoaderProcess ||
 #endif
+#if defined(OS_MACOSX)
+         process_type == switches::kGpuProcess ||
+#endif
          process_type == switches::kUtilityProcess;
 }