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..8db9ac761f4ee4b00225edc84b0118291b570120 100644
--- a/extensions/shell/app/shell_main_delegate.cc
+++ b/extensions/shell/app/shell_main_delegate.cc
@@ -22,13 +22,14 @@
 #include "chromeos/chromeos_paths.h"
 #endif
 
-#if !defined(DISABLE_NACL)
+#if !defined(DISABLE_NACL) && defined(OS_POSIX) && !defined(OS_MACOSX) && \

[James Cook, 2014/11/11 18:23:52]

Are you sure this is right? kNaClLoaderProcess are used below in some code that
is just wrapped with !defined(DISABLE_NACL).

Is your plan to only support NaCl on Posix?  It would be nice if it had a chance
of working elsewhere for tests.

[Yoyo Zhou, 2014/11/15 01:05:44]

These are the requirements for ZygoteStarting, but I missed that
kNaClLoaderProcess is used below. I agree it would be nice to have working NaCl,
but it's not my first priority. In this patch I'm just isolating out the parts
with Linux-specific stuff.

+    !defined(OS_ANDROID) && !defined(OS_IOS)
 #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
-#endif  // !DISABLE_NACL
+#endif  // !DISABLE_NACL && OS_POSIX && !OS_MACOSX && !OS_ANDROID && !OS_IOS
 
 namespace {
 
@@ -93,14 +94,15 @@ content::ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
   return utility_client_.get();
 }
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
+    !defined(OS_IOS)
 void ShellMainDelegate::ZygoteStarting(
     ScopedVector<content::ZygoteForkDelegate>* delegates) {
 #if !defined(DISABLE_NACL)
   nacl::AddNaClZygoteForkDelegates(delegates);
 #endif  // DISABLE_NACL
 }
-#endif  // OS_POSIX && !OS_MACOSX && !OS_ANDROID
+#endif  // OS_POSIX && !OS_MACOSX && !OS_ANDROID && !OS_IOS
 
 content::ContentClient* ShellMainDelegate::CreateContentClient() {
   return new ShellContentClient();
@@ -140,7 +142,8 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle(
 #if !defined(DISABLE_NACL)
          process_type == switches::kNaClLoaderProcess ||
 #endif
-         process_type == switches::kUtilityProcess;
+         process_type == switches::kUtilityProcess ||
+         process_type == switches::kGpuProcess;

[James Cook, 2014/11/11 18:23:52]

In Chrome this is only needed on Mac OS -- is this right?

[Yoyo Zhou, 2014/11/15 01:05:44]

I think that's right.

 }
 
 }  // namespace extensions