2014-12-29 17:35:08 +00:00
|
|
|
// Copyright (c) 2014 GitHub, Inc.
|
|
|
|
// Use of this source code is governed by the MIT license that can be
|
|
|
|
// found in the LICENSE file.
|
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
#include "shell/app/electron_main_delegate.h"
|
2014-12-29 17:35:08 +00:00
|
|
|
|
2019-05-02 12:05:37 +00:00
|
|
|
#include <string>
|
|
|
|
|
2023-05-23 19:58:58 +00:00
|
|
|
#include "base/apple/bundle_locations.h"
|
chore: bump chromium to 118.0.5975.0 (main) (#39531)
* chore: bump chromium in DEPS to 118.0.5951.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894
No logic changes, but patch needed to be manually re-applied due to upstream code shear
* chore: update port_autofill_colors_to_the_color_pipeline.patch
No manual changes; patch applied with fuzz
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5953.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5955.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5957.0
* chore: update patches
* chore: include path of native_web_keyboard_event.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
* chore: remove reference to eextensions/browser/notification-types.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627
* chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code?
* chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198
* chore: add auto_pip_setting_helper.[cc,h] to chromium_src build
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277
Exiting upstream code used by chromium_src now depends on this new upstream class
* chore: bump chromium in DEPS to 118.0.5959.0
* chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
manually adjust patch to minor upstream chagnes
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5961.0
* chore: bump chromium in DEPS to 118.0.5963.0
* chore: update patches
* 4780994: Rename various base files to "apple" since iOS uses them too
https://chromium-review.googlesource.com/c/chromium/src/+/4780994
* Many files moved from `mac` -> `apple`
This commit follows a handful of CLs that simply rename files/symbols to change `mac`
to `apple`
to signify their use across both macOS and iOS:
- 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header
- 4790744: Move foundation_util to base/apple, leave a forwarding header
- 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header
- 4787627: Move and rename macOS+iOS base/ files in PA to "apple"
- 4780399: Move OSStatus logging to base/apple
- 4787387: Remove forwarding headers
- 4781113: Rename message_pump_mac to "apple" because iOS uses it too
* fixup minor patch update error
A function param got dropped from this patch somewhere earlier
* chore: bump chromium in DEPS to 118.0.5965.2
* chore: update patches
* 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base::apple::
https://chromium-review.googlesource.com/c/chromium/src/+/4799213
* Fix removed include to BrowserContext
In crrev.com/c/4767962 an include to BrowserContext was removed,
which was necessary for compilation. This broke only for us because
"chrome/browser/profiles/profile.h" includes that class, but we remove
all references to profiles.
* chore: bump chromium in DEPS to 118.0.5967.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5969.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5971.0
* chore: bump chromium in DEPS to 118.0.5973.0
* chore: update patches
* 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper
https://chromium-review.googlesource.com/c/chromium/src/+/4772121
* 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate.
https://chromium-review.googlesource.com/c/chromium/src/+/4811164
* 4809488: Remove duplicate dnd functionality between Web and Renderer prefs
https://chromium-review.googlesource.com/c/chromium/src/+/4809488
Given that this is no longer an option of web preferences, we should
consider deprecating this option and then removing it.
* chore: bump chromium in DEPS to 118.0.5975.0
* chore: update patches
* fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build
* Reland "[windows] Remove RegKey::DeleteEmptyKey"
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255
* Ensure StrCat means StrCat
Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180
* fixup! Remove RegKey::DeleteEmptyKey
* Consistently reject large p and large q in DH
Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
2023-09-01 06:54:59 +00:00
|
|
|
#include "base/apple/foundation_util.h"
|
2014-12-29 17:35:08 +00:00
|
|
|
#include "base/files/file_path.h"
|
2015-04-14 05:51:08 +00:00
|
|
|
#include "base/files/file_util.h"
|
2014-12-29 17:35:08 +00:00
|
|
|
#include "base/path_service.h"
|
2016-05-19 01:57:57 +00:00
|
|
|
#include "base/strings/sys_string_conversions.h"
|
2023-02-03 11:43:42 +00:00
|
|
|
#include "content/browser/mac_helpers.h"
|
2014-12-29 17:35:08 +00:00
|
|
|
#include "content/public/common/content_paths.h"
|
2020-02-04 20:19:40 +00:00
|
|
|
#include "shell/browser/mac/electron_application.h"
|
2019-06-19 20:46:59 +00:00
|
|
|
#include "shell/common/application_info.h"
|
|
|
|
#include "shell/common/mac/main_application_bundle.h"
|
2014-12-29 17:35:08 +00:00
|
|
|
|
2019-06-19 21:23:04 +00:00
|
|
|
namespace electron {
|
2014-12-29 17:35:08 +00:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
base::FilePath GetFrameworksPath() {
|
2018-10-24 10:49:10 +00:00
|
|
|
return MainApplicationBundlePath().Append("Contents").Append("Frameworks");
|
2014-12-29 17:35:08 +00:00
|
|
|
}
|
|
|
|
|
2015-04-17 07:10:48 +00:00
|
|
|
base::FilePath GetHelperAppPath(const base::FilePath& frameworks_path,
|
2015-04-14 05:51:08 +00:00
|
|
|
const std::string& name) {
|
2019-07-03 01:22:09 +00:00
|
|
|
// Figure out what helper we are running
|
|
|
|
base::FilePath path;
|
|
|
|
base::PathService::Get(base::FILE_EXE, &path);
|
|
|
|
|
|
|
|
std::string helper_name = "Helper";
|
2024-04-24 02:13:59 +00:00
|
|
|
if (const auto& val = path.value();
|
|
|
|
val.ends_with(content::kMacHelperSuffix_renderer)) {
|
2019-07-03 01:22:09 +00:00
|
|
|
helper_name += content::kMacHelperSuffix_renderer;
|
2024-04-24 02:13:59 +00:00
|
|
|
} else if (val.ends_with(content::kMacHelperSuffix_gpu)) {
|
2019-07-24 22:58:51 +00:00
|
|
|
helper_name += content::kMacHelperSuffix_gpu;
|
2024-04-24 02:13:59 +00:00
|
|
|
} else if (val.ends_with(content::kMacHelperSuffix_plugin)) {
|
2019-07-03 01:22:09 +00:00
|
|
|
helper_name += content::kMacHelperSuffix_plugin;
|
|
|
|
}
|
|
|
|
|
|
|
|
return frameworks_path.Append(name + " " + helper_name + ".app")
|
2018-04-20 18:47:04 +00:00
|
|
|
.Append("Contents")
|
|
|
|
.Append("MacOS")
|
2019-07-03 01:22:09 +00:00
|
|
|
.Append(name + " " + helper_name);
|
2015-04-14 05:51:08 +00:00
|
|
|
}
|
|
|
|
|
2014-12-29 17:35:08 +00:00
|
|
|
} // namespace
|
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronMainDelegate::OverrideFrameworkBundlePath() {
|
2023-05-23 19:58:58 +00:00
|
|
|
base::apple::SetOverrideFrameworkBundlePath(
|
2019-06-17 20:37:55 +00:00
|
|
|
GetFrameworksPath().Append(ELECTRON_PRODUCT_NAME " Framework.framework"));
|
2014-12-29 17:35:08 +00:00
|
|
|
}
|
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronMainDelegate::OverrideChildProcessPath() {
|
2015-04-14 05:51:08 +00:00
|
|
|
base::FilePath frameworks_path = GetFrameworksPath();
|
2018-04-20 18:47:04 +00:00
|
|
|
base::FilePath helper_path =
|
2019-06-17 20:37:55 +00:00
|
|
|
GetHelperAppPath(frameworks_path, ELECTRON_PRODUCT_NAME);
|
2015-04-14 05:51:08 +00:00
|
|
|
if (!base::PathExists(helper_path))
|
2018-10-24 10:49:10 +00:00
|
|
|
helper_path = GetHelperAppPath(frameworks_path, GetApplicationName());
|
2015-04-14 05:51:08 +00:00
|
|
|
if (!base::PathExists(helper_path))
|
|
|
|
LOG(FATAL) << "Unable to find helper app";
|
2023-08-15 15:49:41 +00:00
|
|
|
base::PathService::OverrideAndCreateIfNeeded(
|
|
|
|
content::CHILD_PROCESS_EXE, helper_path, /*is_absolute=*/true,
|
|
|
|
/*create=*/false);
|
2014-12-29 17:35:08 +00:00
|
|
|
}
|
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
void ElectronMainDelegate::SetUpBundleOverrides() {
|
2023-07-18 22:26:27 +00:00
|
|
|
@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;
|
chore: bump chromium to 118.0.5975.0 (main) (#39531)
* chore: bump chromium in DEPS to 118.0.5951.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894
No logic changes, but patch needed to be manually re-applied due to upstream code shear
* chore: update port_autofill_colors_to_the_color_pipeline.patch
No manual changes; patch applied with fuzz
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5953.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5955.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5957.0
* chore: update patches
* chore: include path of native_web_keyboard_event.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
* chore: remove reference to eextensions/browser/notification-types.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627
* chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code?
* chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198
* chore: add auto_pip_setting_helper.[cc,h] to chromium_src build
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277
Exiting upstream code used by chromium_src now depends on this new upstream class
* chore: bump chromium in DEPS to 118.0.5959.0
* chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
manually adjust patch to minor upstream chagnes
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5961.0
* chore: bump chromium in DEPS to 118.0.5963.0
* chore: update patches
* 4780994: Rename various base files to "apple" since iOS uses them too
https://chromium-review.googlesource.com/c/chromium/src/+/4780994
* Many files moved from `mac` -> `apple`
This commit follows a handful of CLs that simply rename files/symbols to change `mac`
to `apple`
to signify their use across both macOS and iOS:
- 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header
- 4790744: Move foundation_util to base/apple, leave a forwarding header
- 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header
- 4787627: Move and rename macOS+iOS base/ files in PA to "apple"
- 4780399: Move OSStatus logging to base/apple
- 4787387: Remove forwarding headers
- 4781113: Rename message_pump_mac to "apple" because iOS uses it too
* fixup minor patch update error
A function param got dropped from this patch somewhere earlier
* chore: bump chromium in DEPS to 118.0.5965.2
* chore: update patches
* 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base::apple::
https://chromium-review.googlesource.com/c/chromium/src/+/4799213
* Fix removed include to BrowserContext
In crrev.com/c/4767962 an include to BrowserContext was removed,
which was necessary for compilation. This broke only for us because
"chrome/browser/profiles/profile.h" includes that class, but we remove
all references to profiles.
* chore: bump chromium in DEPS to 118.0.5967.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5969.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5971.0
* chore: bump chromium in DEPS to 118.0.5973.0
* chore: update patches
* 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper
https://chromium-review.googlesource.com/c/chromium/src/+/4772121
* 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate.
https://chromium-review.googlesource.com/c/chromium/src/+/4811164
* 4809488: Remove duplicate dnd functionality between Web and Renderer prefs
https://chromium-review.googlesource.com/c/chromium/src/+/4809488
Given that this is no longer an option of web preferences, we should
consider deprecating this option and then removing it.
* chore: bump chromium in DEPS to 118.0.5975.0
* chore: update patches
* fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build
* Reland "[windows] Remove RegKey::DeleteEmptyKey"
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255
* Ensure StrCat means StrCat
Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180
* fixup! Remove RegKey::DeleteEmptyKey
* Consistently reject large p and large q in DH
Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
2023-09-01 06:54:59 +00:00
|
|
|
base::apple::SetBaseBundleID(base_bundle_id.c_str());
|
2023-07-18 22:26:27 +00:00
|
|
|
}
|
2016-05-18 07:42:26 +00:00
|
|
|
}
|
|
|
|
|
2018-10-03 20:49:18 +00:00
|
|
|
void RegisterAtomCrApp() {
|
|
|
|
// Force the NSApplication subclass to be used.
|
2020-02-21 19:05:03 +00:00
|
|
|
[AtomApplication sharedApplication];
|
2018-10-03 20:49:18 +00:00
|
|
|
}
|
|
|
|
|
2019-06-19 21:23:04 +00:00
|
|
|
} // namespace electron
|