c3036d4557
* chore: bump chromium in DEPS to 117.0.5929.0 * chore: bump chromium in DEPS to 117.0.5931.0 * chore: bump chromium in DEPS to 117.0.5932.0 * chore: update patches * 4728317: Prevent PrintRenderFrameHelper from printing when already printing | https://chromium-review.googlesource.com/c/chromium/src/+/4728317 * 4739501: Use base::SequenceBound to manage SerialPortManagerImpl | https://chromium-review.googlesource.com/c/chromium/src/+/4739501 * 4702051: Allow overriding source in install-sysroot.py | https://chromium-review.googlesource.com/c/chromium/src/+/4702051 * chore: update filenames.libcxx.gni * 4727002: Rename "enable_arc2" to "enable_arc" | https://chromium-review.googlesource.com/c/chromium/src/+/4727002 * chore: bump chromium in DEPS to 117.0.5934.0 * 4736873: Rename ColorSpaces methods on display::Display | https://chromium-review.googlesource.com/c/chromium/src/+/4736873 * 4727203: Replace bool with an enum in as suggested in DevtoolsManagerDelegate. | https://chromium-review.googlesource.com/c/chromium/src/+/4727203 * 4744479: [DevTools] Add 'generateTaggedPDF' option to DevTools Page.printToPDF | https://chromium-review.googlesource.com/c/chromium/src/+/4744479 * 4735893: Don't share WebUSB permissions with webviews | https://chromium-review.googlesource.com/c/chromium/src/+/4735893 * revert: update filenames.libcxx.gni * chore: bump chromium in DEPS to 117.0.5936.0 * chore: update patches * 4746465: SAA: Query for embargoed StorageAccess permissions | https://chromium-review.googlesource.com/c/chromium/src/+/4746465 * 4666325: Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src. | https://chromium-review.googlesource.com/c/chromium/src/+/4666325 * chore: bump chromium in DEPS to 117.0.5938.0 * chore: bump chromium in DEPS to 118.0.5939.0 * chore: update patches * Send line bounds through CursorAnchorInfo on requestCursorUpdate https://chromium-review.googlesource.com/c/chromium/src/+/4394588 * Fixup lint for Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src * 4700305: [mac] Fix override of CHILD_PROCESS_EXE https://chromium-review.googlesource.com/c/chromium/src/+/4700305 Needed because of 4729689: Reland "Remove redundant existence check in PathService" | https://chromium-review.googlesource.com/c/chromium/src/+/4729689 * 4753759: More consistent icon handling for menus. https://chromium-review.googlesource.com/c/chromium/src/+/4753759 * chore: bump chromium in DEPS to 118.0.5941.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5938.0 * test: update nan-spec-runner cflags * build: fix isystem include path in nan-spec-runner * fixup! 4666325: Move buildtools/third_party/lib*/trunk source paths to third_party/lib*/src. | https://chromium-review.googlesource.com/c/chromium/src/+/4666325 fix a few more instances of the old path libc++.a and libc++abi.a are still in buildtools/ --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
94 lines
3.2 KiB
Text
94 lines
3.2 KiB
Text
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/app/electron_main_delegate.h"
|
|
|
|
#include <string>
|
|
|
|
#include "base/apple/bundle_locations.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/mac/foundation_util.h"
|
|
#include "base/path_service.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "content/browser/mac_helpers.h"
|
|
#include "content/public/common/content_paths.h"
|
|
#include "shell/browser/mac/electron_application.h"
|
|
#include "shell/common/application_info.h"
|
|
#include "shell/common/mac/main_application_bundle.h"
|
|
|
|
#if !defined(__has_feature) || !__has_feature(objc_arc)
|
|
#error "This file requires ARC support."
|
|
#endif
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
base::FilePath GetFrameworksPath() {
|
|
return MainApplicationBundlePath().Append("Contents").Append("Frameworks");
|
|
}
|
|
|
|
base::FilePath GetHelperAppPath(const base::FilePath& frameworks_path,
|
|
const std::string& name) {
|
|
// Figure out what helper we are running
|
|
base::FilePath path;
|
|
base::PathService::Get(base::FILE_EXE, &path);
|
|
|
|
std::string helper_name = "Helper";
|
|
if (base::EndsWith(path.value(), content::kMacHelperSuffix_renderer,
|
|
base::CompareCase::SENSITIVE)) {
|
|
helper_name += content::kMacHelperSuffix_renderer;
|
|
} else if (base::EndsWith(path.value(), content::kMacHelperSuffix_gpu,
|
|
base::CompareCase::SENSITIVE)) {
|
|
helper_name += content::kMacHelperSuffix_gpu;
|
|
} else if (base::EndsWith(path.value(), content::kMacHelperSuffix_plugin,
|
|
base::CompareCase::SENSITIVE)) {
|
|
helper_name += content::kMacHelperSuffix_plugin;
|
|
}
|
|
|
|
return frameworks_path.Append(name + " " + helper_name + ".app")
|
|
.Append("Contents")
|
|
.Append("MacOS")
|
|
.Append(name + " " + helper_name);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
void ElectronMainDelegate::OverrideFrameworkBundlePath() {
|
|
base::apple::SetOverrideFrameworkBundlePath(
|
|
GetFrameworksPath().Append(ELECTRON_PRODUCT_NAME " Framework.framework"));
|
|
}
|
|
|
|
void ElectronMainDelegate::OverrideChildProcessPath() {
|
|
base::FilePath frameworks_path = GetFrameworksPath();
|
|
base::FilePath helper_path =
|
|
GetHelperAppPath(frameworks_path, ELECTRON_PRODUCT_NAME);
|
|
if (!base::PathExists(helper_path))
|
|
helper_path = GetHelperAppPath(frameworks_path, GetApplicationName());
|
|
if (!base::PathExists(helper_path))
|
|
LOG(FATAL) << "Unable to find helper app";
|
|
base::PathService::OverrideAndCreateIfNeeded(
|
|
content::CHILD_PROCESS_EXE, helper_path, /*is_absolute=*/true,
|
|
/*create=*/false);
|
|
}
|
|
|
|
void ElectronMainDelegate::SetUpBundleOverrides() {
|
|
@autoreleasepool {
|
|
NSBundle* bundle = MainApplicationBundle();
|
|
std::string base_bundle_id =
|
|
base::SysNSStringToUTF8([bundle bundleIdentifier]);
|
|
NSString* team_id = [bundle objectForInfoDictionaryKey:@"ElectronTeamID"];
|
|
if (team_id)
|
|
base_bundle_id = base::SysNSStringToUTF8(team_id) + "." + base_bundle_id;
|
|
base::mac::SetBaseBundleID(base_bundle_id.c_str());
|
|
}
|
|
}
|
|
|
|
void RegisterAtomCrApp() {
|
|
// Force the NSApplication subclass to be used.
|
|
[AtomApplication sharedApplication];
|
|
}
|
|
|
|
} // namespace electron
|