Skip to content

Commit df5e7ab

Browse files
wukkowukko
authored
merge: helium 0.7.1.1 (#128)
2 parents 946cd67 + 7832bc9 commit df5e7ab

16 files changed

+48
-83
lines changed

‎helium-chromium‎

Submodule helium-chromium updated 165 files

‎patches/helium/macos/change-keychain-name.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- a/components/os_crypt/sync/keychain_password_mac.mm
2-
+++ b/components/os_crypt/sync/keychain_password_mac.mm
1+
--- a/components/os_crypt/common/keychain_password_mac.mm
2+
+++ b/components/os_crypt/common/keychain_password_mac.mm
33
@@ -31,13 +31,8 @@ namespace {
44
// These two strings ARE indeed user facing. But they are used to access
55
// the encryption keyword. So as to not lose encrypted data when system

‎patches/helium/macos/clean-main-menu.patch‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
--- a/chrome/browser/ui/cocoa/main_menu_builder.mm
22
+++ b/chrome/browser/ui/cocoa/main_menu_builder.mm
3-
@@ -297,10 +297,6 @@ NSMenuItem* BuildViewMenu(NSApplication*
3+
@@ -297,12 +297,6 @@ NSMenuItem* BuildViewMenu(NSApplication*
44
.command_id(IDC_TOGGLE_FULLSCREEN_TOOLBAR),
55
Item(IDS_CONTEXT_MENU_SHOW_FULL_URLS)
66
.command_id(IDC_SHOW_FULL_URLS),
77
- Item(IDS_CONTEXT_MENU_SHOW_GOOGLE_LENS_SHORTCUT)
88
- .command_id(IDC_SHOW_GOOGLE_LENS_SHORTCUT),
9+
- Item(IDS_CONTEXT_MENU_SHOW_AI_MODE_OMNIBOX_BUTTON)
10+
- .command_id(IDC_SHOW_AI_MODE_OMNIBOX_BUTTON),
911
- Item(IDS_CONTEXT_MENU_SHOW_SEARCH_TOOLS)
1012
- .command_id(IDC_SHOW_SEARCH_TOOLS),
1113
Item(IDS_CUSTOMIZE_TOUCH_BAR)
1214
.tag(IDC_CUSTOMIZE_TOUCH_BAR)
1315
.action(@selector(toggleTouchBarCustomizationPalette:))
14-
@@ -495,7 +491,8 @@ NSMenuItem* BuildTabMenu(NSApplication*
16+
@@ -522,7 +516,8 @@ NSMenuItem* BuildTabMenu(NSApplication*
1517

1618
// clang-format off
1719
NSMenuItem* item =
@@ -21,7 +23,7 @@
2123
.tag(IDC_TAB_MENU)
2224
.submenu({
2325
Item(IDS_TAB_CXMENU_NEWTABTORIGHT)
24-
@@ -554,15 +551,7 @@ NSMenuItem* BuildHelpMenu(NSApplication*
26+
@@ -581,15 +576,7 @@ NSMenuItem* BuildHelpMenu(NSApplication*
2527
// clang-format off
2628
NSMenuItem* item =
2729
Item(IDS_HELP_MENU_MAC)
@@ -38,13 +40,15 @@
3840
.Build();
3941
// clang-format on
4042

41-
@@ -584,10 +573,10 @@ NSMenu* BuildMainMenu(NSApplication* nsa
43+
@@ -611,11 +598,11 @@ NSMenu* BuildMainMenu(NSApplication* nsa
4244
&BuildFileMenu,
4345
&BuildEditMenu,
4446
&BuildViewMenu,
4547
- &BuildHistoryMenu,
48+
- &BuildBookmarksMenu,
4649
+ &BuildTabMenu,
47-
&BuildBookmarksMenu,
50+
&BuildGroupsMenu,
51+
+ &BuildBookmarksMenu,
4852
+ &BuildHistoryMenu,
4953
&BuildPeopleMenu,
5054
- &BuildTabMenu,

‎patches/helium/macos/disable-immersive-fullscreen.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/chrome/common/chrome_features.cc
22
+++ b/chrome/common/chrome_features.cc
3-
@@ -1001,7 +1001,7 @@ BASE_FEATURE(kHttpsFirstModeIncognitoNew
3+
@@ -1215,7 +1215,7 @@ BASE_FEATURE(kHttpsFirstModeIncognitoNew
44
#if BUILDFLAG(IS_MAC)
55
// Enables immersive fullscreen. The tab strip and toolbar are placed underneath
66
// the titlebar. The tab strip and toolbar can auto hide and reveal.

‎patches/helium/macos/fix-pwa-shims.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
// https://crbug.com/40276068
1919
-BASE_FEATURE(kUseAdHocSigningForWebAppShims, base::FEATURE_DISABLED_BY_DEFAULT);
2020
+BASE_FEATURE(kUseAdHocSigningForWebAppShims, base::FEATURE_ENABLED_BY_DEFAULT);
21-
#endif // BUILDFLAG(IS_MAC)
2221

23-
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
22+
// When enabled, the KeychainKeyProvider is used to provide the OS Crypt async
23+
// key.

‎patches/helium/macos/traffic-lights-positioning.patch‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎patches/helium/macos/updater/disable-default-updater.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
+ return;
99
+
1010
EnsureUpdater(
11+
base::TaskPriority::USER_VISIBLE,
1112
base::BindOnce(
12-
[](PromoteCallback prompt) {

‎patches/helium/macos/updater/sparkle2-integration.patch‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@
9393
return 3
9494
--- a/chrome/BUILD.gn
9595
+++ b/chrome/BUILD.gn
96-
@@ -51,6 +51,7 @@ if (is_android) {
96+
@@ -50,6 +50,7 @@ if (is_android) {
9797
import("//build/util/branding.gni")
9898
import("//chrome/browser/buildflags.gni")
9999
import("//chrome/updater/branding.gni")
100100
+ import("//chrome/updater/sparkle.gni")
101101
import("//chrome/version.gni")
102102
import("//content/public/app/mac_helpers.gni")
103103
import("//media/cdm/library_cdm/cdm_paths.gni")
104-
@@ -501,6 +502,20 @@ if (is_win) {
104+
@@ -496,6 +497,20 @@ if (is_win) {
105105
} else {
106106
args += [ "--keystone=0" ]
107107
}
@@ -122,7 +122,7 @@
122122
}
123123

124124
mac_app_bundle("chrome_app") {
125-
@@ -1139,6 +1154,10 @@ if (is_win) {
125+
@@ -1134,6 +1149,10 @@ if (is_win) {
126126

127127
if (is_component_build) {
128128
frameworks = [ "Carbon.framework" ]
@@ -133,7 +133,7 @@
133133
}
134134

135135
ldflags = [ "-ObjC" ]
136-
@@ -1195,6 +1214,12 @@ if (is_win) {
136+
@@ -1190,6 +1209,12 @@ if (is_win) {
137137
bundle_deps += [ ":angle_binaries" ]
138138
}
139139

@@ -173,10 +173,10 @@
173173
import("//chrome/browser/buildflags.gni")
174174
import("//chrome/common/features.gni")
175175
+import("//chrome/updater/sparkle.gni")
176-
import("//chromeos/ash/components/assistant/assistant.gni")
176+
import("//components/captive_portal/core/features.gni")
177177
import("//components/compose/features.gni")
178178
import("//components/enterprise/buildflags/buildflags.gni")
179-
@@ -3177,11 +3178,9 @@ static_library("ui") {
179+
@@ -3199,11 +3200,9 @@ static_library("ui") {
180180
"webui/settings/settings_utils_mac.mm",
181181
]
182182

@@ -376,7 +376,7 @@
376376
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
377377
#include "chrome/browser/prefs/incognito_mode_prefs.h"
378378
#include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
379-
@@ -872,6 +876,9 @@ class AppControllerNativeThemeObserver :
379+
@@ -883,6 +887,9 @@ class AppControllerNativeThemeObserver :
380380
NSWindow.allowsAutomaticWindowTabbing = NO;
381381

382382
[self initShareMenu];
@@ -412,7 +412,7 @@
412412

413413
--- a/chrome/browser/BUILD.gn
414414
+++ b/chrome/browser/BUILD.gn
415-
@@ -59,6 +59,10 @@ if (is_win) {
415+
@@ -57,6 +57,10 @@ if (is_win) {
416416
import("//build/config/win/manifest.gni")
417417
}
418418

@@ -423,7 +423,7 @@
423423
assert(!is_fuchsia, "Fuchsia shouldn't use anything in //chrome")
424424

425425
declare_args() {
426-
@@ -108,6 +112,10 @@ buildflag_header("buildflags") {
426+
@@ -103,6 +107,10 @@ buildflag_header("buildflags") {
427427
flags += [ "ENABLE_SEGMENT_HEAP=$enable_segment_heap" ]
428428
}
429429

@@ -434,7 +434,7 @@
434434
# Android and ChromeOS don't support multiple browser processes, so they don't
435435
# employ ProcessSingleton.
436436
if (is_android || is_chromeos) {
437-
@@ -6715,6 +6723,22 @@ static_library("browser") {
437+
@@ -6716,6 +6724,22 @@ static_library("browser") {
438438
weak_frameworks = [
439439
"ScreenCaptureKit.framework", # Available in macOS 12.3, stable in 13.2.
440440
]

patches/extra/rebel/macos/sparkle-integration.patch renamed to patches/rebel/macos/sparkle-integration.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@
657657
#include "chrome/browser/browser_process.h"
658658
#include "chrome/browser/browser_process_platform_part.h"
659659
#include "chrome/browser/download/download_core_service.h"
660-
@@ -55,6 +56,10 @@
660+
@@ -56,6 +57,10 @@
661661
#include "chrome/browser/background/glic/glic_background_mode_manager.h"
662662
#endif
663663

@@ -668,7 +668,7 @@
668668
namespace chrome {
669669

670670
namespace {
671-
@@ -107,6 +112,14 @@ void AttemptRestartInternal(IgnoreUnload
671+
@@ -110,6 +115,14 @@ void AttemptRestartInternal(IgnoreUnload
672672
#else // !BUILDFLAG(IS_CHROMEOS).
673673
// Set the flag to restore state after the restart.
674674
pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);

‎patches/series‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ ungoogled-chromium/macos/no-unknown-warnings.patch
1212
ungoogled-chromium/macos/re2-include-fix
1313
ungoogled-chromium/macos/build-bindgen-target-override.patch
1414

15+
helium/macos/fix-rust-allocator-in-component-builds.patch
1516
helium/macos/move-macos-settings.patch
1617
helium/macos/change-keychain-name.patch
1718
helium/macos/change-product-dir-name.patch
1819
helium/macos/rust-dep.patch
1920
helium/macos/fix-pwa-shims.patch
20-
helium/macos/traffic-lights-positioning.patch
2121
helium/macos/clean-main-menu.patch
2222
helium/macos/disable-immersive-fullscreen.patch
23-
extra/rebel/macos/sparkle-integration.patch
23+
24+
rebel/macos/sparkle-integration.patch
2425
helium/macos/updater/fixup-sparkle-glue.patch
2526
helium/macos/updater/sparkle2-integration.patch
2627
helium/macos/updater/disable-default-updater.patch
27-
helium/macos/fix-rust-allocator-in-component-builds.patch

0 commit comments

Comments
 (0)