AppShell support for Mac.

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(OS_MACOSX)
+#include "extensions/shell/app/paths_mac.h"
+#endif
+
 #if !defined(DISABLE_NACL)
 #include "components/nacl/common/nacl_switches.h"
 #if defined(OS_LINUX)
 #include "components/nacl/common/nacl_paths.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
 
@@ skipping 19 matching lines @@
 }
 
 ShellMainDelegate::~ShellMainDelegate() {
 }
 
 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   InitLogging();
   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
 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
   nacl::RegisterPathProvider();
 #endif
   extensions::RegisterPathProvider();
   return false;
 }
 
@@ skipping 44 matching lines @@
   return new ShellContentRendererClient();
 }
 
 content::ContentUtilityClient*
 ShellMainDelegate::CreateShellContentUtilityClient() {
   return new ShellContentUtilityClient();
 }
 
 void ShellMainDelegate::InitializeResourceBundle() {
   base::FilePath extensions_shell_and_test_pak_path;
+#if defined(OS_MACOSX)
+  extensions_shell_and_test_pak_path = GetResourcesPakFilePath();

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

It feels a little weird that sometimes you call a function for this and
sometimes you don't.  It seems like there should either get one
GetResourcesPakFilePath() with #ifdef'd lines in the body, or separate
implementations of the function, or it should all be inlined.

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

I moved the GetResourcesPakFilePath implementation into this file and moved the
OS-specific logic into it.

+#else
   PathService::Get(base::DIR_MODULE, &extensions_shell_and_test_pak_path);
+  extensions_shell_and_test_pak_path =
+      extensions_shell_and_test_pak_path.AppendASCII(
+          "extensions_shell_and_test.pak");
+#endif  // OS_MACOSX
   ui::ResourceBundle::InitSharedInstanceWithPakPath(
-      extensions_shell_and_test_pak_path.AppendASCII(
-          "extensions_shell_and_test.pak"));
+      extensions_shell_and_test_pak_path);
 }
 
 // static
 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
 #if defined(OS_MACOSX)
          process_type == switches::kGpuProcess ||
 #endif
          process_type == switches::kUtilityProcess;
 }
 
 }  // namespace extensions