From 84d5f71b1acafff89cdf6b16cfbfe454202ceb77 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sat, 24 Jan 2026 18:10:58 +0100 Subject: [PATCH] Cromite Branding: fix year in about settings, fix unwanted browser closures when closing the bookmarks page with the back gesture (#1606 #2576), fix policy file reading from /etc/chromium/policies to /etc/cromite/policies (#2169) --- build/patches/Cromite-Branding.patch | 40 +++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/build/patches/Cromite-Branding.patch b/build/patches/Cromite-Branding.patch index 64c1d0c2..62a8c0d8 100644 --- a/build/patches/Cromite-Branding.patch +++ b/build/patches/Cromite-Branding.patch @@ -26,10 +26,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../mipmap-xxxhdpi/layered_app_icon.png | Bin 3652 -> 29220 bytes .../layered_app_icon_background.png | Bin 3519 -> 142032 bytes .../values/channel_constants.xml | 8 +- + .../about_settings/AboutChromeSettings.java | 4 +- .../ChromeContextMenuPopulator.java | 2 +- .../browser/fullscreen/FullscreenToast.java | 2 +- .../inline/BromiteInlineUpdateController.java | 19 +++- - .../tabbed_mode/TabbedRootUiCoordinator.java | 2 +- + .../tabbed_mode/TabbedRootUiCoordinator.java | 4 +- chrome/app/extensions_strings.grdp | 4 +- chrome/app/settings_strings.grdp | 2 +- chrome/app/theme/chromium/BRANDING | 8 +- @@ -58,6 +59,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html .../drawable-xxxhdpi/fre_product_logo.png | Bin 10740 -> 93273 bytes .../browser/autocomplete_controller.cc | 1 + .../vector_icons/product_chrome_refresh.icon | 93 +++++++++--------- + components/policy/core/common/policy_paths.cc | 2 +- .../chromium/product_logo.png | Bin 1562 -> 3577 bytes .../chromium/product_logo_white.png | Bin 1417 -> 3040 bytes .../chromium/product_logo.png | Bin 2714 -> 7923 bytes @@ -67,7 +69,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html content/child/runtime_features.cc | 44 ++++----- .../Cromite-Branding.inc | 2 + tools/grit/grit/grd_reader.py | 35 +++++++ - 63 files changed, 260 insertions(+), 172 deletions(-) + 65 files changed, 265 insertions(+), 175 deletions(-) create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc diff --git a/build/BUILD.gn b/build/BUILD.gn @@ -9143,6 +9145,20 @@ diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml + Cromite search + Cromite quick action search +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java +@@ -82,7 +82,9 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment + p.setSummary(AboutSettingsBridge.getOSVersion()); + p = findPreference(PREF_LEGAL_INFORMATION); + assumeNonNull(p); +- int currentYear = CalendarFactory.get().get(Calendar.YEAR); ++ Calendar calendar = CalendarFactory.get(); ++ calendar.setTimeInMillis(System.currentTimeMillis()); ++ int currentYear = calendar.get(Calendar.YEAR); + p.setSummary(getString(R.string.legal_information_summary, currentYear)); + + ChromeSwitchPreference allowInlineUpdate = diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java @@ -9214,7 +9230,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java -@@ -914,7 +914,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { +@@ -909,12 +909,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { + if (tab.canGoBack()) { + return ActionType.NAVIGATE_BACK; + } +- if (TabAssociatedApp.isOpenedFromExternalApp(tab)) { ++ if (TabAssociatedApp.isOpenedFromExternalApp(tab) && tab.getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP) { + return ActionType.EXIT_APP; } return mBackButtonShouldCloseTabFn.apply(tab) ? ActionType.CLOSE_TAB @@ -18521,6 +18543,18 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon +CLOSE, +MOVE_TO, 11.2f, 8, CLOSE +diff --git a/components/policy/core/common/policy_paths.cc b/components/policy/core/common/policy_paths.cc +--- a/components/policy/core/common/policy_paths.cc ++++ b/components/policy/core/common/policy_paths.cc +@@ -18,7 +18,7 @@ const char kPolicyPath[] = "/etc/opt/chrome/policies"; + #elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING) + const char kPolicyPath[] = "/etc/opt/chrome_for_testing/policies"; + #else +-const char kPolicyPath[] = "/etc/chromium/policies"; ++const char kPolicyPath[] = "/etc/cromite/policies"; + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) + #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) + diff --git a/components/resources/default_100_percent/chromium/product_logo.png b/components/resources/default_100_percent/chromium/product_logo.png index 7b60bd8c6053346e4eb265cc77d28add65103028..66b3c4c7a4f68fba1ef098000bd373ba103a0de0 100644 GIT binary patch