mac: Force using "Atom" as application name in framework bundle path.

app/atom_main_delegate.cc

@@ -9,27 +9,7 @@
 #include "browser/atom_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "renderer/atom_renderer_client.h"
-
+#include "ui/base/resource/resource_bundle.h"
-#if defined(OS_MACOSX)
-
-#include "base/mac/bundle_locations.h"
-#include "base/path_service.h"
-#include "content/public/common/content_paths.h"
-
-namespace brightray {
-base::FilePath MainApplicationBundlePath();
-}
-
-namespace {
-
-base::FilePath GetFrameworksPath() {
-  return brightray::MainApplicationBundlePath().Append("Contents")
-                                               .Append("Frameworks");
-}
-
-}  // namespace
-
-#endif  // defined(OS_MACOSX)
 
 namespace atom {
 
@@ -59,23 +39,31 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
 }
 
 void AtomMainDelegate::PreSandboxStartup() {
-  brightray::MainDelegate::PreSandboxStartup();
-
 #if defined(OS_MACOSX)
-  // Override the path to helper process, since third party users may want to
+  OverrideChildProcessPath();
-  // change the application name.
+  OverrideFrameworkBundlePath();
-  base::FilePath helper_path = GetFrameworksPath().Append("Atom Helper.app")
+  SetProcessName();
-                                                  .Append("Contents")
+#endif
-                                                  .Append("MacOS")
+  InitializeResourceBundle();
-                                                  .Append("Atom Helper");
-  PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
-#endif  // defined(OS_MACOSX)
 
   // Disable renderer sandbox for most of node's functions.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(switches::kNoSandbox);
 }
 
+void AtomMainDelegate::InitializeResourceBundle() {
+  base::FilePath path;
+#if defined(OS_MACOSX)
+  path = GetResourcesPakFilePath();
+#else
+  base::FilePath pak_dir;
+  PathService::Get(base::DIR_MODULE, &pak_dir);
+  path = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
+#endif
+
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(path);
+}
+
 content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new AtomBrowserClient);
   return browser_client_.get();

app/atom_main_delegate.h

@@ -17,6 +17,14 @@ class AtomMainDelegate : public brightray::MainDelegate {
  protected:
   virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
   virtual void PreSandboxStartup() OVERRIDE;
+  virtual void InitializeResourceBundle();
+
+#if defined(OS_MACOSX)
+  virtual base::FilePath GetResourcesPakFilePath();
+  virtual void OverrideChildProcessPath();
+  virtual void OverrideFrameworkBundlePath();
+  virtual void SetProcessName();
+#endif
 
  private:
   virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;

app/atom_main_delegate_mac.mm

@@ -0,0 +1,66 @@
+// Copyright (c) 2013 GitHub, Inc. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "app/atom_main_delegate.h"
+
+#import "base/mac/bundle_locations.h"
+#import "base/mac/foundation_util.h"
+#import "base/mac/mac_util.h"
+#include "base/command_line.h"
+#include "base/path_service.h"
+#include "base/strings/sys_string_conversions.h"
+#include "content/public/common/content_paths.h"
+#include "content/public/common/content_switches.h"
+#include "vendor/brightray/common/application_info.h"
+#include "vendor/brightray/common/mac/main_application_bundle.h"
+
+namespace atom {
+
+namespace {
+
+base::FilePath GetFrameworksPath() {
+  return brightray::MainApplicationBundlePath().Append("Contents")
+                                               .Append("Frameworks");
+}
+
+}  // namespace
+
+base::FilePath AtomMainDelegate::GetResourcesPakFilePath() {
+  NSString* path = [base::mac::FrameworkBundle()
+      pathForResource:@"content_shell" ofType:@"pak"];
+  return base::mac::NSStringToFilePath(path);
+}
+
+void AtomMainDelegate::OverrideFrameworkBundlePath() {
+  base::mac::SetOverrideFrameworkBundlePath(
+      GetFrameworksPath().Append("Atom.framework"));
+}
+
+void AtomMainDelegate::OverrideChildProcessPath() {
+  base::FilePath helper_path = GetFrameworksPath().Append("Atom Helper.app")
+                                                  .Append("Contents")
+                                                  .Append("MacOS")
+                                                  .Append("Atom Helper");
+  PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
+}
+
+void AtomMainDelegate::SetProcessName() {
+  const auto& command_line = *CommandLine::ForCurrentProcess();
+  auto process_type = command_line.GetSwitchValueASCII(switches::kProcessType);
+  std::string suffix;
+  if (process_type == switches::kRendererProcess)
+    suffix = "Renderer";
+  else if (process_type == switches::kPluginProcess ||
+           process_type == switches::kPpapiPluginProcess)
+    suffix = "Plug-In Host";
+  else if (process_type == switches::kUtilityProcess)
+    suffix = "Utility";
+  else
+    return;
+
+  base::mac::SetProcessName(base::mac::NSToCFCast(base::SysUTF8ToNSString(
+      brightray::GetApplicationName() + " " + suffix)));
+}
+
+}  // namespace atom

atom.gyp

@@ -33,6 +33,7 @@
     'lib_sources': [
       'app/atom_main_delegate.cc',
       'app/atom_main_delegate.h',
+      'app/atom_main_delegate_mac.mm',
       'browser/api/atom_api_app.cc',
       'browser/api/atom_api_app.h',
       'browser/api/atom_api_auto_updater.cc',