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

extensions/shell/app/shell_main_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/shell/app/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/shell/browser/default_shell_browser_main_delegate.h"
 #include "extensions/shell/browser/shell_content_browser_client.h"
 #include "extensions/shell/common/shell_content_client.h"
 #include "extensions/shell/renderer/shell_content_renderer_client.h"
 #include "extensions/shell/utility/shell_content_utility_client.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #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 {
 
 void InitLogging() {
   base::FilePath log_filename;
   PathService::Get(base::DIR_EXE, &log_filename);
   log_filename = log_filename.AppendASCII("app_shell.log");
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_ALL;
   settings.log_file = log_filename.value().c_str();
@@ skipping 44 matching lines @@
 ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(CreateShellContentRendererClient());
   return renderer_client_.get();
 }
 
 content::ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
   utility_client_.reset(CreateShellContentUtilityClient());
   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();
 }
 
 content::ContentBrowserClient*
 ShellMainDelegate::CreateShellContentBrowserClient() {
   return new ShellContentBrowserClient(new DefaultShellBrowserMainDelegate());
 }
 
@@ skipping 19 matching lines @@
 bool ShellMainDelegate::ProcessNeedsResourceBundle(
     const std::string& process_type) {
   // The browser process has no process type flag, but needs resources.
   // On Linux the zygote process opens the resources for the renderers.
   return process_type.empty() ||
          process_type == switches::kZygoteProcess ||
          process_type == switches::kRendererProcess ||
 #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