PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
uazo
2024-08-05 22:36:13 +11:00
committed by GitHub
parent 9973f6e20f fe6db89afd
commit 2c420ed77b
95 changed files with 17850 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/update-patches-doc.yaml
+1 -1
View File
@@ -74,7 +74,7 @@ jobs:
path: cromite
base: ${{ env.BRANCH }}
add-paths: |
build/patches/*.patch
docs/*.md
commit-message: '[AUTO][DOC] Generate patches doc for master branch'
title: '[AUTO][DOC] Generate patches doc for master branch'
body: ${{ env.MESSAGE }}
build/RELEASE
+1 -1
View File
@@ -1 +1 @@
127.0.6533.73
127.0.6533.94
build/cromite_patches_list.txt
+8 -5
View File
@@ -1,7 +1,11 @@
Do-not-link-with-libatomic.patch
bromite-build-utils.patch
Add-cromite-flags-support.patch
Fix-chromium-vanilla.patch
Final-patch-for-chromium-vanilla.patch
Remove-EV-certificates.patch
do-not-hide-.orig-files.patch
Do-not-link-with-libatomic.patch
do-not-add-suffix-to-package-name.patch
exit-on-failure-of-inclusion.patch
Move-some-account-settings-back-to-privacy-settings.patch
@@ -21,7 +25,7 @@ Always-use-new-tab-page-for-default-home-page.patch
disable-battery-status-updater.patch
Battery-API-return-nothing.patch
updater-disable-updater-pings.patch
Disable-omission-of-URL-elements-in-Omnibox.patch
Disable-omission-of-URL-elements.patch
Modify-default-preferences.patch
Do-not-store-passwords-by-default.patch
Disable-NTP-remote-suggestions-by-default.patch
@@ -256,7 +260,6 @@ Enable-ImprovedBookmarks-by-default.patch
Partition-MediaDeviceId-by-default.patch
Keep-disabled-FetchLaterAPI.patch
Disable-ranker-url-fetcher.patch
Show-full-urls-for-bookmark.patch
Disable-prefers-reduced-transparency-media-query.patch
libjxl-0-8-2.patch
Add-support-to-jxl.patch
@@ -265,7 +268,6 @@ Keep-Manta-Service-Disabled.patch
Disable-Service-and-Shared-workers-on-3P-iframe.patch
Disable-Real-Box.patch
Always-allow-inspect-fallback.patch
Add-cromite-flags-support.patch
Add-PartialLowEndModeOnMidRangeDevices-flag.patch
Use-list-mode-for-tab-switcher.patch
Chrome-web-store-protection.patch
@@ -297,8 +299,9 @@ Disable-support-for-pointer-device-id.patch
Disable-CSS-blink-feature-support.patch
Close-Sessions-On-Ip-Change.patch
Ask-for-restart-on-connection-change.patch
Bubble-Locking-on-UI-DevTools.patch
# temporary patches
# temporary or wip patches
Disable-wip-Android-Hub.patch
Temp-PerformanceNavigationTiming-privacy-fix.patch
Temp-disable-predictive-back-gesture.patch
build/patches/Add-AllowUserCertificates-flag.patch
+4 -4
View File
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -153,6 +153,7 @@ public abstract class ChromeFeatureList {
@@ -157,6 +157,7 @@ public abstract class ChromeFeatureList {
/* Alphabetical: */
public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =
"AccountReauthenticationRecentTimeWindow";
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =
"AdaptiveButtonInTopToolbarTranslate";
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =
@@ -555,6 +556,8 @@ public abstract class ChromeFeatureList {
@@ -559,6 +560,8 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sAppInfoTabResumptionModule =
newCachedFlag(APP_INFO_TAB_RESUMPTION_MODULE, false);
public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, false);
@@ -68,8 +68,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final CachedFlag sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);
public static final CachedFlag sAsyncNotificationManager =
newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);
@@ -704,6 +707,7 @@ public abstract class ChromeFeatureList {
public static final List<CachedFlag> sFlagsCachedFullBrowser =
@@ -708,6 +711,7 @@ public abstract class ChromeFeatureList {
public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
List.of(
sAccountReauthenticationRecentTimeWindow,
+ sAllowUserCertificates,
build/patches/Add-a-proxy-configuration-page.patch
+3 -3
View File
@@ -50,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
@@ -19,6 +19,9 @@ found in the LICENSE file.
@@ -22,6 +22,9 @@ found in the LICENSE file.
<!-- Compositor Tab Title Text -->
<bool name="compositor_tab_title_fake_bold_text">true</bool>
@@ -977,7 +977,7 @@ new file mode 100644
+ }
+
+ if (const std::string* pacURL = config.FindString("pac_url")) {
+ absl::optional<bool> pacMandatory = config.FindBool("pac_mandatory");
+ std::optional<bool> pacMandatory = config.FindBool("pac_mandatory");
+ auto proxyConfig = net::ProxyConfig::CreateFromCustomPacURL(
+ GURL(*pacURL));
+ proxyConfig.set_pac_mandatory(pacMandatory.value_or(false));
@@ -1037,7 +1037,7 @@ new file mode 100644
+ if (bypass_rules == nullptr)
+ return;
+
+ absl::optional<bool> reverse_bypass = rules->FindBool("reverse_bypass");
+ std::optional<bool> reverse_bypass = rules->FindBool("reverse_bypass");
+
+ proxyConfig.proxy_rules().bypass_rules.ParseFromString(*bypass_rules);
+ proxyConfig.proxy_rules().reverse_bypass = reverse_bypass.value_or(false);
build/patches/Add-an-always-incognito-mode.patch
+9 -15
View File
@@ -67,7 +67,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/browser/profiles/profile_selections.h | 7 +-
.../browser/ui/android/native_page/BUILD.gn | 2 +
.../browser/ui/native_page/NativePage.java | 23 ++-
.../strings/android_chrome_strings.grd | 31 ++++
.../strings/android_chrome_strings.grd | 25 +++
.../browser/toolbar/LocationBarModel.java | 5 +-
chrome/browser/ui/messages/android/BUILD.gn | 1 +
.../snackbar/INeedSnackbarManager.java | 27 +++
@@ -85,7 +85,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../add-an-always-incognito-mode.inc | 3 +
.../add-an-always-incognito-mode.inc | 1 +
net/base/file_stream_context.cc | 2 +-
66 files changed, 781 insertions(+), 103 deletions(-)
66 files changed, 775 insertions(+), 103 deletions(-)
create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
@@ -170,7 +170,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -82,6 +82,11 @@ found in the LICENSE file.
@@ -86,6 +86,11 @@ found in the LICENSE file.
android:key="secure_dns"
android:title="@string/settings_secure_dns_title"
android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
@@ -895,17 +895,17 @@ new file mode 100644
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -86,6 +86,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
@@ -87,6 +87,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
import org.chromium.chrome.browser.ui.device_lock.MissingDeviceLockLauncher;
+import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
@@ -374,6 +375,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
((PrivacySandboxSettingsBaseFragment) fragment)
.setSnackbarManager(getSnackbarManager());
import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
@@ -410,6 +411,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
((ChromeBaseSettingsFragment)fragment).setRequestRestartDelegate(
new RequestRestartDelegate(mSnackbarManager, this));
}
+ if (fragment instanceof INeedSnackbarManager) {
+ ((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager);
@@ -1880,7 +1880,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1296,6 +1296,37 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1297,6 +1297,31 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED_NO_LINK" desc="A text for the basic tab explaining browsing history for users with history sync. This version is shown when the link to MyActivity is displayed separately.">
Deletes history from all synced devices
</message>
@@ -1897,12 +1897,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
+ <message name="IDS_ALWAYS_INCOGNITO_SUMMARY" desc="Summary for always incognito mode">
+ Opens links in incognito tabs when you click on new tab or on a link
+ </message>
+ <message name="IDS_RELAUNCH" desc="Relaunch message">
+ Relaunch
+ </message>
+ <message name="IDS_UI_RELAUNCH_NOTICE" desc="Summary for relaunch message">
+ Your changes will take effect the next time you relaunch Bromite.
+ </message>
+ <message name="IDS_INCOGNITO_HISTORY_ENABLED_TITLE" desc="Title for enabled history in incognito mode">
+ Enable history
+ </message>
build/patches/Add-bookmark-import-export-actions.patch
+3 -3
View File
@@ -729,7 +729,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
static final PropertyKey[] ALL_KEYS = {
BOOKMARK_OPENER,
@@ -108,6 +112,8 @@ class BookmarkToolbarProperties {
@@ -109,6 +113,8 @@ class BookmarkToolbarProperties {
SELECTION_MODE_SHOW_OPEN_IN_INCOGNITO,
SELECTION_MODE_SHOW_MOVE,
SELECTION_MODE_SHOW_MARK_READ,
@@ -1376,7 +1376,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -517,6 +517,7 @@ public abstract class ChromeFeatureList {
@@ -521,6 +521,7 @@ public abstract class ChromeFeatureList {
public static final String VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR =
"VerticalAutomotiveBackButtonToolbar";
public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
@@ -1450,7 +1450,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -245,6 +245,24 @@ CHAR_LIMIT guidelines:
@@ -246,6 +246,24 @@ CHAR_LIMIT guidelines:
<message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
Sites
</message>
build/patches/Add-cromite-flags-support.patch
+57 -41
View File
@@ -36,6 +36,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
chrome/browser/settings/BUILD.gn | 1 +
.../settings/ChromeBaseSettingsFragment.java | 47 +++++
.../strings/android_chrome_strings.grd | 1 +
.../Add-cromite-flags-support.grdp | 9 +
.../placeholder.txt | 1 +
chrome/browser/ui/ui_features.cc | 1 +
chrome/common/chrome_features.cc | 1 +
@@ -95,9 +96,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
third_party/blink/public/common/features.h | 1 +
ui/base/ui_base_features.cc | 1 +
ui/base/ui_base_features.h | 1 +
82 files changed, 762 insertions(+), 22 deletions(-)
83 files changed, 771 insertions(+), 22 deletions(-)
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/placeholder.txt
create mode 100644 components/cromite_components_strings_grd/placeholder.txt
create mode 100755 cromite_flags/BUILD.gn
@@ -436,10 +438,10 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -75,6 +75,10 @@ found in the LICENSE file.
android:title="@string/tabgrid_use_icons_title"
android:summary="@string/tabgrid_use_icons_summary"
android:defaultValue="false" />
@@ -55,6 +55,10 @@ found in the LICENSE file.
android:key="do_not_track"
android:title="@string/do_not_track_title"
android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
+ <org.chromium.chrome.browser.about_settings.HyperlinkPreference
+ android:key="cromite_flags"
+ android:title="@string/cromite_flags_title"
@@ -456,9 +458,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
+import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate;
import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
import org.chromium.components.browser_ui.accessibility.FontSizePrefs;
@@ -34,7 +35,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver;
@@ -33,7 +34,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
import org.chromium.content_public.browser.ContentFeatureMap;
/** Fragment to keep track of all the accessibility related preferences. */
@@ -467,7 +469,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
implements Preference.OnPreferenceChangeListener {
public static final String PREF_TEXT_SCALE = "text_scale";
public static final String PREF_PAGE_ZOOM_DEFAULT_ZOOM = "page_zoom_default_zoom";
@@ -108,7 +109,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -92,7 +93,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
}
@Override
@@ -479,7 +481,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
@@ -37,7 +37,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
@@ -34,7 +34,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
private RadioButtonGroupHomepagePreference mRadioButtons;
@Override
@@ -491,8 +493,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -127,7 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
private static final String PREF_HISTORY_EXPIRE_DAYS_THRESHOLD = "history_expire_days_threshold";
@@ -78,7 +78,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
private SettingsLauncher mSettingsLauncher;
@Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -511,15 +513,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
@@ -85,6 +86,7 @@ import org.chromium.chrome.browser.ui.device_lock.MissingDeviceLockLauncher;
import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
@@ -88,6 +89,7 @@ import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
import org.chromium.chrome.browser.ui.device_lock.MissingDeviceLockLauncher;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
@@ -126,6 +128,36 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -128,6 +130,36 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
SnackbarManageable,
DisplayStyleObserver {
@@ -556,9 +558,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
public static final String EXTRA_SHOW_FRAGMENT = "show_fragment";
@@ -379,6 +411,10 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
((AccessibilitySettings) fragment)
.getDelegate()).setSnackbarManager(mSnackbarManager);
@@ -373,6 +405,10 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
((PrivacySandboxSettingsBaseFragment) fragment)
.setSnackbarManager(getSnackbarManager());
}
+ if (fragment instanceof ChromeBaseSettingsFragment) {
+ ((ChromeBaseSettingsFragment)fragment).setRequestRestartDelegate(
@@ -570,7 +572,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -376,6 +376,10 @@ using flags_ui::kOsLinux;
@@ -370,6 +370,10 @@ using flags_ui::kOsLinux;
using flags_ui::kOsMac;
using flags_ui::kOsWin;
@@ -581,7 +583,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
namespace about_flags {
namespace {
@@ -4076,6 +4080,10 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
@@ -4089,6 +4093,10 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
kAutofillUpstreamUpdatedUi_Education_Animated,
std::size(kAutofillUpstreamUpdatedUi_Education_Animated), nullptr}};
@@ -592,7 +594,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
// RECORDING USER METRICS FOR FLAGS:
// -----------------------------------------------------------------------------
// The first line of the entry is the internal name.
@@ -4102,6 +4110,9 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
@@ -4115,6 +4123,9 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
const FeatureEntry kFeatureEntries[] = {
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
// //tools/flags/generate_unexpire_flags.py.
@@ -614,7 +616,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature
diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
--- a/chrome/browser/flags/BUILD.gn
+++ b/chrome/browser/flags/BUILD.gn
@@ -13,9 +13,14 @@ android_library("java") {
@@ -12,9 +12,14 @@ android_library("java") {
"android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
"android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
]
@@ -629,7 +631,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
"//base/version_info/android:version_constants_java",
"//build:chromeos_buildflags",
"//build/android:build_java",
@@ -25,12 +30,20 @@ android_library("java") {
@@ -24,12 +29,20 @@ android_library("java") {
"//third_party/jni_zero:jni_zero_java",
]
srcjar_deps = [
@@ -653,7 +655,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -1036,5 +1036,6 @@ BASE_FEATURE(kWebApkAllowIconUpdate,
@@ -1018,5 +1018,6 @@ BASE_FEATURE(kWebApkAllowIconUpdate,
"WebApkAllowIconUpdate",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -685,7 +687,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
import java.util.List;
import java.util.Map;
@@ -719,7 +723,7 @@ public abstract class ChromeFeatureList {
@@ -695,7 +699,7 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sVerticalAutomotiveBackButtonToolbar =
newCachedFlag(VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR, true);
@@ -693,8 +695,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
+ public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
List.of(
sAccountReauthenticationRecentTimeWindow,
sAllowUserCertificates,
@@ -816,6 +820,13 @@ public abstract class ChromeFeatureList {
sAndroidAppIntegration,
@@ -788,6 +792,13 @@ public abstract class ChromeFeatureList {
sUseLibunwindstackNativeUnwinderAndroid,
sVerticalAutomotiveBackButtonToolbar);
@@ -852,6 +854,20 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<!-- NOTE: Generic strings used across multiple features belong in //components/browser_ui/strings/android. -->
<!-- Cookie Controls -->
diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
new file mode 100644
--- /dev/null
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+ <message name="IDS_RELAUNCH" desc="Relaunch message">
+ Relaunch
+ </message>
+ <message name="IDS_UI_RELAUNCH_NOTICE" desc="Summary for relaunch message">
+ Your changes will take effect the next time you relaunch Cromite.
+ </message>
+</grit-part>
diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/placeholder.txt b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/placeholder.txt
new file mode 100644
--- /dev/null
@@ -887,8 +903,8 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="enable_accessibility"
<org.chromium.chrome.browser.accessibility.settings.TextScalePreference
android:key="text_scale"
diff --git a/components/browser_ui/settings/android/java/res/values/attrs.xml b/components/browser_ui/settings/android/java/res/values/attrs.xml
--- a/components/browser_ui/settings/android/java/res/values/attrs.xml
+++ b/components/browser_ui/settings/android/java/res/values/attrs.xml
@@ -950,14 +966,14 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
diff --git a/components/components_strings.grd b/components/components_strings.grd
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -338,6 +338,7 @@
<part file="version_ui_strings.grdp" />
<part file="webapps_strings.grdp" />
<part file="user_scripts/strings/userscripts_strings.grdp" />
@@ -281,6 +281,7 @@
</translations>
<release seq="1">
<messages fallback_to_english="true">
+ <part file="cromite_components_strings_grd/placeholder.txt"/>
<part file="history_clusters_strings.grdp" />
<if expr="is_android">
<part file="android_system_error_page_strings.grdp" />
<part file="arc_strings.grdp" />
<part file="autofill_payments_strings.grdp" />
<part file="autofill_strings.grdp" />
diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc
--- a/components/content_settings/core/common/features.cc
+++ b/components/content_settings/core/common/features.cc
@@ -1367,7 +1383,7 @@ diff --git a/components/offline_pages/core/offline_page_feature.h b/components/o
diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc
--- a/components/password_manager/core/browser/features/password_features.cc
+++ b/components/password_manager/core/browser/features/password_features.cc
@@ -206,4 +206,5 @@ BASE_FEATURE(kUsernameFirstFlowWithIntermediateValuesVoting,
@@ -207,4 +207,5 @@ BASE_FEATURE(kUsernameFirstFlowWithIntermediateValuesVoting,
"UsernameFirstFlowWithIntermediateValuesVoting",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1771,7 +1787,7 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h
diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
+++ b/net/base/features.cc
@@ -550,4 +550,5 @@ BASE_FEATURE(kSpdySessionForProxyAdditionalChecks,
@@ -549,4 +549,5 @@ BASE_FEATURE(kSpdySessionForProxyAdditionalChecks,
"SpdySessionForProxyAdditionalChecks",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1811,7 +1827,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2678,5 +2678,6 @@ BASE_FEATURE(kOptimizeLoadingDataUrls,
@@ -2677,5 +2677,6 @@ BASE_FEATURE(kOptimizeLoadingDataUrls,
"OptimizeLoadingDataUrls",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -1821,7 +1837,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -1747,6 +1747,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRenderSizeInScoreAdBrowserSignals);
@@ -1744,6 +1744,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRenderSizeInScoreAdBrowserSignals);
// Optimize loading data: URLs.
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kOptimizeLoadingDataUrls);
@@ -1832,7 +1848,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ
diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
--- a/ui/base/ui_base_features.cc
+++ b/ui/base/ui_base_features.cc
@@ -529,4 +529,5 @@ BASE_FEATURE(kEnableGestureBeginEndTypes,
@@ -521,4 +521,5 @@ BASE_FEATURE(kEnableGestureBeginEndTypes,
"EnableGestureBeginEndTypes",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -1841,7 +1857,7 @@ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h
--- a/ui/base/ui_base_features.h
+++ b/ui/base/ui_base_features.h
@@ -247,6 +247,7 @@ BASE_DECLARE_FEATURE(kBubbleFrameViewTitleIsHeading);
@@ -245,6 +245,7 @@ BASE_DECLARE_FEATURE(kBubbleFrameViewTitleIsHeading);
COMPONENT_EXPORT(UI_BASE_FEATURES)
BASE_DECLARE_FEATURE(kEnableGestureBeginEndTypes);
build/patches/Add-custom-tab-intents-privacy-option.patch
+6 -6
View File
@@ -26,10 +26,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -59,6 +59,16 @@ found in the LICENSE file.
android:key="do_not_track"
android:title="@string/do_not_track_title"
android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
@@ -63,6 +63,16 @@ found in the LICENSE file.
android:key="cromite_flags"
android:title="@string/cromite_flags_title"
app:url="@string/cromite_flags_url" />
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+ android:key="allow_custom_tab_intents"
+ android:title="@string/allow_custom_tab_intents_title"
@@ -140,7 +140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
+ private ChromeSwitchPreference openExternalLinksPref;
+
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
getActivity().setTitle(R.string.prefs_privacy_security);
@@ -319,6 +322,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
@@ -203,7 +203,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -5454,6 +5454,20 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -5449,6 +5449,20 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_NEAR_OOM_INTERVENTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can resume what it was doing.">
Resume
</message>
build/patches/Add-exit-menu-item.patch
+1 -1
View File
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4063,6 +4063,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -4064,6 +4064,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
Dark theme
</message>
build/patches/Add-lifetime-options-for-permissions.patch
+1 -1
View File
@@ -410,7 +410,7 @@ diff --git a/components/content_settings/core/common/content_settings_enums.mojo
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
--- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
@@ -422,9 +422,9 @@ public class PageInfoController
@@ -421,9 +421,9 @@ public class PageInfoController
String name,
String nameMidSentence,
int type,
build/patches/Add-menu-item-to-bookmark-all-tabs.patch
+1 -1
View File
@@ -391,7 +391,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4196,6 +4196,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -4191,6 +4191,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
Select tabs
</message>
build/patches/Add-menu-item-to-view-source.patch
+1 -1
View File
@@ -115,7 +115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -311,6 +311,10 @@ CHAR_LIMIT guidelines:
@@ -312,6 +312,10 @@ CHAR_LIMIT guidelines:
USB
</message>
build/patches/Add-option-to-disable-snapshots.patch
+2 -2
View File
@@ -72,7 +72,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -70,6 +70,11 @@ found in the LICENSE file.
@@ -74,6 +74,11 @@ found in the LICENSE file.
android:title="@string/open_external_links_incognito_title"
android:summary="@string/open_external_links_incognito_summary"
android:defaultValue="false" />
@@ -209,7 +209,7 @@ diff --git a/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -5664,6 +5664,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -5659,6 +5659,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
</message>
build/patches/Add-option-to-force-tablet-UI.patch
+7 -7
View File
@@ -155,15 +155,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.image_descriptions.ImageDescriptionsControlle
import org.chromium.chrome.browser.preferences.Pref;
@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate;
+import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
import org.chromium.components.browser_ui.accessibility.FontSizePrefs;
import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver;
import org.chromium.components.browser_ui.accessibility.PageZoomPreference;
@@ -46,6 +47,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -47,6 +48,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
public static final String PREF_ZOOM_INFO = "zoom_info";
public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
@@ -173,7 +173,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
private TextScalePreference mTextScalePref;
private PageZoomPreference mPageZoomDefaultZoomPref;
private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
@@ -143,6 +147,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -144,6 +148,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
mPrefService.getBoolean(Pref.READER_FOR_ACCESSIBILITY));
readerForAccessibilityPref.setOnPreferenceChangeListener(this);
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
Preference captions = findPreference(PREF_CAPTIONS);
captions.setOnPreferenceClickListener(
preference -> {
@@ -214,6 +224,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -215,6 +225,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
} else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
@@ -400,7 +400,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1664,6 +1664,13 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1659,6 +1659,13 @@ Your Google account may have other forms of browsing history like searches and a
Hide your IP address
</message>
@@ -635,7 +635,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
@@ -40,6 +40,11 @@ found in the LICENSE file.
@@ -41,6 +41,11 @@ found in the LICENSE file.
android:summary="@string/reader_for_accessibility_summary"
android:title="@string/reader_for_accessibility_title" />
build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
+2 -2
View File
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -87,6 +87,11 @@ found in the LICENSE file.
@@ -91,6 +91,11 @@ found in the LICENSE file.
android:title="@string/incognito_settings_title"
android:summary="@string/incognito_settings_summary"
android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -5155,6 +5155,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -5150,6 +5150,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
IMAGE
</message>
build/patches/Add-option-to-use-home-page-as-NTP.patch
+1 -1
View File
@@ -223,7 +223,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1411,6 +1411,9 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1406,6 +1406,9 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
Last hour
</message>
build/patches/Add-setting-to-clear-data-on-exit.patch
+50 -8
View File
@@ -12,7 +12,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
chrome/app/settings_strings.grdp | 10 +++
.../browsing_data/browsing_data_bridge.cc | 2 +-
.../chrome_browsing_data_lifetime_manager.cc | 22 +++++-
.../chrome_browsing_data_remover_delegate.cc | 13 ++++
.../chrome_browsing_data_remover_constants.h | 3 +-
.../chrome_browsing_data_remover_delegate.cc | 18 +++++
chrome/browser/dips/dips_service.cc | 2 +-
.../api/settings_private/prefs_util.cc | 17 +++++
.../browser/profiles/ProfileManagerUtils.java | 5 ++
.../profiles/android/profile_manager_utils.cc | 5 ++
@@ -22,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../clear_browsing_data_dialog.ts | 2 +
.../strings/android_chrome_strings.grd | 3 +
.../settings_localized_strings_provider.cc | 1 +
.../content/browsing_data_helper.cc | 5 +-
.../content/browsing_data_helper.cc | 9 ++-
.../core/browsing_data_policies_utils.cc | 20 ++---
.../core/browsing_data_policies_utils.h | 11 +++
.../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
@@ -31,7 +33,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
components/browsing_data/core/pref_names.h | 10 +++
.../search_engines/template_url_service.cc | 1 +
content/browser/storage_partition_impl.cc | 1 +
27 files changed, 316 insertions(+), 18 deletions(-)
29 files changed, 326 insertions(+), 22 deletions(-)
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
@@ -280,6 +282,19 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
bool sync_disabled = !SyncServiceFactory::IsSyncAllowed(profile_);
// Condition is satisfied if sync is fully disabled by policy.
if (sync_disabled) {
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
@@ -32,8 +32,7 @@ constexpr DataType DATA_TYPE_SITE_USAGE_DATA = DATA_TYPE_EMBEDDER_BEGIN << 4;
constexpr DataType DATA_TYPE_DURABLE_PERMISSION = DATA_TYPE_EMBEDDER_BEGIN << 5;
constexpr DataType DATA_TYPE_EXTERNAL_PROTOCOL_DATA = DATA_TYPE_EMBEDDER_BEGIN
<< 6;
-constexpr DataType DATA_TYPE_HOSTED_APP_DATA_TEST_ONLY =
- DATA_TYPE_EMBEDDER_BEGIN << 7;
+constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = DATA_TYPE_EMBEDDER_BEGIN << 7;
constexpr DataType DATA_TYPE_CONTENT_SETTINGS = DATA_TYPE_EMBEDDER_BEGIN << 8;
constexpr DataType DATA_TYPE_BOOKMARKS = DATA_TYPE_EMBEDDER_BEGIN << 9;
constexpr DataType DATA_TYPE_ISOLATED_ORIGINS = DATA_TYPE_EMBEDDER_BEGIN << 10;
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -313,7 +328,19 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
base::ThreadPool::PostTaskAndReply(
FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
base::BindOnce(
@@ -588,9 +595,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -560,6 +567,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
// and SSL host state are scoped to hosts and represent them as std::string.
// Rename the method to indicate its more general usage.
if (profile_->GetSSLHostStateDelegate()) {
+ bool skip = false;
+ if (remove_mask & chrome_browsing_data_remover::DATA_TYPE_SKIP_SSL_HOST_STATE) {
+ skip = true;
+ }
+ if (!skip)
profile_->GetSSLHostStateDelegate()->Clear(
filter_builder->MatchesAllOriginsAndDomains()
? base::RepeatingCallback<bool(const std::string&)>()
@@ -588,9 +600,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
}
device_event_log::Clear(delete_begin_, delete_end_);
@@ -327,7 +354,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
delete_begin_, delete_end_);
@@ -1257,6 +1268,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -1257,6 +1273,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
if (should_clear_zero_suggest_and_session_token && template_url_service)
template_url_service->ClearSessionToken();
@@ -336,6 +363,18 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/dips/dips_service.cc b/chrome/browser/dips/dips_service.cc
--- a/chrome/browser/dips/dips_service.cc
+++ b/chrome/browser/dips/dips_service.cc
@@ -193,7 +193,7 @@ class StateClearer : public content::BrowsingDataRemover::Observer {
}
remover->RemoveWithFilterAndReply(
base::Time::Min(), base::Time::Max(),
- remove_mask |
+ remove_mask | chrome_browsing_data_remover::DATA_TYPE_SKIP_SSL_HOST_STATE |
content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS,
content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB |
content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB,
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -514,7 +553,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1506,6 +1506,9 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1501,6 +1501,9 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_ANDROID_APP_HISTORY_OPEN_FULL_OTHER_FORMS" desc="The informational message at the top of the history page letting users know that app-specific history may be missing some entries, followed by the info on the other forms of browing history.">
Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
</message>
@@ -538,14 +577,17 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
diff --git a/components/browsing_data/content/browsing_data_helper.cc b/components/browsing_data/content/browsing_data_helper.cc
--- a/components/browsing_data/content/browsing_data_helper.cc
+++ b/components/browsing_data/content/browsing_data_helper.cc
@@ -40,8 +40,11 @@ bool WebsiteSettingsFilterAdapter(
@@ -40,8 +40,13 @@ bool WebsiteSettingsFilterAdapter(
// this filter is used for is DURABLE_STORAGE, which also only uses
// origin-scoped patterns. Such patterns can be directly translated to a GURL.
GURL url(primary_pattern.ToString());
- DCHECK(url.is_valid()) << "url: '" << url.possibly_invalid_spec() << "' "
- << "pattern: '" << primary_pattern.ToString() << "'";
+ if (!url.is_valid()) {
+ // COOKIE_CONTROLS_METADATA are in the form
+ // 'https://[%2A.]domain.ext'
+ LOG(INFO) << "url: '" << url.possibly_invalid_spec() << "' "
<< "pattern: '" << primary_pattern.ToString() << "'";
+ << "pattern: '" << primary_pattern.ToString() << "'";
+ return true;
+ }
return predicate.Run(url);
build/patches/Add-setting-to-invert-tap-and-long-tap.patch
+9 -9
View File
@@ -48,7 +48,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
@@ -55,6 +55,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -56,6 +56,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
@@ -58,7 +58,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
private TextScalePreference mTextScalePref;
private PageZoomPreference mPageZoomDefaultZoomPref;
private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
@@ -174,6 +177,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -175,6 +178,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.isEnabled());
mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
@@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
Preference captions = findPreference(PREF_CAPTIONS);
captions.setOnPreferenceClickListener(
preference -> {
@@ -262,6 +271,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -263,6 +272,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
mDelegate.requestRestart(getActivity());
} else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
mDisableToolbarSwipeUpDelegate.setEnabled((Boolean) newValue);
@@ -205,7 +205,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -366,6 +366,8 @@ public abstract class ChromeFeatureList {
@@ -370,6 +370,8 @@ public abstract class ChromeFeatureList {
"DisableToolbarSwipeUp";
public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
"MoveTopToolbarToBottom";
@@ -214,7 +214,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
"NotificationPermissionBottomSheet";
@@ -650,6 +652,8 @@ public abstract class ChromeFeatureList {
@@ -654,6 +656,8 @@ public abstract class ChromeFeatureList {
newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
public static final CachedFlag sMoveTopToolbarToBottom =
newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -223,7 +223,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final CachedFlag sPrivacyGuidePreloadAndroid =
newCachedFlag(PRIVACY_GUIDE_PRELOAD_ANDROID, false);
public static final CachedFlag sOptimizationGuidePushNotifications =
@@ -808,6 +812,7 @@ public abstract class ChromeFeatureList {
@@ -812,6 +816,7 @@ public abstract class ChromeFeatureList {
sTabWindowManagerIndexReassignmentActivityNotInAppTasks,
sTabWindowManagerReportIndicesMismatch,
sUseChimeAndroidSdk,
@@ -234,7 +234,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1729,6 +1729,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1724,6 +1724,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_DISABLE_TOOLBAR_SWIPE_UP" desc="Summary of the preference that allows the user to disable toolbar swipeup.">
Disable toolbar swipe up
</message>
@@ -247,7 +247,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<!-- Safety check -->
<message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">
@@ -3016,6 +3022,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -3011,6 +3017,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_CONTEXTMENU_OPEN_IN_NEW_CHROME_TAB" desc="Context sensitive menu item to open the selected link in a new Chrome tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
Open in new Chrome tab
</message>
@@ -260,7 +260,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
@@ -35,6 +35,11 @@ found in the LICENSE file.
@@ -36,6 +36,11 @@ found in the LICENSE file.
android:summary="@string/page_zoom_always_show_preference_summary"
android:title="@string/page_zoom_always_show_preference_title" />
build/patches/Add-support-for-ISupportHelpAndFeedback.patch
+2 -2
View File
@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -96,6 +96,7 @@ import org.chromium.components.browser_ui.settings.CustomDividerFragment;
@@ -98,6 +98,7 @@ import org.chromium.components.browser_ui.settings.CustomDividerFragment;
import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher;
import org.chromium.components.browser_ui.settings.PaddedItemDecorationWithDivider;
import org.chromium.components.browser_ui.settings.SettingsLauncher;
@@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import org.chromium.components.browser_ui.site_settings.BaseSiteSettingsFragment;
import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat;
@@ -481,8 +482,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -517,8 +518,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
finish();
return true;
} else if (item.getItemId() == R.id.menu_id_general_help) {
build/patches/Add-support-to-jxl.patch
+1 -1
View File
@@ -2648,7 +2648,7 @@ new file mode 100644
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -20875,6 +20875,7 @@ from previous Chrome versions.
@@ -20877,6 +20877,7 @@ from previous Chrome versions.
<int value="188610022" label="NewMessageListView:enabled"/>
<int value="189728101" label="FasterLocationReload:disabled"/>
<int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>
build/patches/Allow-building-without-enable_reporting.patch
+2 -2
View File
@@ -82,7 +82,7 @@ diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/
kType, context_url_, blink::mojom::ReportBody::New(std::move(list))));
}
+#if BUILDFLAG(ENABLE_REPORTING)
+ const absl::optional<std::string>& endpoint =
+ const std::optional<std::string>& endpoint =
+ report_only ? report_only_endpoint_ : endpoint_;
if (endpoint) {
base::Value::Dict body_to_pass;
@@ -362,7 +362,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
#include "services/network/public/cpp/features.h"
#include "services/network/public/mojom/content_security_policy.mojom-blink.h"
#include "services/network/public/mojom/source_location.mojom-blink.h"
@@ -2735,9 +2736,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
@@ -2760,9 +2761,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
v8_local_compile_hints_producer_->GenerateData(kIsFinalData);
}
build/patches/Ask-for-restart-on-connection-change.patch
+2 -2
View File
@@ -697,7 +697,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -3172,6 +3172,7 @@ void LocalFrame::DidFreeze() {
@@ -3197,6 +3197,7 @@ void LocalFrame::DidFreeze() {
LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
Loader().SetDefersLoading(freeze_mode);
@@ -705,7 +705,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
}
void LocalFrame::DidResume() {
@@ -3186,6 +3187,7 @@ void LocalFrame::DidResume() {
@@ -3211,6 +3212,7 @@ void LocalFrame::DidResume() {
GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
Loader().SetDefersLoading(LoaderFreezeMode::kNone);
build/patches/Bookmarks-select-all-menu-entry.patch
+1 -1
View File
@@ -86,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -245,6 +245,9 @@ CHAR_LIMIT guidelines:
@@ -246,6 +246,9 @@ CHAR_LIMIT guidelines:
<message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
Sites
</message>
build/patches/Bromite-auto-updater.patch
+4 -4
View File
@@ -1096,7 +1096,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -335,6 +335,7 @@ public abstract class ChromeFeatureList {
@@ -339,6 +339,7 @@ public abstract class ChromeFeatureList {
public static final String INCOGNITO_REAUTHENTICATION_FOR_ANDROID =
"IncognitoReauthenticationForAndroid";
public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
@@ -1671,7 +1671,7 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2199,6 +2199,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -2194,6 +2194,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">
Chrome updates are no longer supported for this version of Android
</message>
@@ -1684,7 +1684,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<!-- Account management UI strings. -->
<message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR_LIMIT=32]">
@@ -4050,7 +4056,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -4045,7 +4051,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<!-- Main menu items -->
<message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
@@ -1696,7 +1696,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
</message>
<message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">
Newer version is available
@@ -4061,6 +4070,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -4056,6 +4065,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<message name="IDS_MENU_UPDATE_UNSUPPORTED_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that the Android version on the device is unsupported. [CHAR_LIMIT=30]">
Android version is unsupported
</message>
build/patches/Bromite-subresource-adblocker.patch
+4 -4
View File
@@ -210,7 +210,7 @@ diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res
diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
@@ -19,6 +19,10 @@ found in the LICENSE file.
@@ -22,6 +22,10 @@ found in the LICENSE file.
<!-- Compositor Tab Title Text -->
<bool name="compositor_tab_title_fake_bold_text">true</bool>
@@ -582,7 +582,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
"android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java",
"android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
"android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
@@ -33,6 +34,7 @@ android_library("java") {
@@ -46,6 +47,7 @@ java_bromite_impl("java_cromite_cached_flags") {
generate_jni("jni_headers") {
sources = [ "android/java/src/org/chromium/chrome/browser/flags/CromiteNativeUtils.java" ]
sources += [
@@ -590,7 +590,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
"android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
"android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
]
@@ -47,6 +49,7 @@ static_library("flags_android") {
@@ -60,6 +62,7 @@ static_library("flags_android") {
"android/chrome_session_state.cc",
"android/chrome_session_state.h",
]
@@ -702,7 +702,7 @@ diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -217,6 +217,20 @@ CHAR_LIMIT guidelines:
@@ -218,6 +218,20 @@ CHAR_LIMIT guidelines:
Advanced
</message>
build/patches/Bubble-Locking-on-UI-DevTools.patch
+82
View File
@@ -0,0 +1,82 @@
From: uazo <uazo@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:38:58 +0000
Subject: Bubble Locking on UI DevTools
Allows the use of ctrl+shift+click on the refresh button to
activate the Bubble Locking mode for the native dev-ui.
The current ctrl+shift+R is really inconvenient and often does not work.
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../browser/ui/views/toolbar/reload_button.cc | 8 ++++++
ui/views/widget/widget.h | 25 ++++++++++---------
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -224,6 +224,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
command = IDC_RELOAD;
}
+ views::Widget::SetDisableActivationChangeHandling(
+ views::Widget::DisableActivationChangeHandlingType::kNone);
+ if (event.IsShiftDown() && event.IsControlDown()) {
+ views::Widget::SetDisableActivationChangeHandling(
+ views::Widget::DisableActivationChangeHandlingType::kIgnoreDeactivationOnly);
+ return;
+ }
+
// Start a timer - while this timer is running, the reload button cannot be
// changed to a stop button. We do not set |intended_mode_| to Mode::kStop
// here as the browser will do that when it actually starts loading (which
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -1230,6 +1230,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
void SetAllowScreenshots(bool allow);
bool AreScreenshotsAllowed();
+ // Type of ways to ignore activation changes.
+ enum class DisableActivationChangeHandlingType {
+ kNone = 0, // Don't ignore any activation changes.
+ kIgnore, // Ignore both activation and deactivation changes.
+ kIgnoreDeactivationOnly, // Ignore only deactivation changes.
+ };
+
+ // Sets/gets the type of disabling widget activation change handling.
+ static void SetDisableActivationChangeHandling(
+ DisableActivationChangeHandlingType new_type) {
+ g_disable_activation_change_handling_ = new_type;
+ }
+
protected:
// Creates the RootView to be used within this Widget. Subclasses may override
// to create custom RootViews that do specialized event processing.
@@ -1269,13 +1282,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
ui::ColorProviderKey GetColorProviderKey() const override;
private:
- // Type of ways to ignore activation changes.
- enum class DisableActivationChangeHandlingType {
- kNone = 0, // Don't ignore any activation changes.
- kIgnore, // Ignore both activation and deactivation changes.
- kIgnoreDeactivationOnly, // Ignore only deactivation changes.
- };
-
class PaintAsActiveLockImpl;
friend class ButtonTest;
@@ -1286,11 +1292,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
friend class ui_devtools::PageAgentViews;
friend void DisableActivationChangeHandlingForTests();
- // Sets/gets the type of disabling widget activation change handling.
- static void SetDisableActivationChangeHandling(
- DisableActivationChangeHandlingType new_type) {
- g_disable_activation_change_handling_ = new_type;
- }
static DisableActivationChangeHandlingType
GetDisableActivationChangeHandling() {
return g_disable_activation_change_handling_;
--
build/patches/Cromite-Branding.patch
+32 -2
View File
@@ -51,9 +51,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../chromium/product_logo_white.png | Bin 1417 -> 3040 bytes
.../chromium/product_logo.png | Bin 2714 -> 7923 bytes
.../chromium/product_logo_white.png | Bin 2512 -> 6790 bytes
.../version_ui/resources/about_version.ts | 2 +-
.../resources/about_version_mobile.css | 9 ++
content/child/runtime_features.cc | 23 +++--
tools/grit/grit/grd_reader.py | 35 +++++++
49 files changed, 172 insertions(+), 111 deletions(-)
51 files changed, 182 insertions(+), 112 deletions(-)
diff --git a/build/BUILD.gn b/build/BUILD.gn
--- a/build/BUILD.gn
@@ -13222,7 +13224,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2264,7 +2264,7 @@ Your Google account may have other forms of browsing history like searches and a
@@ -2259,7 +2259,7 @@ Your Google account may have other forms of browsing history like searches and a
About Chrome
</message>
<message name="IDS_LEGAL_INFORMATION_SUMMARY" desc="Summary for legal information" meaning="Android">
@@ -18861,6 +18863,34 @@ z%lwlC#@8v20MrdyXS4Cd9v0(a*!707Mi)DWKCPo$-?g#BRX!@}3RwzBwgOM1&^{Rc
z3=3bI32q;3&^A^#@RQ;k{^t41Rq+f34W3u|*@1288y{>q;|6&;qJI})ZE0^oH1|#U
EKU(of)Bpeg
diff --git a/components/version_ui/resources/about_version.ts b/components/version_ui/resources/about_version.ts
--- a/components/version_ui/resources/about_version.ts
+++ b/components/version_ui/resources/about_version.ts
@@ -183,7 +183,7 @@ function initialize() {
// </if>
chrome.send('requestVersionInfo');
- const includeVariationsCmd = location.search.includes('show-variations-cmd');
+ const includeVariationsCmd = true;
sendWithPromise('requestVariationInfo', includeVariationsCmd)
.then(handleVariationInfo);
sendWithPromise('requestPathInfo').then(handlePathInfo);
diff --git a/components/version_ui/resources/about_version_mobile.css b/components/version_ui/resources/about_version_mobile.css
--- a/components/version_ui/resources/about_version_mobile.css
+++ b/components/version_ui/resources/about_version_mobile.css
@@ -17,3 +17,12 @@
margin-left: auto;
margin-right: auto;
}
+
+tr, td {
+ display: block;
+ text-align: left !important;
+}
+
+td:last-child {
+ margin-bottom: 8px;
+}
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
build/patches/Deprecate-Data-URL-in-SVGUseElement.patch
+1 -1
View File
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3299,8 +3299,8 @@
@@ -3305,8 +3305,8 @@
status: "stable",
},
{
build/patches/Disable-Accessibility-service-by-default.patch
+3 -3
View File
@@ -27,9 +27,9 @@ new file mode 100644
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
@@ -7,6 +7,11 @@ found in the LICENSE file.
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
@@ -8,6 +8,11 @@ found in the LICENSE file.
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+ android:key="enable_accessibility"
build/patches/Disable-FedCm.patch
+1 -1
View File
@@ -26,7 +26,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1526,7 +1526,7 @@
@@ -1532,7 +1532,7 @@
{
name: "FedCm",
public: true,
build/patches/Disable-GetInstalledRelatedApps-API.patch
+1 -1
View File
@@ -58,7 +58,7 @@ new file mode 100644
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2194,9 +2194,9 @@
@@ -2200,9 +2200,9 @@
status: {"Android": "test", "default": "stable"},
},
{
build/patches/Disable-StartSurface-feature.patch
+1 -1
View File
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -668,7 +668,7 @@ public abstract class ChromeFeatureList {
@@ -672,7 +672,7 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sSmallerTabStripTitleLimit =
newCachedFlag(SMALLER_TAB_STRIP_TITLE_LIMIT, true);
public static final CachedFlag sStartSurfaceAndroid =
build/patches/Disable-all-predictors-code.patch
+1 -1
View File
@@ -537,7 +537,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3109,7 +3109,7 @@
@@ -3115,7 +3115,7 @@
//
// It also has some feature params defined throughout the codebase.
name: "Prerender2",
build/patches/Disable-conversion-measurement-api.patch
+1 -1
View File
@@ -898,7 +898,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -4016,6 +4016,7 @@
@@ -4022,6 +4022,7 @@
},
{
name: "TopicsAPI",
build/patches/Disable-idle-detection.patch
+1 -1
View File
@@ -55,7 +55,7 @@ diff --git a/third_party/blink/renderer/modules/idle/idle_detector.idl b/third_p
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2088,6 +2088,11 @@
@@ -2094,6 +2094,11 @@
name: "IgnoresCSSTextTransformsForPlainTextCopy",
status: "stable",
},
build/patches/Disable-media-router-and-remoting-by-default.patch
+1 -1
View File
@@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.c
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3274,14 +3274,10 @@
@@ -3280,14 +3280,10 @@
base_feature: "none",
},
{
build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch
-48
View File
@@ -1,48 +0,0 @@
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Wed, 11 Oct 2017 23:24:58 +0200
Subject: Disable omission of URL elements in Omnibox
Disable all omissions because they are used throughout the code without
a corresponding user option to individually disable their usage.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../toolbar/chrome_location_bar_model_delegate.cc | 2 +-
components/url_formatter/url_formatter.cc | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -261,5 +261,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
// static
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, false);
+ registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
}
diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
@@ -534,13 +534,13 @@ bool HasTwoViewSourceSchemes(std::string_view spec) {
} // namespace
const FormatUrlType kFormatUrlOmitNothing = 0;
-const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
-const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
-const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
-const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
-const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
-const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
-const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7;
+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
+const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
+const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6;
+const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7;
const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8;
const FormatUrlType kFormatUrlOmitMobilePrefix = 1 << 9;
--
build/patches/Disable-omission-of-URL-elements.patch
+125
View File
@@ -0,0 +1,125 @@
From: uazo <uazo@users.noreply.github.com>
Date: Wed, 11 Oct 2017 23:24:58 +0200
Subject: Disable omission of URL elements
Disabling some omissions of complete urls
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../ephemeraltab/EphemeralTabSheetContent.java | 3 +--
.../share_sheet/ShareSheetBottomSheetContent.java | 4 +---
.../toolbar/chrome_location_bar_model_delegate.cc | 2 +-
.../ui/views/page_info/page_info_main_view.cc | 15 ++++++++++-----
.../components/bookmarks/BookmarkItem.java | 1 +
.../omnibox/browser/titled_url_match_utils.cc | 2 +-
.../components/page_info/PageInfoController.java | 3 +--
7 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
@@ -235,8 +235,7 @@ public class EphemeralTabSheetContent implements BottomSheetContent {
/** Sets the ephemeral tab URL. */
public void updateURL(GURL url) {
TextView originView = mToolbarView.findViewById(R.id.origin);
- originView.setText(
- UrlFormatter.formatUrlForSecurityDisplay(url, SchemeDisplay.OMIT_HTTP_AND_HTTPS));
+ originView.setText(url.getSpec());
}
/** Sets the security icon. */
diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
--- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
@@ -268,9 +268,7 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis
ShareSheetLinkToggleCoordinator shareSheetLinkToggleCoordinator) {
// Default preview is to show title + url.
String title = mParams.getTitle();
- String subtitle =
- UrlFormatter.formatUrlForSecurityDisplay(
- mParams.getUrl(), SchemeDisplay.OMIT_HTTP_AND_HTTPS);
+ String subtitle = mParams.getUrl();
if (contentTypes.contains(ContentType.IMAGE)
|| contentTypes.contains(ContentType.IMAGE_AND_LINK)) {
diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -261,5 +261,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
// static
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, false);
+ registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
}
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
--- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -562,10 +562,14 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) {
}
std::unique_ptr<views::View> PageInfoMainView::CreateBubbleHeaderView() {
- auto header = std::make_unique<views::View>();
- header->SetLayoutManager(std::make_unique<views::FlexLayout>())
+ auto cromite_header = std::make_unique<views::ScrollView>();
+ cromite_header->SetVerticalScrollBarMode(views::ScrollView::ScrollBarMode::kHiddenButEnabled);
+ cromite_header->SetHorizontalScrollBarMode(views::ScrollView::ScrollBarMode::kDisabled);
+ cromite_header->ClipHeightTo(0, 150);
+ auto scroll_contents = std::make_unique<views::View>();
+ scroll_contents->SetLayoutManager(std::make_unique<views::FlexLayout>())
->SetInteriorMargin(gfx::Insets::VH(0, 20));
- title_ = header->AddChildView(std::make_unique<views::Label>(
+ title_ = scroll_contents->AddChildView(std::make_unique<views::Label>(
std::u16string(), views::style::CONTEXT_DIALOG_TITLE,
views::style::STYLE_HEADLINE_4,
gfx::DirectionalityMode::DIRECTIONALITY_AS_URL));
@@ -589,9 +593,10 @@ std::unique_ptr<views::View> PageInfoMainView::CreateBubbleHeaderView() {
// button padding when calculating margins.
close_button->SetProperty(views::kInternalPaddingKey,
close_button->GetInsets());
- header->AddChildView(close_button.release());
+ scroll_contents->AddChildView(close_button.release());
+ cromite_header->SetContents(std::move(scroll_contents));
- return header;
+ return cromite_header;
}
std::unique_ptr<views::View> PageInfoMainView::CreateAboutThisSiteSection(
diff --git a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
--- a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
+++ b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
@@ -61,6 +61,7 @@ public class BookmarkItem {
/** Returns the string to display for the item's url. */
public String getUrlForDisplay() {
+ if ((true)) return getUrl().getSpec();
return UrlFormatter.formatUrlForSecurityDisplay(
getUrl(), SchemeDisplay.OMIT_HTTP_AND_HTTPS);
}
diff --git a/components/omnibox/browser/titled_url_match_utils.cc b/components/omnibox/browser/titled_url_match_utils.cc
--- a/components/omnibox/browser/titled_url_match_utils.cc
+++ b/components/omnibox/browser/titled_url_match_utils.cc
@@ -81,7 +81,7 @@ AutocompleteMatch TitledUrlMatchToAutocompleteMatch(
// Otherwise, display the path, even if the input matches both or neither.
bool show_path = titled_url_match.has_ancestor_match ||
titled_url_match.url_match_positions.empty();
- match.contents = show_path ? path : formatted_url;
+ match.contents = /*show_path ? path :*/ formatted_url;
// The path can become stale (when the bookmark is moved). So persist the URL
// instead when creating shortcuts.
if (show_path)
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
--- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
@@ -226,8 +226,7 @@ public class PageInfoController
OmniboxUrlEmphasizer.getOriginEndIndex(
displayUrlBuilder.toString(), autocompleteSchemeClassifier);
autocompleteSchemeClassifier.destroy();
- containerParams.truncatedUrl =
- UrlFormatter.formatUrlForDisplayOmitSchemePathAndTrivialSubdomains(mFullUrl);
+ containerParams.truncatedUrl = url;
containerParams.backButtonClickCallback = this::exitSubpage;
containerParams.urlTitleClickCallback = mContainer::toggleUrlTruncation;
// Long press the url text to copy it to the clipboard.
--
build/patches/Disable-plugins-enumeration.patch
+1 -1
View File
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2252,9 +2252,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -2256,9 +2256,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
}
PluginData* LocalFrame::GetPluginData() const {
build/patches/Disable-prefers-reduced-transparency-media-query.patch
+1 -1
View File
@@ -51,7 +51,7 @@ diff --git a/third_party/blink/renderer/core/preferences/preference_manager.idl
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3091,6 +3091,10 @@
@@ -3097,6 +3097,10 @@
name: "PrefersReducedData",
status: "experimental",
},
build/patches/Disable-safety-check.patch
+2 -2
View File
@@ -71,7 +71,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -70,10 +70,6 @@ import org.chromium.chrome.browser.profiles.Profile;
@@ -71,10 +71,6 @@ import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
import org.chromium.chrome.browser.safe_browsing.settings.SafeBrowsingSettingsFragmentBase;
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import org.chromium.chrome.browser.safety_hub.SafetyHubBaseFragment;
import org.chromium.chrome.browser.safety_hub.SafetyHubFragment;
import org.chromium.chrome.browser.safety_hub.SafetyHubModuleDelegateImpl;
@@ -559,21 +555,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -595,21 +591,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
baseSiteSettingsFragment.setCustomTabIntentHelper(
LaunchIntentDispatcher::createCustomTabActivityIntent);
}
build/patches/Disable-smart-selection-by-default.patch
+1 -1
View File
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -247,6 +247,7 @@ public abstract class ChromeFeatureList {
@@ -251,6 +251,7 @@ public abstract class ChromeFeatureList {
public static final String CCT_INTENT_FEATURE_OVERRIDES = "CCTIntentFeatureOverrides";
public static final String CCT_PAGE_INSIGHTS_HUB = "CCTPageInsightsHub";
public static final String CCT_PAGE_INSIGHTS_HUB_PEEK = "CCTPageInsightsHubPeek";
build/patches/Disable-text-fragments-by-default.patch
+1 -1
View File
@@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3966,10 +3966,9 @@
@@ -3972,10 +3972,9 @@
},
{
name: "TextFragmentIdentifiers",
build/patches/DoH-improvements.patch
+90 -5
View File
@@ -7,11 +7,16 @@ Always enforce DoH even with inconsistent system DNS configuration
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
chrome/browser/net/secure_dns_config.cc | 2 +-
chrome/browser/net/stub_resolver_config_reader.cc | 3 +++
net/dns/dns_client.cc | 11 ++++++++---
net/dns/host_resolver_manager.cc | 1 +
4 files changed, 13 insertions(+), 4 deletions(-)
chrome/browser/net/secure_dns_config.cc | 2 +-
chrome/browser/net/secure_dns_util.cc | 2 +-
chrome/browser/net/stub_resolver_config_reader.cc | 3 +++
chrome/browser/privacy/secure_dns_bridge.cc | 2 +-
.../ui/webui/settings/settings_secure_dns_handler.cc | 2 +-
net/dns/dns_client.cc | 11 ++++++++---
net/dns/host_resolver_manager.cc | 1 +
net/dns/public/doh_provider_entry.cc | 9 +++------
net/dns/public/doh_provider_entry.h | 4 ++--
9 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/chrome/browser/net/secure_dns_config.cc b/chrome/browser/net/secure_dns_config.cc
--- a/chrome/browser/net/secure_dns_config.cc
@@ -25,6 +30,18 @@ diff --git a/chrome/browser/net/secure_dns_config.cc b/chrome/browser/net/secure
} else if (name == kModeOff) {
return net::SecureDnsMode::kOff;
}
diff --git a/chrome/browser/net/secure_dns_util.cc b/chrome/browser/net/secure_dns_util.cc
--- a/chrome/browser/net/secure_dns_util.cc
+++ b/chrome/browser/net/secure_dns_util.cc
@@ -42,7 +42,7 @@ bool EntryIsForCountry(const net::DohProviderEntry* entry, int country_id) {
country_id;
});
if (matches) {
- DCHECK(!entry->ui_name.empty());
+ DCHECK(!entry->ui_name_cromite.empty());
DCHECK(!entry->privacy_policy.empty());
}
return matches;
diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc
--- a/chrome/browser/net/stub_resolver_config_reader.cc
+++ b/chrome/browser/net/stub_resolver_config_reader.cc
@@ -52,6 +69,30 @@ diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/
if (parental_controls_testing_override_.has_value())
return parental_controls_testing_override_.value();
diff --git a/chrome/browser/privacy/secure_dns_bridge.cc b/chrome/browser/privacy/secure_dns_bridge.cc
--- a/chrome/browser/privacy/secure_dns_bridge.cc
+++ b/chrome/browser/privacy/secure_dns_bridge.cc
@@ -109,7 +109,7 @@ static ScopedJavaLocalRef<jobjectArray> JNI_SecureDnsBridge_GetProviders(
providers, std::back_inserter(ret),
[](const net::DohProviderEntry* entry) -> std::vector<std::u16string> {
net::DnsOverHttpsConfig config({entry->doh_server_config});
- return {base::UTF8ToUTF16(entry->ui_name),
+ return {base::UTF8ToUTF16(entry->ui_name_cromite.empty() ? entry->provider : entry->ui_name_cromite),
base::UTF8ToUTF16(config.ToString()),
base::UTF8ToUTF16(entry->privacy_policy)};
});
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc
--- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc
@@ -120,7 +120,7 @@ base::Value::List SecureDnsHandler::GetSecureDnsResolverList() {
for (const net::DohProviderEntry* entry : providers_) {
net::DnsOverHttpsConfig doh_config({entry->doh_server_config});
base::Value::Dict dict;
- dict.Set("name", entry->ui_name);
+ dict.Set("name", entry->ui_name_cromite.empty() ? entry->provider : entry->ui_name_cromite);
dict.Set("value", doh_config.ToString());
dict.Set("policy", entry->privacy_policy);
resolvers.Append(std::move(dict));
diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc
--- a/net/dns/dns_client.cc
+++ b/net/dns/dns_client.cc
@@ -95,4 +136,48 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
NetworkChangeNotifier::TriggerNonSystemDnsChange();
// Only invalidate cache if new overrides have resulted in a config change.
diff --git a/net/dns/public/doh_provider_entry.cc b/net/dns/public/doh_provider_entry.cc
--- a/net/dns/public/doh_provider_entry.cc
+++ b/net/dns/public/doh_provider_entry.cc
@@ -350,16 +350,13 @@ DohProviderEntry::DohProviderEntry(
doh_server_config(
ParseValidDohTemplate(std::move(dns_over_https_template),
std::move(dns_over_https_server_ip_strs))),
- ui_name(std::move(ui_name)),
+ ui_name_cromite(std::move(ui_name)),
privacy_policy(std::move(privacy_policy)),
- display_globally(display_globally),
+ display_globally(true),
display_countries(std::move(display_countries)),
logging_level(logging_level) {
DCHECK(!display_globally || this->display_countries.empty());
- if (display_globally || !this->display_countries.empty()) {
- DCHECK(!this->ui_name.empty());
- DCHECK(!this->privacy_policy.empty());
- }
+ if (this->privacy_policy.empty()) this->display_globally = false;
for (const auto& display_country : this->display_countries) {
DCHECK_EQ(2u, display_country.size());
}
diff --git a/net/dns/public/doh_provider_entry.h b/net/dns/public/doh_provider_entry.h
--- a/net/dns/public/doh_provider_entry.h
+++ b/net/dns/public/doh_provider_entry.h
@@ -55,7 +55,7 @@ struct NET_EXPORT DohProviderEntry {
std::set<IPAddress> ip_addresses;
std::set<std::string> dns_over_tls_hostnames;
DnsOverHttpsServerConfig doh_server_config;
- std::string ui_name;
+ std::string ui_name_cromite;
std::string privacy_policy;
bool display_globally;
std::set<std::string> display_countries;
@@ -95,7 +95,7 @@ struct NET_EXPORT DohProviderEntry {
std::set<std::string_view> dns_over_53_server_ip_strs,
std::set<std::string> dns_over_tls_hostnames,
std::string dns_over_https_template,
- std::string ui_name,
+ std::string ui_name_cromite,
std::string privacy_policy,
bool display_globally,
std::set<std::string> display_countries,
--
build/patches/Enable-Document-Open-Inheritance-Removal.patch
+1 -1
View File
@@ -85,7 +85,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1353,7 +1353,6 @@
@@ -1359,7 +1359,6 @@
{
name: "DocumentOpenSandboxInheritanceRemoval",
status: "stable",
build/patches/Enable-Global-Privacy-Control.patch
+4 -4
View File
@@ -111,9 +111,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
+ android:key="gpc"
+ android:title="@string/gpc_title"
+ android:fragment="org.chromium.chrome.browser.privacy.settings.GpcSettings" />
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="allow_custom_tab_intents"
android:title="@string/allow_custom_tab_intents_title"
<org.chromium.chrome.browser.about_settings.HyperlinkPreference
android:key="cromite_flags"
android:title="@string/cromite_flags_title"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/GpcSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/GpcSettings.java
new file mode 100644
--- /dev/null
@@ -811,7 +811,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicat
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1880,6 +1880,11 @@
@@ -1886,6 +1886,11 @@
status: "stable",
base_feature: "none",
},
build/patches/Enable-ImprovedBookmarks-by-default.patch
+1 -1
View File
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -834,7 +834,7 @@ public abstract class ChromeFeatureList {
@@ -845,7 +845,7 @@ public abstract class ChromeFeatureList {
public static final MutableFlagWithSafeDefault sAdaptiveButtonInTopToolbarCustomizationV2 =
newMutableFlagWithSafeDefault(ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2, false);
public static final MutableFlagWithSafeDefault sAndroidImprovedBookmarks =
build/patches/Enable-native-Android-autofill.patch
+3 -3
View File
@@ -284,7 +284,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3944,19 +3944,6 @@ const FeatureEntry::FeatureVariation kAutofillGranularFillingAvailableVariations
@@ -3948,19 +3948,6 @@ const FeatureEntry::FeatureVariation kAutofillGranularFillingAvailableVariations
kAutofillGranularFillingAvailableVariationWithExpandControlVisibleOnSelectionOnly),
nullptr}};
@@ -304,7 +304,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
const FeatureEntry::FeatureParam kDefaultBrowserPromptRefreshAggressive[] = {
{"max_prompt_count", "-1"},
{"reprompt_duration", "7d"},
@@ -6019,15 +6006,6 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6030,15 +6017,6 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_ANDROID)
@@ -390,7 +390,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -672,6 +672,12 @@ For more settings that use data to improve your Chrome experience, go to <ph nam
@@ -673,6 +673,12 @@ For more settings that use data to improve your Chrome experience, go to <ph nam
<message name="IDS_PASSWORD_SETTINGS_SAVE_PASSWORDS" desc="Title for the checkbox toggling whether passwords are saved or not. [CHAR_LIMIT=32]">
Save passwords
</message>
build/patches/Enable-share-intent.patch
+2 -2
View File
@@ -479,7 +479,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -421,6 +421,7 @@ public abstract class ChromeFeatureList {
@@ -425,6 +425,7 @@ public abstract class ChromeFeatureList {
public static final String READER_MODE_IN_CCT = "ReaderModeInCCT";
public static final String READING_LIST_ENABLE_SYNC_TRANSPORT_MODE_UPON_SIGNIN =
"ReadingListEnableSyncTransportModeUponSignIn";
@@ -490,7 +490,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -5519,6 +5519,19 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -5514,6 +5514,19 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
Make sure a phone app is enabled on this device
</message>
build/patches/Experimental-user-scripts-support.patch
+22 -22
View File
@@ -691,7 +691,7 @@ diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/
diff --git a/components/components_strings.grd b/components/components_strings.grd
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -337,6 +337,7 @@
@@ -338,6 +338,7 @@
<part file="user_education_strings.grdp" />
<part file="version_ui_strings.grdp" />
<part file="webapps_strings.grdp" />
@@ -5414,7 +5414,7 @@ new file mode 100755
+ MatchesPath(StripTrailingWildcard(other.path()));
+}
+
+absl::optional<URLPattern> URLPattern::CreateIntersection(
+std::optional<URLPattern> URLPattern::CreateIntersection(
+ const URLPattern& other) const {
+ // Easy case: Schemes don't overlap. Return nullopt.
+ int intersection_schemes = URLPattern::SCHEME_NONE;
@@ -5426,7 +5426,7 @@ new file mode 100755
+ intersection_schemes = valid_schemes_ & other.valid_schemes_;
+
+ if (intersection_schemes == URLPattern::SCHEME_NONE)
+ return absl::nullopt;
+ return std::nullopt;
+
+ {
+ // In a few cases, we can (mostly) return a copy of one of the patterns.
@@ -5488,7 +5488,7 @@ new file mode 100755
+ !get_intersection(port_, other.port_, &URLPattern::MatchesPortPattern,
+ &port) ||
+ !get_intersection(path_, other.path_, &URLPattern::MatchesPath, &path)) {
+ return absl::nullopt;
+ return std::nullopt;
+ }
+
+ // Only match subdomains if both patterns match subdomains.
@@ -5816,7 +5816,7 @@ new file mode 100755
+ // contains another, it will be handled correctly, but this method does not
+ // deal with cases like /*a* and /*b* (where technically the intersection
+ // is /*a*b*|/*b*a*); the intersection returned for that case will be empty.
+ absl::optional<URLPattern> CreateIntersection(const URLPattern& other) const;
+ std::optional<URLPattern> CreateIntersection(const URLPattern& other) const;
+
+ // Converts this URLPattern into an equivalent set of URLPatterns that don't
+ // use a wildcard in the scheme component. If this URLPattern doesn't use a
@@ -5984,7 +5984,7 @@ new file mode 100755
+ // they have with the other patterns.
+ for (const auto* pattern : unique_set1) {
+ for (const auto* pattern2 : unique_set2) {
+ absl::optional<URLPattern> intersection =
+ std::optional<URLPattern> intersection =
+ pattern->CreateIntersection(*pattern2);
+ if (intersection)
+ result.patterns_.insert(std::move(*intersection));
@@ -8280,7 +8280,7 @@ new file mode 100755
+ }
+
+void ScriptInjection::OnJsInjectionCompleted(
+ absl::optional<base::Value> results,
+ std::optional<base::Value> results,
+ base::TimeTicks start_time) {
+ DCHECK(!did_inject_js_);
+
@@ -8304,13 +8304,13 @@ new file mode 100755
+ run_location_, injected_stylesheets, num_injected_stylesheets);
+ blink::WebLocalFrame* web_frame = render_frame_->GetWebFrame();
+ // Default CSS origin is "author", but can be overridden to "user" by scripts.
+ absl::optional<CSSOrigin> css_origin = injector_->GetCssOrigin();
+ std::optional<CSSOrigin> css_origin = injector_->GetCssOrigin();
+ blink::WebCssOrigin blink_css_origin =
+ css_origin && *css_origin == CSS_ORIGIN_USER
+ ? blink::WebCssOrigin::kUser
+ : blink::WebCssOrigin::kAuthor;
+ blink::WebStyleSheetKey style_sheet_key;
+ if (const absl::optional<std::string>& injection_key =
+ if (const std::optional<std::string>& injection_key =
+ injector_->GetInjectionKey())
+ style_sheet_key = blink::WebString::FromASCII(*injection_key);
+ for (const blink::WebString& css : css_sources)
@@ -8414,7 +8414,7 @@ new file mode 100755
+
+ // Called when JS injection for the given frame has been completed or
+ // cancelled.
+ void OnJsInjectionCompleted(absl::optional<base::Value> results,
+ void OnJsInjectionCompleted(std::optional<base::Value> results,
+ base::TimeTicks start_time);
+
+ private:
@@ -8465,7 +8465,7 @@ new file mode 100755
+ bool log_activity_;
+
+ // Results storage.
+ absl::optional<base::Value> execution_result_;
+ std::optional<base::Value> execution_result_;
+
+ // The callback to run upon completing asynchronously.
+ CompletionCallback async_completion_callback_;
@@ -9052,10 +9052,10 @@ new file mode 100755
+ virtual bool IsUserGesture() const = 0;
+
+ // Returns the CSS origin of this injection.
+ virtual absl::optional<CSSOrigin> GetCssOrigin() const = 0;
+ virtual std::optional<CSSOrigin> GetCssOrigin() const = 0;
+
+ // Returns the key for this injection, if it's a CSS injection.
+ virtual const absl::optional<std::string> GetInjectionKey() const = 0;
+ virtual const std::optional<std::string> GetInjectionKey() const = 0;
+
+ // Returns true if the script expects results.
+ virtual bool ExpectsResults() const = 0;
@@ -9090,7 +9090,7 @@ new file mode 100755
+ // |render_frame| contains the render frame, or null if the frame was
+ // invalidated.
+ virtual void OnInjectionComplete(
+ absl::optional<base::Value> execution_result,
+ std::optional<base::Value> execution_result,
+ UserScript::RunLocation run_location,
+ content::RenderFrame* render_frame) = 0;
+
@@ -9355,12 +9355,12 @@ new file mode 100755
+ return false;
+}
+
+absl::optional<CSSOrigin> UserScriptInjector::GetCssOrigin() const {
+ return absl::nullopt;
+std::optional<CSSOrigin> UserScriptInjector::GetCssOrigin() const {
+ return std::nullopt;
+}
+
+const absl::optional<std::string> UserScriptInjector::GetInjectionKey() const {
+ return absl::nullopt;
+const std::optional<std::string> UserScriptInjector::GetInjectionKey() const {
+ return std::nullopt;
+}
+
+bool UserScriptInjector::ShouldInjectJs(
@@ -9437,7 +9437,7 @@ new file mode 100755
+}
+
+void UserScriptInjector::OnInjectionComplete(
+ absl::optional<base::Value> execution_result,
+ std::optional<base::Value> execution_result,
+ UserScript::RunLocation run_location,
+ content::RenderFrame* render_frame) {}
+
@@ -9493,8 +9493,8 @@ new file mode 100755
+ // ScriptInjector implementation.
+ UserScript::InjectionType script_type() const override;
+ bool IsUserGesture() const override;
+ absl::optional<CSSOrigin> GetCssOrigin() const override;
+ const absl::optional<std::string> GetInjectionKey() const override;
+ std::optional<CSSOrigin> GetCssOrigin() const override;
+ const std::optional<std::string> GetInjectionKey() const override;
+ bool ExpectsResults() const override;
+ bool ShouldInjectJs(
+ UserScript::RunLocation run_location,
@@ -9510,7 +9510,7 @@ new file mode 100755
+ UserScript::RunLocation run_location,
+ std::set<std::string>* injected_stylesheets,
+ size_t* num_injected_stylesheets) const override;
+ void OnInjectionComplete(absl::optional<base::Value> execution_result,
+ void OnInjectionComplete(std::optional<base::Value> execution_result,
+ UserScript::RunLocation run_location,
+ content::RenderFrame* render_frame) override;
+ void OnWillNotInject(InjectFailureReason reason,
build/patches/Eyeo-Adblock-for-Cromite.patch
+1 -1
View File
@@ -131,7 +131,7 @@ deactivation of all pop-ups (default disabled)
.../blink/renderer/core/css/style_engine.h | 1 +
.../renderer/core/exported/web_document.cc | 15 +-
.../definitions/adblock_private.d.ts | 14 +
121 files changed, 6140 insertions(+), 1301 deletions(-)
121 files changed, 6140 insertions(+), 1301 deletions(-)
create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.html
create mode 100644 chrome/browser/resources/settings/adblock_page/adblock_page.ts
rename components/adblock/android/java/res/xml/{adblock_preferences.xml => eyeo_adblock_preferences.xml} (56%)
build/patches/Final-patch-for-chromium-vanilla.patch
+17
View File
@@ -0,0 +1,17 @@
From: uazo <uazo@users.noreply.github.com>
Date: Fri, 2 Aug 2024 14:43:51 +0000
Subject: final patch for chromium vanilla
Mark the latest patch for chromium vanilla
---
tools/android/chromium_stage | 1 +
1 file changed, 1 insertion(+)
create mode 100644 tools/android/chromium_stage
diff --git a/tools/android/chromium_stage b/tools/android/chromium_stage
new file mode 100644
--- /dev/null
+++ b/tools/android/chromium_stage
@@ -0,0 +1 @@
+this file is only for the purpose of delimiting patches for chromium vanilla
--
build/patches/Fix-chromium-vanilla.patch
+34
View File
@@ -0,0 +1,34 @@
From: uazo <uazo@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:22:09 +0000
Subject: Fix chromium vanilla
Fixes some crashes in start-up (only chromium vanilla)
---
.../chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java | 2 ++
.../components/safe_browsing/SafeBrowsingApiBridge.java | 1 +
2 files changed, 3 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
@@ -206,6 +206,8 @@ public abstract class FirstRunFlowSequencer {
* @param freProperties Resulting FRE properties bundle.
*/
public void updateFirstRunProperties(Bundle freProperties) {
+ // fix chromium vanilla startup
+ if (freProperties == null) return;
boolean isHistorySyncEnabled =
ChromeFeatureList.isEnabled(
ChromeFeatureList.REPLACE_SYNC_PROMOS_WITH_SIGN_IN_PROMOS);
diff --git a/components/safe_browsing/android/java/src/org/chromium/components/safe_browsing/SafeBrowsingApiBridge.java b/components/safe_browsing/android/java/src/org/chromium/components/safe_browsing/SafeBrowsingApiBridge.java
--- a/components/safe_browsing/android/java/src/org/chromium/components/safe_browsing/SafeBrowsingApiBridge.java
+++ b/components/safe_browsing/android/java/src/org/chromium/components/safe_browsing/SafeBrowsingApiBridge.java
@@ -305,6 +305,7 @@ public final class SafeBrowsingApiBridge {
@CalledByNative
private static void startUriLookupBySafeBrowsingApi(
long callbackId, String uri, int[] threatTypes, int protocol) {
+ if ((true)) return; // (unused code in cromite) fix chromium vanilla crash
synchronized (sSafeBrowsingApiHandlerLock) {
if (sSafeBrowsingApiHandler == null) {
// sSafeBrowsingApiHandler can only be null in tests.
--
build/patches/Guard-for-user-agent-reduction.patch
+1 -1
View File
@@ -54,7 +54,7 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -3245,23 +3245,23 @@
@@ -3251,23 +3251,23 @@
// If enabled, the deviceModel will be reduced to "K" and the
// androidVersion will be reduced to a static "10" string in android
// User-Agent string.
build/patches/History-number-of-days-privacy-setting.patch
+3 -3
View File
@@ -38,7 +38,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -124,6 +124,12 @@ found in the LICENSE file.
@@ -128,6 +128,12 @@ found in the LICENSE file.
android:title="@string/cablev2_paask_title"
android:summary="@string/cablev2_paask_body"
android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment" />
@@ -79,7 +79,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
+ private static final String PREF_HISTORY_EXPIRE_DAYS_THRESHOLD = "history_expire_days_threshold";
+
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
getActivity().setTitle(R.string.prefs_privacy_security);
@@ -236,6 +242,40 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
@@ -245,7 +245,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/ch
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1281,6 +1281,18 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1282,6 +1282,18 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_CLEAR_HISTORY_TITLE" desc="Title for Clear History in Clear Browsing Data dialog">
Browsing history
</message>
build/patches/Internal-firewall.patch
+4 -4
View File
@@ -548,13 +548,13 @@ new file mode 100644
+ return it->second.allowed;
+}
+
+absl::optional<builders::EntryDecoder> FirewallService::GetEntry(
+std::optional<builders::EntryDecoder> FirewallService::GetEntry(
+ int32_t unique_id_hash_code) const {
+ const auto it = decode_map_.find(unique_id_hash_code);
+ if (it == decode_map_.end())
+ return absl::nullopt;
+ return std::nullopt;
+
+ return absl::optional<builders::EntryDecoder>(it->second);
+ return std::optional<builders::EntryDecoder>(it->second);
+}
+
+}
@@ -608,7 +608,7 @@ new file mode 100644
+ ~FirewallService();
+
+ bool IsAllowed(int32_t unique_id_hash_code);
+ absl::optional<builders::EntryDecoder> GetEntry(int32_t unique_id_hash_code) const;
+ std::optional<builders::EntryDecoder> GetEntry(int32_t unique_id_hash_code) const;
+
+ private:
+ raw_ptr<PrefService> pref_service_;
build/patches/Keep-disabled-FetchLaterAPI.patch
+1 -1
View File
@@ -169,7 +169,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1658,10 +1658,9 @@
@@ -1664,10 +1664,9 @@
},
{
// The Blink runtime-enabled feature name for the API's IDL.
build/patches/Log-dangling-attributes-in-some-html-elements.patch
+2 -2
View File
@@ -331,7 +331,7 @@ diff --git a/third_party/blink/renderer/core/page/frame_tree.cc b/third_party/bl
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1457,8 +1457,8 @@
@@ -1463,8 +1463,8 @@
// Experiment with preventing some instances of mutation XSS
// by escaping "<" and ">" in attribute values.
// See: crbug.com/1175016
@@ -342,7 +342,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
},
{
name: "EventTimingInteractionCount",
@@ -2364,6 +2364,12 @@
@@ -2370,6 +2370,12 @@
name: "MacFontsDeprecateFontTraitsWorkaround",
status: "stable",
},
build/patches/Move-navigation-bar-to-bottom.patch
+19 -17
View File
@@ -25,7 +25,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../tab_management/TabGroupUiViewBinder.java | 3 +
.../TabListContainerViewBinder.java | 15 +-
.../tab_management/TabListCoordinator.java | 153 +++++++++++++++++-
.../TabListEmptyCoordinator.java | 15 +-
.../TabListEmptyCoordinator.java | 17 +-
.../tab_management/TabListRecyclerView.java | 19 ++-
.../tab_management/TabSwitcherMediator.java | 27 +++-
.../settings/AccessibilitySettings.java | 26 +++
@@ -88,7 +88,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../AccessibilitySettingsDelegate.java | 7 +
.../render_widget_host_view_android.cc | 3 +
.../Move-navigation-bar-to-bottom.inc | 17 ++
75 files changed, 987 insertions(+), 81 deletions(-)
75 files changed, 989 insertions(+), 81 deletions(-)
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Move-navigation-bar-to-bottom.inc
diff --git a/cc/base/features.cc b/cc/base/features.cc
@@ -712,17 +712,19 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
mListObserver =
new ListObserver<Void>() {
@Override
@@ -121,6 +127,13 @@ class TabListEmptyCoordinator {
@@ -121,6 +127,15 @@ class TabListEmptyCoordinator {
public void attachEmptyView() {
if (mEmptyView != null && mEmptyView.getParent() == null) {
mRootView.addView(mEmptyView);
+ FrameLayout.LayoutParams emptyViewParams =
+ (FrameLayout.LayoutParams) mEmptyView.getLayoutParams();
+ int toolbarHeightPx = mBrowserControlsStateProvider.getTopControlsHeight();
+ if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+ FrameLayout.LayoutParams emptyViewParams =
+ (FrameLayout.LayoutParams) mEmptyView.getLayoutParams();
+ int toolbarHeightPx = mBrowserControlsStateProvider.getTopControlsHeight();
+ emptyViewParams.bottomMargin = toolbarHeightPx;
+ mEmptyView.setLayoutParams(emptyViewParams);
+ } else {
+ emptyViewParams.topMargin = toolbarHeightPx;
+ }
+ mEmptyView.setLayoutParams(emptyViewParams);
}
setEmptyViewVisibility(View.GONE);
}
@@ -862,7 +864,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
@@ -50,6 +50,11 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -51,6 +51,11 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
private BooleanPreferenceDelegate mForceTabletUIDelegate;
static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
@@ -874,7 +876,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
private TextScalePreference mTextScalePref;
private PageZoomPreference mPageZoomDefaultZoomPref;
private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
@@ -85,6 +90,10 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -86,6 +91,10 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
mFontSizePrefs = FontSizePrefs.getInstance(delegate.getBrowserContextHandle());
}
@@ -885,7 +887,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -153,6 +162,18 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -154,6 +163,18 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());
forceTabletUiPref.setOnPreferenceChangeListener(this);
@@ -904,7 +906,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
Preference captions = findPreference(PREF_CAPTIONS);
captions.setOnPreferenceClickListener(
preference -> {
@@ -236,6 +257,11 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
@@ -237,6 +258,11 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
mDelegate.getBrowserContextHandle(), (Integer) newValue);
} else if (PREF_PAGE_ZOOM_ALWAYS_SHOW.equals(preference.getKey())) {
PageZoomUtils.setShouldAlwaysShowZoomMenuItem((Boolean) newValue);
@@ -1699,7 +1701,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -374,6 +374,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -410,6 +410,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
if (fragment instanceof INeedSnackbarManager) {
((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager);
}
@@ -2115,7 +2117,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -361,6 +361,10 @@ public abstract class ChromeFeatureList {
@@ -365,6 +365,10 @@ public abstract class ChromeFeatureList {
"NavBarColorMatchesTabBackground";
public static final String NEW_TAB_SEARCH_ENGINE_URL_ANDROID = "NewTabSearchEngineUrlAndroid";
public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
@@ -2126,7 +2128,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
"NotificationPermissionBottomSheet";
@@ -641,6 +645,10 @@ public abstract class ChromeFeatureList {
@@ -645,6 +649,10 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sPriceInsights = newCachedFlag(PRICE_INSIGHTS, false);
public static final CachedFlag sPrivacyGuideAndroid3 =
newCachedFlag(PRIVACY_GUIDE_ANDROID_3, false);
@@ -2137,7 +2139,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final CachedFlag sPrivacyGuidePreloadAndroid =
newCachedFlag(PRIVACY_GUIDE_PRELOAD_ANDROID, false);
public static final CachedFlag sOptimizationGuidePushNotifications =
@@ -767,6 +775,8 @@ public abstract class ChromeFeatureList {
@@ -771,6 +779,8 @@ public abstract class ChromeFeatureList {
sPrivacyGuideAndroid3,
sPrivacyGuidePreloadAndroid,
sOptimizationGuidePushNotifications,
@@ -2510,7 +2512,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1696,6 +1696,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1691,6 +1691,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">
Force Tablet Mode
</message>
@@ -2884,7 +2886,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
@@ -59,4 +59,12 @@ found in the LICENSE file.
@@ -60,4 +60,12 @@ found in the LICENSE file.
android:key="image_descriptions"
android:title="@string/image_descriptions_settings_title" />
build/patches/Move-some-account-settings-back-to-privacy-settings.patch
+2 -2
View File
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -82,6 +82,19 @@ found in the LICENSE file.
@@ -86,6 +86,19 @@ found in the LICENSE file.
android:key="secure_dns"
android:title="@string/settings_secure_dns_title"
android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -450,6 +450,10 @@ For more settings that use data to improve your Chrome experience, go to <ph nam
@@ -451,6 +451,10 @@ For more settings that use data to improve your Chrome experience, go to <ph nam
Automatically sends usage statistics and crash reports to Google
</message>
build/patches/Multiple-fingerprinting-mitigations.patch
+1 -1
View File
@@ -778,7 +778,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2693,6 +2693,15 @@
@@ -2699,6 +2699,15 @@
status: {"Mac": "test", "default": "stable"},
base_feature: "none",
},
build/patches/Override-Navigator-Language.patch
+12 -3
View File
@@ -8,9 +8,9 @@ and fix the selection in the UI for the browser language
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../browser/language/AppLocaleUtils.java | 20 +++++++++++++++++++
.../renderer_host/render_process_host_impl.cc | 6 +++++-
2 files changed, 25 insertions(+), 1 deletion(-)
.../browser/language/AppLocaleUtils.java | 22 ++++++++++++++++++-
.../renderer_host/render_process_host_impl.cc | 6 ++++-
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
@@ -49,6 +49,15 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
/**
* Gets the first original system locale from {@link LocaleManager}. This is the language that
* Chrome would use if there was no override set. If there are no possible UI languages en-US is
@@ -186,7 +206,7 @@ public class AppLocaleUtils {
*/
@ChecksSdkIntAtLeast(api = 33)
public static boolean shouldUseSystemManagedLocale() {
- return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU;
+ return false; // Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU;
}
/**
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
build/patches/Partitioning-all-cookies-by-top-frame-domain.patch
+2 -2
View File
@@ -175,7 +175,7 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/c
constexpr StorageAccessResult GetStorageAccessResult(
ThirdPartyCookieAllowMechanism mechanism) {
using AllowMechanism = ThirdPartyCookieAllowMechanism;
@@ -542,70 +532,16 @@ CookieSettingsBase::DecideAccess(
@@ -546,70 +536,16 @@ CookieSettingsBase::DecideAccess(
return AllowAllCookies{ThirdPartyCookieAllowMechanism::kNone};
}
@@ -246,7 +246,7 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/c
return AllowPartitionedCookies{};
}
@@ -637,7 +573,7 @@ CookieSettingsBase::GetCookieSettingInternal(
@@ -641,7 +577,7 @@ CookieSettingsBase::GetCookieSettingInternal(
}
return CookieSettingWithMetadata{/*cookie_setting=*/CONTENT_SETTING_ALLOW,
/*allow_partitioned_cookies=*/true,
build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch
+1 -1
View File
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -257,6 +257,7 @@ public abstract class ChromeFeatureList {
@@ -261,6 +261,7 @@ public abstract class ChromeFeatureList {
public static final String CCT_PREWARM_TAB = "CCTPrewarmTab";
public static final String CCT_REPORT_PARALLEL_REQUEST_STATUS =
"CCTReportParallelRequestStatus";
build/patches/Re-introduce-override_build_timestamp.patch
+1 -1
View File
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/base/BUILD.gn b/base/BUILD.gn
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -4222,8 +4222,13 @@ action("build_date") {
@@ -4224,8 +4224,13 @@ action("build_date") {
args = [
rebase_path("$target_gen_dir/generated_build_date.h", root_build_dir),
build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
+2 -2
View File
@@ -120,7 +120,7 @@ new file mode 100644
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -107,6 +107,10 @@ found in the LICENSE file.
@@ -111,6 +111,10 @@ found in the LICENSE file.
android:title="@string/close_tabs_on_exit_title"
android:summary="@string/close_tabs_on_exit_summary"
android:defaultValue="false" />
@@ -480,7 +480,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/ch
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1076,6 +1076,30 @@ For more settings that use data to improve your Chrome experience, go to <ph nam
@@ -1077,6 +1077,30 @@ For more settings that use data to improve your Chrome experience, go to <ph nam
For example, some websites may respond to this request by showing you ads that aren’t based on other websites you’ve visited. Many websites will still collect and use your browsing data — for example to improve security, to provide content, ads and recommendations, and to generate reporting statistics.
</message>
build/patches/Remove-help-menu-item.patch
+1 -1
View File
@@ -151,7 +151,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -459,6 +459,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -495,6 +495,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
help.setIcon(
TraceEventVectorDrawableCompat.create(
getResources(), R.drawable.ic_help_and_feedback, getTheme()));
build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch
+4 -3
View File
@@ -9,9 +9,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../chrome/browser/bookmarks/BookmarkToolbar.java | 12 ++++++++++++
.../bookmarks/BookmarkToolbarCoordinator.java | 1 +
.../browser/bookmarks/BookmarkToolbarMediator.java | 1 +
.../browser/bookmarks/BookmarkToolbarProperties.java | 8 ++++++++
.../browser/bookmarks/BookmarkToolbarProperties.java | 9 +++++++++
.../browser/bookmarks/BookmarkToolbarViewBinder.java | 4 ++++
5 files changed, 26 insertions(+)
5 files changed, 27 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
@@ -117,10 +117,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/** Callables to delegate business logic back to the mediator */
static final WritableObjectPropertyKey<Function<Integer, Boolean>> MENU_ID_CLICKED_FUNCTION =
new WritableObjectPropertyKey<>();
@@ -88,6 +95,7 @@ class BookmarkToolbarProperties {
@@ -88,6 +95,8 @@ class BookmarkToolbarProperties {
NEW_FOLDER_BUTTON_VISIBLE,
NEW_FOLDER_BUTTON_ENABLED,
NAVIGATION_BUTTON_STATE,
+ BOOKMARK_MODEL,
+ CURRENT_FOLDER,
SORT_MENU_IDS,
SORT_MENU_IDS_ENABLED,
build/patches/Restore-Search-Ready-Omnibox-flag.patch
+1 -1
View File
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -347,6 +347,7 @@ public abstract class ChromeFeatureList {
@@ -351,6 +351,7 @@ public abstract class ChromeFeatureList {
public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION =
"MayLaunchUrlUsesSeparateStoragePartition";
public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked";
build/patches/Restore-Simplified-NTP-launch.patch
+3 -3
View File
@@ -707,7 +707,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -349,6 +349,7 @@ public abstract class ChromeFeatureList {
@@ -353,6 +353,7 @@ public abstract class ChromeFeatureList {
public static final String MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION =
"MayLaunchUrlUsesSeparateStoragePartition";
public static final String MESSAGES_FOR_ANDROID_ADS_BLOCKED = "MessagesForAndroidAdsBlocked";
@@ -715,7 +715,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
public static final String MIGRATE_ACCOUNT_MANAGEMENT_SETTINGS_TO_CAPABILITIES =
"MigrateAccountManagementSettingsToCapabilities";
@@ -625,7 +626,7 @@ public abstract class ChromeFeatureList {
@@ -629,7 +630,7 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sIncognitoReauthenticationForAndroid =
newCachedFlag(INCOGNITO_REAUTHENTICATION_FOR_ANDROID, true);
public static final CachedFlag sLogoPolish = newCachedFlag(LOGO_POLISH, false);
@@ -724,7 +724,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
newCachedFlag(MUlTI_INSTANCE_APPLICATION_STATUS_CLEANUP, false);
public static final CachedFlag sNavBarColorMatchesTabBackground =
@@ -658,7 +659,7 @@ public abstract class ChromeFeatureList {
@@ -662,7 +663,7 @@ public abstract class ChromeFeatureList {
newCachedFlag(START_SURFACE_RETURN_TIME, true);
public static final CachedFlag sStopAppIndexingReport =
newCachedFlag(STOP_APP_INDEXING_REPORT, true);
build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch
+2 -2
View File
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareButt
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -657,18 +657,12 @@ const FeatureEntry::FeatureParam kAdaptiveButtonCustomization_Share[] = {
@@ -661,18 +661,12 @@ const FeatureEntry::FeatureParam kAdaptiveButtonCustomization_Share[] = {
{"default_segment", "share"},
{"show_ui_only_after_ready", "false"},
{"ignore_segmentation_results", "true"}};
@@ -152,7 +152,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -154,6 +154,7 @@ public abstract class ChromeFeatureList {
@@ -158,6 +158,7 @@ public abstract class ChromeFeatureList {
public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =
"AccountReauthenticationRecentTimeWindow";
public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
build/patches/Restore-offline-indicator-v2-flag.patch
+1 -1
View File
@@ -128,7 +128,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -364,6 +364,7 @@ public abstract class ChromeFeatureList {
@@ -368,6 +368,7 @@ public abstract class ChromeFeatureList {
public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
"NotificationPermissionBottomSheet";
build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch
+1 -1
View File
@@ -187,7 +187,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -4017,14 +4017,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
@@ -4042,14 +4042,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
}
build/patches/Show-full-urls-for-bookmark.patch
-36
View File
@@ -1,36 +0,0 @@
From: uazo <uazo@users.noreply.github.com>
Date: Fri, 20 Oct 2023 12:36:07 +0000
Subject: Show full urls for bookmark
Restore omnibox-bookmark-paths flag and show full urls
in android bookmark page
See https://source.chromium.org/chromium/chromium/src/+/4a9dd5ab3709d60f40beb2f801a0185ab2ba992a
---
.../src/org/chromium/components/bookmarks/BookmarkItem.java | 1 +
components/omnibox/browser/titled_url_match_utils.cc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
--- a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
+++ b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
@@ -61,6 +61,7 @@ public class BookmarkItem {
/** Returns the string to display for the item's url. */
public String getUrlForDisplay() {
+ if ((true)) return getUrl().getSpec();
return UrlFormatter.formatUrlForSecurityDisplay(
getUrl(), SchemeDisplay.OMIT_HTTP_AND_HTTPS);
}
diff --git a/components/omnibox/browser/titled_url_match_utils.cc b/components/omnibox/browser/titled_url_match_utils.cc
--- a/components/omnibox/browser/titled_url_match_utils.cc
+++ b/components/omnibox/browser/titled_url_match_utils.cc
@@ -81,7 +81,7 @@ AutocompleteMatch TitledUrlMatchToAutocompleteMatch(
// Otherwise, display the path, even if the input matches both or neither.
bool show_path = titled_url_match.has_ancestor_match ||
titled_url_match.url_match_positions.empty();
- match.contents = show_path ? path : formatted_url;
+ match.contents = /*show_path ? path :*/ formatted_url;
// The path can become stale (when the bookmark is moved). So persist the URL
// instead when creating shortcuts.
if (show_path)
--
build/patches/Site-setting-for-images.patch
+1 -1
View File
@@ -323,7 +323,7 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -4003,13 +4003,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
@@ -4028,13 +4028,6 @@ const mojom::RendererContentSettingsPtr& LocalFrame::GetContentSettings() {
return loader_.GetDocumentLoader()->GetContentSettings();
}
build/patches/User-agent-customization.patch
+1 -1
View File
@@ -1036,7 +1036,7 @@ diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chro
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -231,6 +231,32 @@ CHAR_LIMIT guidelines:
@@ -232,6 +232,32 @@ CHAR_LIMIT guidelines:
Visit help page
</message>
build/patches/Viewport-Protection-flag.patch
+3 -3
View File
@@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_p
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -1560,6 +1560,10 @@ void LocalFrame::RestoreScrollOffsets() {
@@ -1564,6 +1564,10 @@ void LocalFrame::RestoreScrollOffsets() {
saved_scroll_offsets_ = nullptr;
}
@@ -503,7 +503,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
void LocalFrame::SetPageZoomFactor(float factor) {
SetPageAndTextZoomFactors(factor, text_zoom_factor_);
}
@@ -1734,12 +1738,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() {
@@ -1738,12 +1742,16 @@ mojom::blink::DevicePostureType LocalFrame::GetDevicePosture() {
return mojo_handler_->GetDevicePosture();
}
@@ -522,7 +522,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
return ratio;
}
@@ -3309,6 +3317,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) {
@@ -3334,6 +3342,11 @@ void LocalFrame::SetScaleFactor(float scale_factor) {
DCHECK(!GetDocument() || !GetDocument()->Printing());
DCHECK(IsMainFrame());
build/patches/WIN-enable-pdf-plugin.patch
+1 -1
View File
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2253,7 +2253,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -2257,7 +2257,9 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
}
PluginData* LocalFrame::GetPluginData() const {
build/patches/Welcome-screen.patch
+7 -5
View File
@@ -15,13 +15,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../DefaultSearchEngineFirstRunFragment.java | 3 -
.../browser/firstrun/FirstRunActivity.java | 31 +-
.../firstrun/FirstRunActivityBase.java | 6 +-
.../firstrun/FirstRunFlowSequencer.java | 68 +---
.../firstrun/FirstRunFlowSequencer.java | 70 +---
.../browser/firstrun/FirstRunUtils.java | 1 +
.../firstrun/ToSAndUMAFirstRunFragment.java | 335 +++++++++++++++++
.../firstrun/TosAndUmaFragmentView.java | 336 ++++++++++++++++++
.../browser/locale/LocaleManagerDelegate.java | 5 +-
.../strings/android_chrome_strings.grd | 24 +-
15 files changed, 911 insertions(+), 108 deletions(-)
15 files changed, 911 insertions(+), 110 deletions(-)
create mode 100644 chrome/android/java/res/layout/fre_tosanduma.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFragmentView.java
@@ -513,16 +513,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
onFlowIsKnown(freProperties);
}
@@ -206,6 +158,8 @@ public abstract class FirstRunFlowSequencer {
@@ -206,8 +158,8 @@ public abstract class FirstRunFlowSequencer {
* @param freProperties Resulting FRE properties bundle.
*/
public void updateFirstRunProperties(Bundle freProperties) {
- // fix chromium vanilla startup
- if (freProperties == null) return;
+ if (freProperties == null)
+ throw new RuntimeException("attempting to update null FRE properties");
boolean isHistorySyncEnabled =
ChromeFeatureList.isEnabled(
ChromeFeatureList.REPLACE_SYNC_PROMOS_WITH_SIGN_IN_PROMOS);
@@ -320,13 +274,17 @@ public abstract class FirstRunFlowSequencer {
@@ -322,13 +274,17 @@ public abstract class FirstRunFlowSequencer {
if (!(caller instanceof Activity)) {
freIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
@@ -1252,7 +1254,7 @@ diff --git a/chrome/browser/locale/java/src/org/chromium/chrome/browser/locale/L
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3464,7 +3464,29 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
@@ -3459,7 +3459,29 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Chrome. By continuing, you agree to the <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Google Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph>, and the <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Google Chrome and ChromeOS Additional Terms of Service<ph name="END_LINK2">&lt;/LINK2&gt;</ph>. The <ph name="BEGIN_LINK3">&lt;LINK3&gt;</ph>Privacy Policy<ph name="END_LINK3">&lt;/LINK3&gt;</ph> also applies.
</message>
<message name="IDS_FRE_ACCEPT_CONTINUE" desc="Text for first page accept and continue button [CHAR_LIMIT=20]">
build/patches/add-browser-policy.patch
+10 -5
View File
@@ -4,7 +4,7 @@ Subject: Add browser policy
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
base/win/win_util.cc | 63 +--------
base/win/win_util.cc | 63 +-------
chrome/android/java/AndroidManifest.xml | 4 -
.../privacy_preferences_manager_impl.cc | 5 +
.../metrics/chrome_feature_list_creator.cc | 12 ++
@@ -16,13 +16,13 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../throttled_gaia_auth_fetcher.cc | 5 +
chrome/browser/signin/chrome_signin_client.cc | 7 +-
.../browser/signin/dice_response_handler.cc | 2 +
.../ui/webui/policy/policy_ui_handler.cc | 104 +++++++++++++-
.../ui/webui/policy/policy_ui_handler.cc | 104 ++++++++++++-
.../ui/webui/policy/policy_ui_handler.h | 2 +
.../strings/android/browser_ui_strings.grd | 2 +-
.../commerce/core/commerce_feature_list.cc | 65 ++-------
.../core/browser/browser_policy_connector.cc | 3 +
.../common/command_line_policy_provider.cc | 3 +
.../core/common/policy_loader_command_line.cc | 132 +++++++++++++++---
.../core/common/policy_loader_command_line.cc | 137 ++++++++++++++++--
.../policy/core/common/policy_pref_names.cc | 3 +
.../policy/core/common/policy_pref_names.h | 1 +
.../policy/core/common/policy_service_impl.cc | 3 +
@@ -36,7 +36,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../gaia_cookie_manager_service.cc | 4 +
google_apis/gaia/gaia_auth_fetcher.cc | 1 +
net/socket/ssl_client_socket_impl.cc | 3 +
32 files changed, 318 insertions(+), 150 deletions(-)
32 files changed, 323 insertions(+), 150 deletions(-)
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
--- a/base/win/win_util.cc
@@ -674,7 +674,7 @@ diff --git a/components/policy/core/common/policy_loader_command_line.cc b/compo
namespace policy {
@@ -21,25 +46,100 @@ PolicyLoaderCommandLine::~PolicyLoaderCommandLine() = default;
@@ -21,25 +46,105 @@ PolicyLoaderCommandLine::~PolicyLoaderCommandLine() = default;
PolicyBundle PolicyLoaderCommandLine::Load() {
PolicyBundle bundle;
@@ -764,6 +764,11 @@ diff --git a/components/policy/core/common/policy_loader_command_line.cc b/compo
+ AddPolicy(disabled_policies_list, policy_map, policy::key::kSideSearchEnabled, base::Value(false));
+#endif
+
+#if BUILDFLAG(IS_WIN)
+ AddPolicy(disabled_policies_list, policy_map, policy::key::kExtensionManifestV2Availability, base::Value(/*Enabled*/ 2));
+ AddPolicy(disabled_policies_list, policy_map, policy::key::kDynamicCodeSettings, base::Value(/*DisabledForBrowser*/ 1));
+#endif
+
+ // kFirstPartySetsEnabled
+ // kLensCameraAssistedSearchEnabled
+ // kPasswordLeakDetectionEnabled
build/patches/eyeo-beta-118.0.5993.48-base.patch
+105 -105
View File
@@ -2654,7 +2654,7 @@ new file mode 100644
+ const std::vector<std::string>& removed_headers,
+ const net::HttpRequestHeaders& modified_headers,
+ const net::HttpRequestHeaders& modified_cors_exempt_headers,
+ const absl::optional<GURL>& new_url) override;
+ const std::optional<GURL>& new_url) override;
+ void SetPriority(net::RequestPriority priority,
+ int32_t intra_priority_value) override;
+ void PauseReadingBodyFromNet() override;
@@ -2665,7 +2665,7 @@ new file mode 100644
+ void OnReceiveResponse(
+ ::network::mojom::URLResponseHeadPtr head,
+ ::mojo::ScopedDataPipeConsumerHandle body,
+ absl::optional<mojo_base::BigBuffer> cached_metadata) override;
+ std::optional<mojo_base::BigBuffer> cached_metadata) override;
+ void OnReceiveRedirect(const ::net::RedirectInfo& redirect_info,
+ ::network::mojom::URLResponseHeadPtr head) override;
+ void OnUploadProgress(int64_t current_position,
@@ -2679,7 +2679,7 @@ new file mode 100644
+ base::OnceCallback<void(FilterMatchResult,
+ network::mojom::ParsedHeadersPtr)>;
+ using CheckRewriteFilterMatchCallback =
+ base::OnceCallback<void(const absl::optional<GURL>&)>;
+ base::OnceCallback<void(const std::optional<GURL>&)>;
+
+ void OnBindingsClosed();
+ void OnClientDisconnected();
@@ -2688,7 +2688,7 @@ new file mode 100644
+ const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
+ mojo::PendingReceiver<network::mojom::URLLoader> target_loader,
+ mojo::PendingRemote<network::mojom::URLLoaderClient> proxy_client,
+ const absl::optional<GURL>& rewrite);
+ const std::optional<GURL>& rewrite);
+ void OnRequestFilterMatchResult(
+ ::mojo::PendingReceiver<network::mojom::URLLoader> loader,
+ uint32_t options,
@@ -2702,7 +2702,7 @@ new file mode 100644
+ void OnProcessHeadersResult(
+ ::network::mojom::URLResponseHeadPtr head,
+ ::mojo::ScopedDataPipeConsumerHandle body,
+ absl::optional<mojo_base::BigBuffer> cached_metadata,
+ std::optional<mojo_base::BigBuffer> cached_metadata,
+ FilterMatchResult result,
+ network::mojom::ParsedHeadersPtr parsed_headers);
+ void OnRequestError(int error_code);
@@ -2724,8 +2724,8 @@ new file mode 100644
+ FilterMatchResult result,
+ network::mojom::ParsedHeadersPtr parsed_headers);
+ void PostRewriteCallbackToUI(
+ base::OnceCallback<void(const absl::optional<GURL>&)> callback,
+ const absl::optional<GURL>& url);
+ base::OnceCallback<void(const std::optional<GURL>&)> callback,
+ const std::optional<GURL>& url);
+
+ GURL request_url_;
+ int request_id_;
@@ -2780,7 +2780,7 @@ new file mode 100644
+ const std::vector<std::string>& removed_headers,
+ const net::HttpRequestHeaders& modified_headers,
+ const net::HttpRequestHeaders& modified_cors_exempt_headers,
+ const absl::optional<GURL>& new_url) {
+ const std::optional<GURL>& new_url) {
+ if (target_loader_.is_bound()) {
+ target_loader_->FollowRedirect(removed_headers, modified_headers,
+ modified_cors_exempt_headers, new_url);
@@ -2815,7 +2815,7 @@ new file mode 100644
+void AdblockURLLoaderFactory::InProgressRequest::OnReceiveResponse(
+ network::mojom::URLResponseHeadPtr head,
+ mojo::ScopedDataPipeConsumerHandle body,
+ absl::optional<mojo_base::BigBuffer> cached_metadata) {
+ std::optional<mojo_base::BigBuffer> cached_metadata) {
+ if (net::IsLocalhost(request_url_) || (!request_url_.SchemeIsHTTPOrHTTPS() &&
+ !request_url_.SchemeIsWSOrWSS())) {
+ VLOG(1)
@@ -2838,7 +2838,7 @@ new file mode 100644
+void AdblockURLLoaderFactory::InProgressRequest::OnProcessHeadersResult(
+ ::network::mojom::URLResponseHeadPtr head,
+ ::mojo::ScopedDataPipeConsumerHandle body,
+ absl::optional<mojo_base::BigBuffer> cached_metadata,
+ std::optional<mojo_base::BigBuffer> cached_metadata,
+ FilterMatchResult result,
+ network::mojom::ParsedHeadersPtr parsed_headers) {
+ if (result == FilterMatchResult::kBlockRule) {
@@ -2945,7 +2945,7 @@ new file mode 100644
+void AdblockURLLoaderFactory::InProgressRequest::CheckRewriteFilterMatch(
+ CheckRewriteFilterMatchCallback callback) {
+ if (!factory_->CheckHostValid()) {
+ PostRewriteCallbackToUI(std::move(callback), absl::optional<GURL>{});
+ PostRewriteCallbackToUI(std::move(callback), std::optional<GURL>{});
+ return;
+ }
+
@@ -3032,8 +3032,8 @@ new file mode 100644
+}
+
+void AdblockURLLoaderFactory::InProgressRequest::PostRewriteCallbackToUI(
+ base::OnceCallback<void(const absl::optional<GURL>&)> callback,
+ const absl::optional<GURL>& url) {
+ base::OnceCallback<void(const std::optional<GURL>&)> callback,
+ const std::optional<GURL>& url) {
+ content::GetUIThreadTaskRunner({kTaskResponsePriority})
+ ->PostTask(FROM_HERE, base::BindOnce(std::move(callback), url));
+}
@@ -3115,7 +3115,7 @@ new file mode 100644
+ const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
+ mojo::PendingReceiver<network::mojom::URLLoader> target_loader,
+ mojo::PendingRemote<network::mojom::URLLoaderClient> proxy_client,
+ const absl::optional<GURL>& rewrite) {
+ const std::optional<GURL>& rewrite) {
+ if (rewrite) {
+ constexpr int kInternalRedirectStatusCode = net::HTTP_TEMPORARY_REDIRECT;
+ net::RedirectInfo redirect_info = net::RedirectInfo::ComputeRedirectInfo(
@@ -3794,7 +3794,7 @@ new file mode 100644
+ response += enabled ? "enabled" : "disabled";
+ return response;
+ }
+ absl::optional<bool> value = absl::nullopt;
+ std::optional<bool> value = absl::nullopt;
+ if (action == kActionEnable) {
+ value = true;
+ } else if (action == kActionDisable) {
@@ -5388,7 +5388,7 @@ new file mode 100644
+ SubscriptionService::Snapshot subscription_collections,
+ const GURL& request_url,
+ content::GlobalRenderFrameHostId render_frame_host_id,
+ base::OnceCallback<void(const absl::optional<GURL>&)> result) = 0;
+ base::OnceCallback<void(const std::optional<GURL>&)> result) = 0;
+};
+
+} // namespace adblock
@@ -5460,7 +5460,7 @@ new file mode 100644
+ const GURL& popup_url,
+ const std::vector<GURL>& frame_hierarchy,
+ content::GlobalRenderFrameHostId render_frame_host_id,
+ absl::optional<CheckFilterMatchCallback> callback,
+ std::optional<CheckFilterMatchCallback> callback,
+ const ResourceClassifier::ClassificationResult& classification_result) {
+ if (classification_result.decision != ClassificationDecision::Ignored) {
+ FilterMatchResult result =
@@ -5828,14 +5828,14 @@ new file mode 100644
+ SubscriptionService::Snapshot subscription_collections,
+ const GURL& request_url,
+ content::GlobalRenderFrameHostId render_frame_host_id,
+ base::OnceCallback<void(const absl::optional<GURL>&)> callback) {
+ base::OnceCallback<void(const std::optional<GURL>&)> callback) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ DVLOG(1) << "[eyeo] CheckRewriteFilterMatch for " << request_url.spec();
+
+ content::RenderFrameHost* host =
+ frame_hierarchy_builder_->FindRenderFrameHost(render_frame_host_id);
+ if (!host) {
+ std::move(callback).Run(absl::optional<GURL>{});
+ std::move(callback).Run(std::optional<GURL>{});
+ return;
+ }
+
@@ -5936,7 +5936,7 @@ new file mode 100644
+ SubscriptionService::Snapshot subscription_collections,
+ const GURL& request_url,
+ content::GlobalRenderFrameHostId render_frame_host_id,
+ base::OnceCallback<void(const absl::optional<GURL>&)> result) final;
+ base::OnceCallback<void(const std::optional<GURL>&)> result) final;
+
+ private:
+ struct CheckResourceFilterMatchResult {
@@ -5965,7 +5965,7 @@ new file mode 100644
+ const GURL& popup_url,
+ const std::vector<GURL>& frame_hierarchy,
+ content::GlobalRenderFrameHostId render_frame_host_id,
+ absl::optional<CheckFilterMatchCallback> callback,
+ std::optional<CheckFilterMatchCallback> callback,
+ const ResourceClassifier::ClassificationResult& result);
+
+ static CheckResourceFilterMatchResult CheckResponseFilterMatchInternal(
@@ -5988,8 +5988,8 @@ new file mode 100644
+ FilterMatchResult result);
+
+ void PostRewriteCallbackToUI(
+ base::OnceCallback<void(const absl::optional<GURL>&)> callback,
+ absl::optional<GURL> url);
+ base::OnceCallback<void(const std::optional<GURL>&)> callback,
+ std::optional<GURL> url);
+
+ static CheckResourceFilterMatchResult CheckDocumentAllowlistedInternal(
+ const SubscriptionService::Snapshot subscription_collections,
@@ -7173,7 +7173,7 @@ new file mode 100644
+ return results;
+}
+
+absl::optional<bool> MigrateBoolFromPrefs(PrefService* pref_service,
+std::optional<bool> MigrateBoolFromPrefs(PrefService* pref_service,
+ const std::string& pref_name) {
+ if (pref_service->FindPreference(pref_name)->HasUserSetting()) {
+ bool value = pref_service->GetBoolean(pref_name);
@@ -8124,7 +8124,7 @@ new file mode 100644
+ const scoped_refptr<net::HttpResponseHeaders>& response_headers)
+ const = 0;
+
+ virtual absl::optional<GURL> CheckRewrite(
+ virtual std::optional<GURL> CheckRewrite(
+ const SubscriptionService::Snapshot subscription_collections,
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy) const = 0;
@@ -8170,7 +8170,7 @@ new file mode 100644
+
+using ClassificationResult = ResourceClassifier::ClassificationResult;
+
+absl::optional<HeaderFilterData> IsHeaderFilterOverruled(
+std::optional<HeaderFilterData> IsHeaderFilterOverruled(
+ base::StringPiece blocking_header_filter,
+ std::set<HeaderFilterData>& allowing_filters) {
+ for (auto filter : allowing_filters) {
@@ -8401,7 +8401,7 @@ new file mode 100644
+ std::move(blocking_filters), std::move(allowing_filters));
+}
+
+absl::optional<GURL> CheckRewriteWithSingleCollection(
+std::optional<GURL> CheckRewriteWithSingleCollection(
+ const SubscriptionCollection& subscription_collection,
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy) {
@@ -8438,7 +8438,7 @@ new file mode 100644
+ request_url, frame_hierarchy, FilterCategory::Allowing);
+ if (allowing_rewrites.empty()) {
+ // Any filter will do, take the 1st one.
+ return absl::optional<GURL>(GURL{*blocking_rewrites.begin()});
+ return std::optional<GURL>(GURL{*blocking_rewrites.begin()});
+ }
+
+ // Change set to vector to call algorithm
@@ -8461,7 +8461,7 @@ new file mode 100644
+ }
+
+ // Any filter will do, take the 1st one.
+ return absl::optional<GURL>(GURL{*blocking_rewrites_v.begin()});
+ return std::optional<GURL>(GURL{*blocking_rewrites_v.begin()});
+}
+
+} // namespace
@@ -8531,7 +8531,7 @@ new file mode 100644
+ return classification;
+}
+
+absl::optional<GURL> ResourceClassifierImpl::CheckRewrite(
+std::optional<GURL> ResourceClassifierImpl::CheckRewrite(
+ const SubscriptionService::Snapshot subscription_collections,
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy) const {
@@ -8602,7 +8602,7 @@ new file mode 100644
+ const scoped_refptr<net::HttpResponseHeaders>& response_headers)
+ const final;
+
+ absl::optional<GURL> CheckRewrite(
+ std::optional<GURL> CheckRewrite(
+ const SubscriptionService::Snapshot subscription_collections,
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy) const final;
@@ -9578,7 +9578,7 @@ new file mode 100644
+// Destroys memory mapped to a file on disk, and optionally removes the file
+// itself. Performs blocking operations, must run on a MayBlock() task runner.
+void DestroyMemoryMappedFile(std::unique_ptr<base::MemoryMappedFile> memory,
+ absl::optional<base::FilePath> path_to_remove) {
+ std::optional<base::FilePath> path_to_remove) {
+ memory.reset();
+ // Deleting the file should happen *after* removing the memory mapping.
+ if (path_to_remove) {
@@ -9612,7 +9612,7 @@ new file mode 100644
+MemoryMappedFlatbufferData::~MemoryMappedFlatbufferData() {
+ const auto path_to_remove =
+ permanently_remove_path_.load()
+ ? absl::optional<base::FilePath>(std::move(path_))
+ ? std::optional<base::FilePath>(std::move(path_))
+ : absl::nullopt;
+ base::ThreadPool::PostTask(
+ FROM_HERE, {base::MayBlock()},
@@ -9872,7 +9872,7 @@ new file mode 100644
+
+namespace adblock {
+
+absl::optional<base::StringPiece> ExtractRegexFilterFromPattern(
+std::optional<base::StringPiece> ExtractRegexFilterFromPattern(
+ base::StringPiece filter_pattern) {
+ if (!(filter_pattern.size() > 2 && filter_pattern.front() == '/' &&
+ filter_pattern.back() == '/')) {
@@ -9915,7 +9915,7 @@ new file mode 100644
+// For a regex filter "/{expression}/" returns "{expression}".
+// For non-regex filters, returns nullopt.
+// Cheap, may be used to identify regex filter patterns.
+absl::optional<base::StringPiece> ExtractRegexFilterFromPattern(
+std::optional<base::StringPiece> ExtractRegexFilterFromPattern(
+ base::StringPiece filter_pattern);
+} // namespace adblock
+
@@ -11064,7 +11064,7 @@ new file mode 100644
+static constexpr char kDomainSeparator[] = ",";
+
+// static
+absl::optional<ContentFilter> ContentFilter::FromString(
+std::optional<ContentFilter> ContentFilter::FromString(
+ base::StringPiece domain_list,
+ FilterType filter_type,
+ base::StringPiece selector) {
@@ -11142,7 +11142,7 @@ new file mode 100644
+
+class ContentFilter {
+ public:
+ static absl::optional<ContentFilter> FromString(base::StringPiece domain_list,
+ static std::optional<ContentFilter> FromString(base::StringPiece domain_list,
+ FilterType type,
+ base::StringPiece selector);
+
@@ -11474,13 +11474,13 @@ new file mode 100644
+// Parses the stream line by line until it finds comments. After the first non
+// comment line any upcoming comments will be skipped.
+// static
+absl::optional<Metadata> Metadata::FromStream(std::istream& filter_stream) {
+std::optional<Metadata> Metadata::FromStream(std::istream& filter_stream) {
+ static re2::RE2 comment_re("^!\\s*(.*?)\\s*:\\s*(.*)");
+
+ std::string homepage;
+ std::string title;
+ std::string version;
+ absl::optional<GURL> redirect_url;
+ std::optional<GURL> redirect_url;
+ base::TimeDelta expires = kDefaultExpirationInterval;
+
+ std::string line;
@@ -11538,7 +11538,7 @@ new file mode 100644
+Metadata::Metadata(std::string homepage,
+ std::string title,
+ std::string version,
+ absl::optional<GURL> redirect_url,
+ std::optional<GURL> redirect_url,
+ base::TimeDelta expires)
+ : homepage(std::move(homepage)),
+ title(std::move(title)),
@@ -11625,7 +11625,7 @@ new file mode 100644
+
+class Metadata {
+ public:
+ static absl::optional<Metadata> FromStream(std::istream& filter_stream);
+ static std::optional<Metadata> FromStream(std::istream& filter_stream);
+ static Metadata Default();
+
+ Metadata(const Metadata& other);
@@ -11635,7 +11635,7 @@ new file mode 100644
+ const std::string homepage;
+ const std::string title;
+ const std::string version;
+ const absl::optional<GURL> redirect_url;
+ const std::optional<GURL> redirect_url;
+ const base::TimeDelta expires;
+
+ static constexpr base::TimeDelta kDefaultExpirationInterval = base::Days(5);
@@ -11646,7 +11646,7 @@ new file mode 100644
+ Metadata(std::string homepage,
+ std::string title,
+ std::string version,
+ absl::optional<GURL> redirect_url,
+ std::optional<GURL> redirect_url,
+ base::TimeDelta expires);
+ Metadata();
+
@@ -11689,7 +11689,7 @@ new file mode 100644
+static constexpr char kDomainSeparator[] = ",";
+
+// static
+absl::optional<SnippetFilter> SnippetFilter::FromString(
+std::optional<SnippetFilter> SnippetFilter::FromString(
+ base::StringPiece domain_list,
+ base::StringPiece snippet) {
+ if (snippet.empty()) {
@@ -11758,7 +11758,7 @@ new file mode 100644
+
+class SnippetFilter {
+ public:
+ static absl::optional<SnippetFilter> FromString(base::StringPiece domain_list,
+ static std::optional<SnippetFilter> FromString(base::StringPiece domain_list,
+ base::StringPiece snippet);
+
+ SnippetFilter(const SnippetFilter& other);
@@ -12017,7 +12017,7 @@ new file mode 100644
+
+bool IsGenericFilterIsNotSpecificEnough(
+ base::StringPiece filter_str,
+ const absl::optional<UrlFilterOptions>& options) {
+ const std::optional<UrlFilterOptions>& options) {
+ if (options.has_value() && (!options->Domains().GetExcludeDomains().empty() ||
+ !options->Domains().GetIncludeDomains().empty() ||
+ !options->Sitekeys().empty())) {
@@ -12031,8 +12031,8 @@ new file mode 100644
+}
+
+// static
+absl::optional<UrlFilter> UrlFilter::FromString(std::string filter_str) {
+ absl::optional<UrlFilterOptions> options;
+std::optional<UrlFilter> UrlFilter::FromString(std::string filter_str) {
+ std::optional<UrlFilterOptions> options;
+ bool is_allowing = base::StartsWith(filter_str, kAllowingSymbol);
+ if (is_allowing) {
+ filter_str.erase(0, 2);
@@ -12193,7 +12193,7 @@ new file mode 100644
+
+class UrlFilter {
+ public:
+ static absl::optional<UrlFilter> FromString(std::string filter_str);
+ static std::optional<UrlFilter> FromString(std::string filter_str);
+
+ UrlFilter(const UrlFilter& other);
+ UrlFilter(UrlFilter&& other);
@@ -12249,17 +12249,17 @@ new file mode 100644
+static constexpr char kInverseSymbol = '~';
+
+// static
+absl::optional<UrlFilterOptions> UrlFilterOptions::FromString(
+std::optional<UrlFilterOptions> UrlFilterOptions::FromString(
+ const std::string& option_list) {
+ bool is_match_case = false;
+ bool is_popup_filter = false;
+ bool is_subresource = false;
+ ThirdPartyOption third_party = ThirdPartyOption::Ignore;
+ absl::optional<RewriteOption> rewrite;
+ std::optional<RewriteOption> rewrite;
+ DomainOption domains;
+ SiteKeys sitekeys;
+ absl::optional<std::string> csp;
+ absl::optional<std::string> headers;
+ std::optional<std::string> csp;
+ std::optional<std::string> headers;
+ uint32_t content_types = 0;
+ std::set<ExceptionType> exception_types;
+
@@ -12373,7 +12373,7 @@ new file mode 100644
+ content_types_(ContentType::Default) {}
+
+// static
+absl::optional<UrlFilterOptions::RewriteOption> UrlFilterOptions::ParseRewrite(
+std::optional<UrlFilterOptions::RewriteOption> UrlFilterOptions::ParseRewrite(
+ const std::string& rewrite_value) {
+ if (rewrite_value == "abp-resource:blank-text") {
+ return RewriteOption::AbpResource_BlankText;
@@ -12434,7 +12434,7 @@ new file mode 100644
+}
+
+// static
+absl::optional<UrlFilterOptions::ExceptionType>
+std::optional<UrlFilterOptions::ExceptionType>
+UrlFilterOptions::ExceptionTypeFromString(const std::string& exception_type) {
+ if (exception_type == "document") {
+ return ExceptionType::Document;
@@ -12454,11 +12454,11 @@ new file mode 100644
+ const bool is_subresource,
+ const ThirdPartyOption third_party,
+ const uint32_t content_types,
+ const absl::optional<RewriteOption> rewrite,
+ const std::optional<RewriteOption> rewrite,
+ const DomainOption domains,
+ const SiteKeys sitekeys,
+ const absl::optional<std::string> csp,
+ const absl::optional<std::string> headers,
+ const std::optional<std::string> csp,
+ const std::optional<std::string> headers,
+ const std::set<ExceptionType> exception_types)
+ : is_match_case_(is_match_case),
+ is_popup_filter_(is_popup_filter),
@@ -12544,7 +12544,7 @@ new file mode 100644
+ Genericblock,
+ };
+
+ static absl::optional<UrlFilterOptions> FromString(
+ static std::optional<UrlFilterOptions> FromString(
+ const std::string& option_list);
+
+ UrlFilterOptions();
@@ -12558,13 +12558,13 @@ new file mode 100644
+ inline bool IsPopup() const { return is_popup_filter_; }
+ inline bool IsSubresource() const { return is_subresource_; }
+ inline ThirdPartyOption ThirdParty() const { return third_party_; }
+ inline const absl::optional<RewriteOption>& Rewrite() const {
+ inline const std::optional<RewriteOption>& Rewrite() const {
+ return rewrite_;
+ }
+ inline const DomainOption& Domains() const { return domains_; }
+ inline const std::vector<SiteKey>& Sitekeys() const { return sitekeys_; }
+ inline const absl::optional<std::string>& Csp() const { return csp_; }
+ inline const absl::optional<std::string>& Headers() const { return headers_; }
+ inline const std::optional<std::string>& Csp() const { return csp_; }
+ inline const std::optional<std::string>& Headers() const { return headers_; }
+ inline uint32_t ContentTypes() const { return content_types_; }
+ inline const std::set<ExceptionType>& ExceptionTypes() const {
+ return exception_types_;
@@ -12576,19 +12576,19 @@ new file mode 100644
+ bool is_subresource,
+ ThirdPartyOption third_party,
+ uint32_t content_types,
+ absl::optional<RewriteOption> rewrite,
+ std::optional<RewriteOption> rewrite,
+ DomainOption domains,
+ std::vector<SiteKey> sitekeys,
+ absl::optional<std::string> csp,
+ absl::optional<std::string> headers,
+ std::optional<std::string> csp,
+ std::optional<std::string> headers,
+ std::set<ExceptionType> exception_types);
+
+ static absl::optional<RewriteOption> ParseRewrite(
+ static std::optional<RewriteOption> ParseRewrite(
+ const std::string& rewrite_value);
+ static std::vector<SiteKey> ParseSitekeys(const std::string& sitekey_value);
+ static bool IsValidCsp(const std::string& csp_value);
+ static void ParseHeaders(std::string& headers_value);
+ static absl::optional<ExceptionType> ExceptionTypeFromString(
+ static std::optional<ExceptionType> ExceptionTypeFromString(
+ const std::string& exception_type);
+
+ bool is_match_case_;
@@ -12596,11 +12596,11 @@ new file mode 100644
+ bool is_subresource_;
+ ThirdPartyOption third_party_;
+ uint32_t content_types_;
+ absl::optional<RewriteOption> rewrite_;
+ std::optional<RewriteOption> rewrite_;
+ DomainOption domains_;
+ std::vector<SiteKey> sitekeys_;
+ absl::optional<std::string> csp_;
+ absl::optional<std::string> headers_;
+ std::optional<std::string> csp_;
+ std::optional<std::string> headers_;
+ std::set<ExceptionType> exception_types_;
+};
+
@@ -12695,7 +12695,7 @@ new file mode 100644
+
+namespace adblock {
+
+absl::optional<std::string> FilterKeywordExtractor::GetNextKeyword() {
+std::optional<std::string> FilterKeywordExtractor::GetNextKeyword() {
+ std::string current_keyword;
+ do {
+ // In case that we are extracting keyword to store a filter
@@ -12784,7 +12784,7 @@ new file mode 100644
+ public:
+ explicit FilterKeywordExtractor(base::StringPiece url);
+ ~FilterKeywordExtractor();
+ absl::optional<std::string> GetNextKeyword();
+ std::optional<std::string> GetNextKeyword();
+
+ private:
+ re2::StringPiece input_;
@@ -12964,9 +12964,9 @@ new file mode 100644
+ ? builder_.CreateSharedString(options.Headers().value())
+ : flatbuffers::Offset<flatbuffers::String>());
+
+ const absl::optional<base::StringPiece> keyword_pattern =
+ const std::optional<base::StringPiece> keyword_pattern =
+ ExtractRegexFilterFromPattern(url_filter.pattern).has_value()
+ ? absl::optional<base::StringPiece>()
+ ? std::optional<base::StringPiece>()
+ : url_filter.pattern;
+
+ if (options.Headers().has_value()) {
@@ -13022,7 +13022,7 @@ new file mode 100644
+
+void FlatbufferSerializer::AddUrlFilterToIndex(
+ UrlFilterIndex& index,
+ absl::optional<base::StringPiece> pattern_text,
+ std::optional<base::StringPiece> pattern_text,
+ flatbuffers::Offset<flat::UrlFilter> filter) {
+ const auto keyword =
+ pattern_text ? FindCandidateKeyword(index, *pattern_text) : "";
@@ -13259,7 +13259,7 @@ new file mode 100644
+ std::vector<flatbuffers::Offset<flat::SnippetFilter>>>;
+
+ void AddUrlFilterToIndex(UrlFilterIndex& index,
+ absl::optional<base::StringPiece> pattern_text,
+ std::optional<base::StringPiece> pattern_text,
+ flatbuffers::Offset<flat::UrlFilter> filter);
+ void AddElemhideFilterForDomains(
+ ElemhideIndex& index,
@@ -13707,7 +13707,7 @@ new file mode 100644
+ const scoped_refptr<net::HttpResponseHeaders>& headers,
+ const std::string& user_agent) = 0;
+
+ virtual absl::optional<std::pair<GURL, SiteKey>> FindSiteKeyForAnyUrl(
+ virtual std::optional<std::pair<GURL, SiteKey>> FindSiteKeyForAnyUrl(
+ const std::vector<GURL>& urls) const = 0;
+};
+
@@ -13772,7 +13772,7 @@ new file mode 100644
+ ProcessSiteKey(request_url, site_key, user_agent);
+}
+
+absl::optional<std::pair<GURL, SiteKey>>
+std::optional<std::pair<GURL, SiteKey>>
+SitekeyStorageImpl::FindSiteKeyForAnyUrl(const std::vector<GURL>& urls) const {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ for (const auto& url : urls) {
@@ -13909,7 +13909,7 @@ new file mode 100644
+ const scoped_refptr<net::HttpResponseHeaders>& headers,
+ const std::string& user_agent) final;
+
+ absl::optional<std::pair<GURL, SiteKey>> FindSiteKeyForAnyUrl(
+ std::optional<std::pair<GURL, SiteKey>> FindSiteKeyForAnyUrl(
+ const std::vector<GURL>& urls) const final;
+
+ private:
@@ -14199,7 +14199,7 @@ new file mode 100644
+DomainSplitter::DomainSplitter(base::StringPiece domain)
+ : domain_(base::TrimString(domain, ".", base::TRIM_ALL)) {}
+
+absl::optional<base::StringPiece> DomainSplitter::FindNextSubdomain() {
+std::optional<base::StringPiece> DomainSplitter::FindNextSubdomain() {
+ const auto old_dot_pos = dot_pos_;
+ if (dot_pos_ < domain_.size()) {
+ // Find next dot in domain, for future iteration to consume.
@@ -14258,7 +14258,7 @@ new file mode 100644
+ // |domain| must outlive this, no copy made.
+ explicit DomainSplitter(base::StringPiece domain);
+ // Returns reference to part of |domain|.
+ absl::optional<base::StringPiece> FindNextSubdomain();
+ std::optional<base::StringPiece> FindNextSubdomain();
+
+ private:
+ const base::StringPiece domain_;
@@ -15446,7 +15446,7 @@ new file mode 100644
+std::vector<const flat::UrlFilter*> InstalledSubscriptionImpl::FindInternal(
+ const UrlFilterIndex* index,
+ const GURL& url,
+ absl::optional<ContentType> content_type,
+ std::optional<ContentType> content_type,
+ const std::string& document_domain,
+ const std::string& sitekey,
+ FilterCategory category,
@@ -15485,7 +15485,7 @@ new file mode 100644
+ base::StringPiece keyword,
+ const GURL& url,
+ const GURL& lowercase_url,
+ absl::optional<ContentType> content_type,
+ std::optional<ContentType> content_type,
+ const std::string& document_domain,
+ const std::string& sitekey,
+ FilterCategory category,
@@ -15538,7 +15538,7 @@ new file mode 100644
+
+bool InstalledSubscriptionImpl::CandidateFilterViable(
+ const flat::UrlFilter* candidate,
+ absl::optional<ContentType> content_type,
+ std::optional<ContentType> content_type,
+ const std::string& document_domain,
+ const std::string& sitekey,
+ FilterCategory category,
@@ -15797,7 +15797,7 @@ new file mode 100644
+ std::vector<const flat::UrlFilter*> FindInternal(
+ const UrlFilterIndex* index,
+ const GURL& url,
+ absl::optional<ContentType> content_type,
+ std::optional<ContentType> content_type,
+ const std::string& document_domain,
+ const std::string& sitekey,
+ FilterCategory category,
@@ -15807,7 +15807,7 @@ new file mode 100644
+ base::StringPiece keyword,
+ const GURL& url,
+ const GURL& lowercase_url,
+ absl::optional<ContentType> content_type,
+ std::optional<ContentType> content_type,
+ const std::string& document_domain,
+ const std::string& sitekey,
+ FilterCategory category,
@@ -15815,7 +15815,7 @@ new file mode 100644
+ FindStrategy strategy,
+ std::vector<const flat::UrlFilter*>& out_results) const;
+ bool CandidateFilterViable(const flat::UrlFilter* candidate,
+ absl::optional<ContentType> content_type,
+ std::optional<ContentType> content_type,
+ const std::string& document_domain,
+ const std::string& sitekey,
+ FilterCategory category,
@@ -16290,7 +16290,7 @@ new file mode 100644
+ base::StringPiece consumed_filter_pattern_;
+};
+
+absl::optional<base::StringPiece> FindNextTokenInInput(
+std::optional<base::StringPiece> FindNextTokenInInput(
+ base::StringPiece consumed_input,
+ PatternTokenizer tokenizer,
+ int recursion_depth);
@@ -16344,7 +16344,7 @@ new file mode 100644
+
+// Returns characters skipped in order to reach next token from |tokenizer|, or
+// nullopt if not found.
+absl::optional<base::StringPiece> FindNextTokenInInput(
+std::optional<base::StringPiece> FindNextTokenInInput(
+ base::StringPiece consumed_input,
+ PatternTokenizer tokenizer,
+ int recursion_depth) {
@@ -16377,7 +16377,7 @@ new file mode 100644
+ // It is OK as long as there are no further tokens that require matching
+ // input. The "^" symbol matches EOF too.
+ return NextTokenBeginsInput(base::StringPiece(), tokenizer, recursion_depth)
+ ? absl::optional<base::StringPiece>{consumed_input}
+ ? std::optional<base::StringPiece>{consumed_input}
+ : absl::nullopt;
+ } else if (token == "|") {
+ // If we're skipping characters, we can always skip enough to reach the end
@@ -17132,23 +17132,23 @@ new file mode 100644
+ // Name of the FilteringConfiguration this collection represents
+ virtual const std::string& GetFilteringConfigurationName() const = 0;
+
+ virtual absl::optional<GURL> FindBySubresourceFilter(
+ virtual std::optional<GURL> FindBySubresourceFilter(
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
+ ContentType content_type,
+ const SiteKey& sitekey,
+ FilterCategory category) const = 0;
+ virtual absl::optional<GURL> FindByPopupFilter(
+ virtual std::optional<GURL> FindByPopupFilter(
+ const GURL& popup_url,
+ const std::vector<GURL>& frame_hierarchy,
+ const SiteKey& sitekey,
+ FilterCategory category) const = 0;
+ virtual absl::optional<GURL> FindByAllowFilter(
+ virtual std::optional<GURL> FindByAllowFilter(
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
+ ContentType content_type,
+ const SiteKey& sitekey) const = 0;
+ virtual absl::optional<GURL> FindBySpecialFilter(
+ virtual std::optional<GURL> FindBySpecialFilter(
+ SpecialFilterType filter_type,
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
@@ -17319,7 +17319,7 @@ new file mode 100644
+ return configuration_name_;
+}
+
+absl::optional<GURL> SubscriptionCollectionImpl::FindBySubresourceFilter(
+std::optional<GURL> SubscriptionCollectionImpl::FindBySubresourceFilter(
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
+ ContentType content_type,
@@ -17338,7 +17338,7 @@ new file mode 100644
+ return absl::nullopt;
+}
+
+absl::optional<GURL> SubscriptionCollectionImpl::FindByPopupFilter(
+std::optional<GURL> SubscriptionCollectionImpl::FindByPopupFilter(
+ const GURL& popup_url,
+ const std::vector<GURL>& frame_hierarchy,
+ const SiteKey& sitekey,
@@ -17356,7 +17356,7 @@ new file mode 100644
+ return absl::nullopt;
+}
+
+absl::optional<GURL> SubscriptionCollectionImpl::FindByAllowFilter(
+std::optional<GURL> SubscriptionCollectionImpl::FindByAllowFilter(
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
+ ContentType content_type,
@@ -17370,7 +17370,7 @@ new file mode 100644
+ return absl::nullopt;
+}
+
+absl::optional<GURL> SubscriptionCollectionImpl::FindBySpecialFilter(
+std::optional<GURL> SubscriptionCollectionImpl::FindBySpecialFilter(
+ SpecialFilterType filter_type,
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
@@ -17588,26 +17588,26 @@ new file mode 100644
+
+ const std::string& GetFilteringConfigurationName() const final;
+
+ absl::optional<GURL> FindBySubresourceFilter(
+ std::optional<GURL> FindBySubresourceFilter(
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
+ ContentType content_type,
+ const SiteKey& sitekey,
+ FilterCategory category) const final;
+
+ absl::optional<GURL> FindByPopupFilter(
+ std::optional<GURL> FindByPopupFilter(
+ const GURL& popup_url,
+ const std::vector<GURL>& frame_hierarchy,
+ const SiteKey& sitekey,
+ FilterCategory category) const final;
+
+ absl::optional<GURL> FindByAllowFilter(
+ std::optional<GURL> FindByAllowFilter(
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
+ ContentType content_type,
+ const SiteKey& sitekey) const final;
+
+ absl::optional<GURL> FindBySpecialFilter(
+ std::optional<GURL> FindBySpecialFilter(
+ SpecialFilterType filter_type,
+ const GURL& request_url,
+ const std::vector<GURL>& frame_hierarchy,
@@ -18577,7 +18577,7 @@ new file mode 100644
+ raw_ptr<ConversionExecutors> conversion_executor_;
+ raw_ptr<SubscriptionPersistentMetadata> persistent_metadata_;
+ OngoingDownloads ongoing_downloads_;
+ absl::optional<HeadRequest> ongoing_ping_;
+ std::optional<HeadRequest> ongoing_ping_;
+ base::WeakPtrFactory<SubscriptionDownloaderImpl> weak_ptr_factory_{this};
+};
+
@@ -20190,7 +20190,7 @@ new file mode 100644
+
+} // namespace
+
+absl::optional<base::StringPiece> UrlKeywordExtractor::GetNextKeyword() {
+std::optional<base::StringPiece> UrlKeywordExtractor::GetNextKeyword() {
+ base::StringPiece current_keyword;
+ do {
+ const auto start_of_next_keyword = input_.find_first_not_of('\0');
@@ -20277,7 +20277,7 @@ new file mode 100644
+ public:
+ explicit UrlKeywordExtractor(base::StringPiece url);
+ ~UrlKeywordExtractor();
+ absl::optional<base::StringPiece> GetNextKeyword();
+ std::optional<base::StringPiece> GetNextKeyword();
+
+ private:
+ std::string url_with_nulls_;
build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch
+8 -8
View File
@@ -384,7 +384,7 @@ new file mode 100644
+ WebSocketFactory factory,
+ const GURL& url,
+ const net::SiteForCookies& site_for_cookies,
+ const absl::optional<std::string>& user_agent,
+ const std::optional<std::string>& user_agent,
+ mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
+ handshake_client) {
+ if (IsFilteringNeeded(frame)) {
@@ -404,7 +404,7 @@ new file mode 100644
+ WebSocketFactory factory,
+ const GURL& url,
+ const net::SiteForCookies& site_for_cookies,
+ const absl::optional<std::string>& user_agent,
+ const std::optional<std::string>& user_agent,
+ mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
+ handshake_client) {
+ auto* frame = content::RenderFrameHost::FromID(render_frame_host_id);
@@ -431,7 +431,7 @@ new file mode 100644
+ ChromeContentBrowserClient::WebSocketFactory factory,
+ const GURL& url,
+ const net::SiteForCookies& site_for_cookies,
+ const absl::optional<std::string>& user_agent,
+ const std::optional<std::string>& user_agent,
+ mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
+ handshake_client,
+ adblock::FilterMatchResult result) {
@@ -468,7 +468,7 @@ new file mode 100644
+ int render_process_id,
+ URLLoaderFactoryType type,
+ const url::Origin& request_initiator,
+ absl::optional<int64_t> navigation_id,
+ std::optional<int64_t> navigation_id,
+ ukm::SourceIdObj ukm_source_id,
+ mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
+ mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
@@ -583,7 +583,7 @@ new file mode 100644
+ WebSocketFactory factory,
+ const GURL& url,
+ const net::SiteForCookies& site_for_cookies,
+ const absl::optional<std::string>& user_agent,
+ const std::optional<std::string>& user_agent,
+ mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
+ handshake_client) override;
+
@@ -593,7 +593,7 @@ new file mode 100644
+ int render_process_id,
+ URLLoaderFactoryType type,
+ const url::Origin& request_initiator,
+ absl::optional<int64_t> navigation_id,
+ std::optional<int64_t> navigation_id,
+ ukm::SourceIdObj ukm_source_id,
+ mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
+ mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
@@ -610,7 +610,7 @@ new file mode 100644
+ WebSocketFactory factory,
+ const GURL& url,
+ const net::SiteForCookies& site_for_cookies,
+ const absl::optional<std::string>& user_agent,
+ const std::optional<std::string>& user_agent,
+ mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
+ handshake_client);
+ void OnWebSocketFilterCheckCompleted(
@@ -618,7 +618,7 @@ new file mode 100644
+ ChromeContentBrowserClient::WebSocketFactory factory,
+ const GURL& url,
+ const net::SiteForCookies& site_for_cookies,
+ const absl::optional<std::string>& user_agent,
+ const std::optional<std::string>& user_agent,
+ mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
+ handshake_client,
+ adblock::FilterMatchResult result);
build/patches/eyeo-beta-118.0.5993.48-extension_api.patch
+21 -21
View File
@@ -463,7 +463,7 @@ new file mode 100644
+AdblockPrivateSetEnabledFunction::~AdblockPrivateSetEnabledFunction() {}
+
+ExtensionFunction::ResponseAction AdblockPrivateSetEnabledFunction::Run() {
+ absl::optional<api::adblock_private::SetEnabled::Params> params =
+ std::optional<api::adblock_private::SetEnabled::Params> params =
+ api::adblock_private::SetEnabled::Params::Create(args());
+ EXTENSION_FUNCTION_VALIDATE(params);
+
@@ -501,7 +501,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+AdblockPrivateSetAcceptableAdsEnabledFunction::Run() {
+ absl::optional<api::adblock_private::SetAcceptableAdsEnabled::Params> params =
+ std::optional<api::adblock_private::SetAcceptableAdsEnabled::Params> params =
+ api::adblock_private::SetAcceptableAdsEnabled::Params::Create(args());
+ EXTENSION_FUNCTION_VALIDATE(params);
+
@@ -574,7 +574,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+AdblockPrivateInstallSubscriptionFunction::Run() {
+ absl::optional<api::adblock_private::InstallSubscription::Params> params =
+ std::optional<api::adblock_private::InstallSubscription::Params> params =
+ api::adblock_private::InstallSubscription::Params::Create(args());
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto url = GURL{params->url};
@@ -595,7 +595,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+AdblockPrivateUninstallSubscriptionFunction::Run() {
+ absl::optional<api::adblock_private::UninstallSubscription::Params> params =
+ std::optional<api::adblock_private::UninstallSubscription::Params> params =
+ api::adblock_private::UninstallSubscription::Params::Create(args());
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto url = GURL{params->url};
@@ -637,7 +637,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+AdblockPrivateAddAllowedDomainFunction::Run() {
+ absl::optional<api::adblock_private::AddAllowedDomain::Params> params =
+ std::optional<api::adblock_private::AddAllowedDomain::Params> params =
+ api::adblock_private::AddAllowedDomain::Params::Create(args());
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* adblock_configuration =
@@ -658,7 +658,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+AdblockPrivateRemoveAllowedDomainFunction::Run() {
+ absl::optional<api::adblock_private::RemoveAllowedDomain::Params> params =
+ std::optional<api::adblock_private::RemoveAllowedDomain::Params> params =
+ api::adblock_private::RemoveAllowedDomain::Params::Create(args());
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* adblock_configuration =
@@ -698,7 +698,7 @@ new file mode 100644
+ ~AdblockPrivateAddCustomFilterFunction() {}
+
+ExtensionFunction::ResponseAction AdblockPrivateAddCustomFilterFunction::Run() {
+ absl::optional<api::adblock_private::AddCustomFilter::Params> params =
+ std::optional<api::adblock_private::AddCustomFilter::Params> params =
+ api::adblock_private::AddCustomFilter::Params::Create(args());
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* adblock_configuration =
@@ -738,7 +738,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+AdblockPrivateRemoveCustomFilterFunction::Run() {
+ absl::optional<api::adblock_private::RemoveCustomFilter::Params> params =
+ std::optional<api::adblock_private::RemoveCustomFilter::Params> params =
+ api::adblock_private::RemoveCustomFilter::Params::Create(args());
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* adblock_configuration =
@@ -2551,7 +2551,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateCreateConfigurationFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::CreateConfiguration::Params>
+ std::optional<api::eyeo_filtering_private::CreateConfiguration::Params>
+ params(api::eyeo_filtering_private::CreateConfiguration::Params::Create(
+ args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
@@ -2584,7 +2584,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateRemoveConfigurationFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::RemoveConfiguration::Params>
+ std::optional<api::eyeo_filtering_private::RemoveConfiguration::Params>
+ params(api::eyeo_filtering_private::RemoveConfiguration::Params::Create(
+ args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
@@ -2635,7 +2635,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateSetEnabledFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::SetEnabled::Params> params(
+ std::optional<api::eyeo_filtering_private::SetEnabled::Params> params(
+ api::eyeo_filtering_private::SetEnabled::Params::Create(args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* configuration =
@@ -2655,7 +2655,7 @@ new file mode 100644
+ ~EyeoFilteringPrivateIsEnabledFunction() = default;
+
+ExtensionFunction::ResponseAction EyeoFilteringPrivateIsEnabledFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::IsEnabled::Params> params(
+ std::optional<api::eyeo_filtering_private::IsEnabled::Params> params(
+ api::eyeo_filtering_private::IsEnabled::Params::Create(args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* configuration =
@@ -2690,7 +2690,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateSubscribeToFilterListFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::SubscribeToFilterList::Params>
+ std::optional<api::eyeo_filtering_private::SubscribeToFilterList::Params>
+ params(api::eyeo_filtering_private::SubscribeToFilterList::Params::Create(
+ args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
@@ -2718,7 +2718,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateUnsubscribeFromFilterListFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::UnsubscribeFromFilterList::Params>
+ std::optional<api::eyeo_filtering_private::UnsubscribeFromFilterList::Params>
+ params(api::eyeo_filtering_private::UnsubscribeFromFilterList::Params::
+ Create(args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
@@ -2746,7 +2746,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateGetFilterListsFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::GetFilterLists::Params> params(
+ std::optional<api::eyeo_filtering_private::GetFilterLists::Params> params(
+ api::eyeo_filtering_private::GetFilterLists::Params::Create(args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* configuration =
@@ -2772,7 +2772,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateAddAllowedDomainFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::AddAllowedDomain::Params> params(
+ std::optional<api::eyeo_filtering_private::AddAllowedDomain::Params> params(
+ api::eyeo_filtering_private::AddAllowedDomain::Params::Create(args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* configuration =
@@ -2793,7 +2793,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateRemoveAllowedDomainFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::RemoveAllowedDomain::Params>
+ std::optional<api::eyeo_filtering_private::RemoveAllowedDomain::Params>
+ params(api::eyeo_filtering_private::RemoveAllowedDomain::Params::Create(
+ args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
@@ -2815,7 +2815,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateGetAllowedDomainsFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::GetAllowedDomains::Params> params(
+ std::optional<api::eyeo_filtering_private::GetAllowedDomains::Params> params(
+ api::eyeo_filtering_private::GetAllowedDomains::Params::Create(args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* configuration =
@@ -2837,7 +2837,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateAddCustomFilterFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::AddCustomFilter::Params> params(
+ std::optional<api::eyeo_filtering_private::AddCustomFilter::Params> params(
+ api::eyeo_filtering_private::AddCustomFilter::Params::Create(args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* configuration =
@@ -2858,7 +2858,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateRemoveCustomFilterFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::RemoveCustomFilter::Params>
+ std::optional<api::eyeo_filtering_private::RemoveCustomFilter::Params>
+ params(api::eyeo_filtering_private::RemoveCustomFilter::Params::Create(
+ args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
@@ -2874,7 +2874,7 @@ new file mode 100644
+
+ExtensionFunction::ResponseAction
+EyeoFilteringPrivateGetCustomFiltersFunction::Run() {
+ absl::optional<api::eyeo_filtering_private::GetCustomFilters::Params> params(
+ std::optional<api::eyeo_filtering_private::GetCustomFilters::Params> params(
+ api::eyeo_filtering_private::GetCustomFilters::Params::Create(args()));
+ EXTENSION_FUNCTION_VALIDATE(params);
+ auto* configuration =
build/patches/ungoogled-chromium-Disable-translate-integration.patch
+1 -1
View File
@@ -173,7 +173,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1884,9 +1884,6 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1885,9 +1885,6 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_LANGUAGES_LIST_DESCRIPTION" desc="Description on the Languages settings screen. Appears above a list of one or more languages that the user selects, to tell Chrome which languages they prefer to use to read website content.">
Let websites know the languages you speak. They’ll show content in those languages, when possible.
</message>
docs/PATCHES.md
+13 -7
View File
@@ -9,9 +9,9 @@
|**Add a proxy configuration page** <br><sub><nobr> Thu, 29 Mar 2018 00:43:32 +0200</nobr> <br>File: [Add-a-proxy-configuration-page.patch](/build/patches/Add-a-proxy-configuration-page.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Accessible from proxy settings and chrome://proxy<br>Allows to use a PAC script URL, automatic configuration and explicit proxy settings.<br>Offer auto-complete for the proxy page URL.<br>Store proxy settings in LocalState instead of Profile, so that proxy is used for SimpleURLLoaders as well;<br>this implementation is the same as the one in ChromeOS which gets proxy information from the LocalState<br>for the system network context; this is strictly not correct on Android because the network context is<br>never connected to any user profile and only gets proxy information from the system.<br>Existing settings on Profile are migrated to LocalState on startup.<br>Credits to @uazo for the LocalState integration.|
|**Add an always-incognito mode** <br><sub><nobr> Sat, 2 Oct 2021 13:20:36 +0200</nobr> <br>File: [Add-an-always-incognito-mode.patch](/build/patches/Add-an-always-incognito-mode.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Add a preference that causes all new tabs and all clicked links to launch in incognito.<br>Make sure initial incognito status is correctly recognized.<br>Enable incognito custom tabs and fix crashes for incognito/custom tab intents<br>Use a native flag to correctly start new tabs on app startup<br>Add history, recents, offlinepages and send to home screen support for always incognito.<br>History, recent tabs and offline pages require the INCOGNITO_TAB_HISTORY_ENABLED<br>flag turned on.<br>IncognitoPlaceholder is also deactivated, both in the phone and tablet version.<br>The relative tests are also present.<br>based on the original work by Ryan Archer <ryan.bradley.archer@gmail.com><br>Major contributions by uazo.<br>See also: https://github.com/bromite/bromite/pull/1427|
|**Add autoplay site setting** <br><sub><nobr> Sat, 7 Nov 2020 21:59:18 +0000</nobr> <br>File: [Add-autoplay-site-setting.patch](/build/patches/Add-autoplay-site-setting.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Require: Content-settings-infrastructure.patch|
|**Add bookmark import/export actions** <br><sub><nobr> Wed, 1 Aug 2018 09:19:40 +0200</nobr> <br>File: [Add-bookmark-import-export-actions.patch](/build/patches/Add-bookmark-import-export-actions.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Add bookmark import/export actions in bookmarks activity and page<br>Reduce permissions needed for bookmarks import/export<br>Completely remove contacts picker permission from the file dialog<br>Requires patch: Adds-support-for-writing-URIs.patch|
|**Add bookmark import/export actions** <br><sub><nobr> Wed, 1 Aug 2018 09:19:40 +0200</nobr> <br>File: [Add-bookmark-import-export-actions.patch](/build/patches/Add-bookmark-import-export-actions.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Add bookmark import/export actions in bookmarks activity and page<br>Reduce permissions needed for bookmarks import/export<br>Completely remove contacts picker permission from the file dialog<br>Requires: Adds-support-for-writing-URIs.patch<br>Requires: Restore-BookmarkToolbar-setCurrentFolder.patch|
|**Add browser policy** <br><sub><nobr> Tue, 22 Nov 2022 16:49:58 +0000</nobr> <br>File: [add-browser-policy.patch](/build/patches/add-browser-policy.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Add cromite flags support** <br><sub><nobr> Sat, 18 Nov 2023 09:41:28 +0000</nobr> <br>File: [Add-cromite-flags-support.patch](/build/patches/Add-cromite-flags-support.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Add SET_CROMITE_FEATURE_ENABLED*, SET_CROMITE_FEATURE_DISABLED*<br>and CROMITE_FEATURE macros, logic has been adapted from that found<br>in brave.<br>Allows flags to be defined in separate files.<br>Activates a new cromite tab in chrome://flags with only the flags<br>added and changed. In android added chrome://flags/cromite<br>in the setting ui.<br>Currently in wip<br>Need: bromite-build-utils.patch|
|**Add cromite flags support** <br><sub><nobr> Sat, 18 Nov 2023 09:41:28 +0000</nobr> <br>File: [Add-cromite-flags-support.patch](/build/patches/Add-cromite-flags-support.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Add SET_CROMITE_FEATURE_ENABLED*, SET_CROMITE_FEATURE_DISABLED*<br>and CROMITE_FEATURE macros, logic has been adapted from that found<br>in brave.<br>Allows flags to be defined in separate files.<br>Activates a new cromite tab in chrome://flags with only the flags<br>added and changed. In android added chrome://flags/cromite<br>in the setting ui.<br>Need: bromite-build-utils.patch|
|**Add custom tab intents privacy option** <br><sub><nobr> Wed, 29 Aug 2018 11:03:44 +0200</nobr> <br>File: [Add-custom-tab-intents-privacy-option.patch](/build/patches/Add-custom-tab-intents-privacy-option.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Add custom tab intents privacy option and force<br>open external links in incognito flag.<br>Flags are mutually exclusive.<br>See also: https://github.com/bromite/bromite/issues/1474|
|**Add exit menu item** <br><sub><nobr> Tue, 31 Jan 2017 22:12:27 -0500</nobr> <br>File: [Add-exit-menu-item.patch](/build/patches/Add-exit-menu-item.patch) <br><nobr>Author: Serg</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Corrected Exit functionality|
|**Add flag for omnibox autocomplete filtering** <br><sub><nobr> Sat, 22 Aug 2020 08:52:40 -0500</nobr> <br>File: [Add-flag-for-omnibox-autocomplete-filtering.patch](/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch) <br><nobr>Author: Blaise</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Adds a flag that restricts whether search history, clipboard, bookmarks<br>and internal chrome:// pages will be used for the autocomplete results.|
@@ -46,19 +46,22 @@
|**Always open browser controls in new tab** <br><sub><nobr> Wed, 28 Dec 2022 07:19:58 +0000</nobr> <br>File: [Always-open-browser-controls-in-new-tab.patch](/build/patches/Always-open-browser-controls-in-new-tab.patch) <br><nobr>Author: Your</nobr> <br><nobr>Context: </nobr> <br><nobr>License: </nobr> ||
|**Always use new tab page for default home page** <br><sub><nobr> Wed, 27 Jun 2018 11:02:38 +0200</nobr> <br>File: [Always-use-new-tab-page-for-default-home-page.patch](/build/patches/Always-use-new-tab-page-for-default-home-page.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Ignore any partner-provided home page.|
|**Android Toolbar Scroll Ablation setting** <br><sub><nobr> Wed, 22 May 2024 07:41:34 +0000</nobr> <br>File: [Android-Toolbar-Scroll-Ablation-setting.patch](/build/patches/Android-Toolbar-Scroll-Ablation-setting.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Adds a setting for blocking the toolbar hiding<br>need: Add-cromite-flags-support.patch|
|**Ask to restart on connection change** <br><sub><nobr> Tue, 18 Jun 2024 15:31:12 +0000</nobr> <br>File: [Ask-for-restart-on-connection-change.patch](/build/patches/Ask-for-restart-on-connection-change.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Experimental use of the OfflineDetector to identify network change, disabled by default.<br>If it is active, when the network change is detected by the android API,<br>the user is warned and asked to restart the browser.<br>Technically, blink's freeze mode is exploited, which allows javascript<br>execution and network calls to be blocked.<br>A preventive shutdown of all service workers is carried out, to inhibit the sending<br>of messages over the new ip, since the service workers have access<br>to the background fetch api.<br>The freeze and resume event of javascript is deliberately left, since the<br>page could deduct it in any case. In any case during the execution of<br>the javascript events, the page can only access the FetchLater api,<br>which is disabled by another patch.<br>The patch also changes the standard behaviour of the browser, allowing visible pages to freeze.<br>This could lead to the failure of some DCHECKS related to the handling of UI messages at unfreeze,<br>but since the goal is a reboot, this should not be the case.|
|**AudioBuffer, AnalyserNode: fp mitigations** <br><sub><nobr> Sun, 25 Mar 2018 21:49:37 +0200</nobr> <br>File: [AudioBuffer-AnalyserNode-fp-mitigations.patch](/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Truncate base latency precision to two digits|
|**Battery API: return nothing** <br><sub><nobr> Thu, 22 Mar 2018 22:11:57 +0100</nobr> <br>File: [Battery-API-return-nothing.patch](/build/patches/Battery-API-return-nothing.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Include @thestinger's fix for correct charging/unknown values|
|**Block Intents While Locked** <br><sub><nobr> Tue, 31 Oct 2023 16:16:08 +0000</nobr> <br>File: [Block-Intents-While-Locked.patch](/build/patches/Block-Intents-While-Locked.patch) <br><nobr>Author: Your</nobr> <br><nobr>Context: </nobr> <br><nobr>License: </nobr> |see https://source.chromium.org/chromium/chromium/src/+/c5b50f4c2d42e7b808fd3e6fb3545cdb3f4d82c9|
|**Block gateway attacks via websockets** <br><sub><nobr> Tue, 28 Jul 2020 12:28:58 +0200</nobr> <br>File: [Block-gateway-attacks-via-websockets.patch](/build/patches/Block-gateway-attacks-via-websockets.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |This approach is not comprehensive, see also:<br>* https://bugs.chromium.org/p/chromium/issues/detail?id=590714|
|**Block qjz9zk or trk: requests** <br><sub><nobr> Wed, 30 Oct 2019 11:50:13 +0100</nobr> <br>File: [Block-qjz9zk-or-trk-requests.patch](/build/patches/Block-qjz9zk-or-trk-requests.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |An info bar is displayed unless the --disable-trkbar command-line flag or the chrome://flag option is used.<br>This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'|
|**Bookmarks select all menu entry** <br><sub><nobr> Sat, 9 Apr 2022 23:01:55 +0200</nobr> <br>File: [Bookmarks-select-all-menu-entry.patch](/build/patches/Bookmarks-select-all-menu-entry.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Bookmarks select all menu entry** <br><sub><nobr> Sat, 9 Apr 2022 23:01:55 +0200</nobr> <br>File: [Bookmarks-select-all-menu-entry.patch](/build/patches/Bookmarks-select-all-menu-entry.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Requires: Restore-BookmarkToolbar-setCurrentFolder.patch|
|**Bromite auto updater** <br><sub><nobr> Thu, 7 Oct 2021 14:27:12 +0000</nobr> <br>File: [Bromite-auto-updater.patch](/build/patches/Bromite-auto-updater.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Enable checking for new versions, with notifications and proxy support.<br>Restore InlineUpdateFlow feature.<br>Some parts authored by csagan5.|
|**Bromite package name** <br><sub><nobr> Sat, 8 Jan 2022 19:42:34 +0100</nobr> <br>File: [Bromite-package-name.patch](/build/patches/Bromite-package-name.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Bromite subresource adblocker** <br><sub><nobr> Sat, 14 Sep 2019 10:20:08 +0200</nobr> <br>File: [Bromite-subresource-adblocker.patch](/build/patches/Bromite-subresource-adblocker.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Add option to configure the ad blocker filters URL<br>Disable look-alike, metrics, ablation and navigation throttles<br>Do not use experiments to enable/disable presets<br>Always enable ad filtering<br>Download filters by checking Last-Modified header first<br>Fix RestoreForeignSessionTab by recreating the tab (issue #681)<br>Enable AutomaticLazyFrameLoadingToAds and AutomaticLazyFrameLoadingToEmbeds features|
|**Bubble Locking on UI DevTools** <br><sub><nobr> Tue, 30 Jul 2024 14:38:58 +0000</nobr> <br>File: [Bubble-Locking-on-UI-DevTools.patch](/build/patches/Bubble-Locking-on-UI-DevTools.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Allows the use of ctrl+shift+click on the refresh button to<br>activate the Bubble Locking mode for the native dev-ui.<br>The current ctrl+shift+R is really inconvenient and often does not work.|
|**Change popup site setting** <br><sub><nobr> Sun, 4 Feb 2024 16:02:48 +0000</nobr> <br>File: [Change-popup-site-setting.patch](/build/patches/Change-popup-site-setting.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |In site settings added ability to block all popups per site|
|**Chrome web store protection** <br><sub><nobr> Thu, 28 Dec 2023 14:58:09 +0000</nobr> <br>File: [Chrome-web-store-protection.patch](/build/patches/Chrome-web-store-protection.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |The amount of information sent is minimized without disabling<br>the ability to install extensions (which is under user control)<br>It became possible to activate the autoupdate of extensions by sending the minimum of values.<br>Installation with the chrome web store is allowed, but the website<br>by default cannot retrieve the list of installed extensions and their status (under flag)<br>All http calls related to requesting and downloading updates are cookie-free,<br>but the ip and the list of extensions are traceable, that information cannot be omitted.<br>Auto-update is disabled by default: it is possible to activate it with chrome://extensions/|
|**Clear CORS Preflight Cache on clearing data** <br><sub><nobr> Wed, 19 Apr 2023 09:59:18 +0000</nobr> <br>File: [Clear-CORS-Preflight-Cache-on-clearing-data.patch](/build/patches/Clear-CORS-Preflight-Cache-on-clearing-data.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Client hints overrides** <br><sub><nobr> Thu, 22 Jul 2021 23:10:52 +0200</nobr> <br>File: [Client-hints-overrides.patch](/build/patches/Client-hints-overrides.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Disable critical client hints and network early hints<br>Use Google Chrome branding for client hints|
|**Close sessions on ip change** <br><sub><nobr> Tue, 18 Jun 2024 14:14:06 +0000</nobr> <br>File: [Close-Sessions-On-Ip-Change.patch](/build/patches/Close-Sessions-On-Ip-Change.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Exposed a flag to change the behaviour of the network stack with regard<br>to the automatic reconnection of quic connections when the connection changes.<br>By default changed from automatic reconnection to close connection on ip change.<br>No change in doh connections.|
|**Compress libchrome to free up some space** <br><sub><nobr> Wed, 19 Jul 2023 09:32:36 +0000</nobr> <br>File: [Compress-libchrome-to-free-up-some-space.patch](/build/patches/Compress-libchrome-to-free-up-some-space.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |upstream removed ModernLinker support for developer build (apk releases).<br>see https://bugs.chromium.org/p/chromium/issues/detail?id=1383210|
|**Content settings infrastructure** <br><sub><nobr> Thu, 24 Feb 2022 07:54:36 +0000</nobr> <br>File: [Content-settings-infrastructure.patch](/build/patches/Content-settings-infrastructure.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |This patch is used by other patches to provide the UI for Bromite-specific<br>site settings.<br>See BromiteCustomContentSetting_README.md for more information.<br>Require: bromite-build-utils.patch|
|**Cromite Branding** <br><sub><nobr> Wed, 19 Jul 2023 12:37:39 +0000</nobr> <br>File: [Cromite-Branding.patch](/build/patches/Cromite-Branding.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
@@ -69,6 +72,7 @@
|**Disable Android AppRestrictions** <br><sub><nobr> Fri, 5 Jan 2024 17:02:29 +0000</nobr> <br>File: [Disable-Android-AppRestrictions.patch](/build/patches/Disable-Android-AppRestrictions.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Disable AsyncDNS by default** <br><sub><nobr> Sat, 26 Mar 2022 16:41:55 +0100</nobr> <br>File: [Disable-AsyncDNS-by-default.patch](/build/patches/Disable-AsyncDNS-by-default.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |This feature is detrimental to privacy, see also:<br>* https://bugs.chromium.org/p/chromium/issues/detail?id=805020|
|**Disable BackForwardCache** <br><sub><nobr> Tue, 14 Feb 2023 16:29:12 +0000</nobr> <br>File: [Disable-BackForwardCache.patch](/build/patches/Disable-BackForwardCache.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Disable CSS blink-feature support** <br><sub><nobr> Mon, 29 Jul 2024 06:48:25 +0000</nobr> <br>File: [Disable-CSS-blink-feature-support.patch](/build/patches/Disable-CSS-blink-feature-support.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |the function is not currently exposed to websites but is only allowed for testing.<br>disabled as it is an potentially advanced fingerprinting mechanism.<br>also fixed the possibility of using internal selectors for speculation rules.<br>see https://chromium-review.googlesource.com/c/chromium/src/+/5540782|
|**Disable Component Updates** <br><sub><nobr> Tue, 8 Nov 2022 12:41:22 +0000</nobr> <br>File: [Disable-Component-Updates.patch](/build/patches/Disable-Component-Updates.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Disable Compose feature** <br><sub><nobr> Mon, 26 Feb 2024 16:35:16 +0000</nobr> <br>File: [Disable-Compose-feature.patch](/build/patches/Disable-Compose-feature.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Disable Compression Dictionary Transport** <br><sub><nobr> Sat, 3 Jun 2023 15:04:55 +0000</nobr> <br>File: [Disable-Compression-Dictionary-Transport.patch](/build/patches/Disable-Compression-Dictionary-Transport.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
@@ -103,10 +107,10 @@
|**Disable minidump upload scheduling** <br><sub><nobr> Sun, 27 Feb 2022 23:58:22 +0100</nobr> <br>File: [Disable-minidump-upload-scheduling.patch](/build/patches/Disable-minidump-upload-scheduling.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Disable offline autofetch flag** <br><sub><nobr> Tue, 27 Feb 2024 08:51:40 +0000</nobr> <br>File: [Disable-offline-autofetch-flag.patch](/build/patches/Disable-offline-autofetch-flag.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Disable auto fetch of content when browser is online|
|**Disable offline pages in CCT** <br><sub><nobr> Thu, 30 May 2019 03:37:45 +0200</nobr> <br>File: [Disable-offline-pages-in-CCT.patch](/build/patches/Disable-offline-pages-in-CCT.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Disable omission of URL elements in Omnibox** <br><sub><nobr> Wed, 11 Oct 2017 23:24:58 +0200</nobr> <br>File: [Disable-omission-of-URL-elements-in-Omnibox.patch](/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Disable all omissions because they are used throughout the code without<br>a corresponding user option to individually disable their usage.|
|**Disable omission of URL elements** <br><sub><nobr> Wed, 11 Oct 2017 23:24:58 +0200</nobr> <br>File: [Disable-omission-of-URL-elements.patch](/build/patches/Disable-omission-of-URL-elements.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Disabling some omissions of complete urls|
|**Disable plugins enumeration** <br><sub><nobr> Thu, 22 Mar 2018 22:38:00 +0100</nobr> <br>File: [Disable-plugins-enumeration.patch](/build/patches/Disable-plugins-enumeration.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Disable prefers-reduced-transparency media query** <br><sub><nobr> Fri, 20 Oct 2023 14:53:41 +0000</nobr> <br>File: [Disable-prefers-reduced-transparency-media-query.patch](/build/patches/Disable-prefers-reduced-transparency-media-query.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: </nobr> |This feature can be used for fingerprinting as it exposes a user preference|
|**Disable privacy issues in password manager** <br><sub><nobr> Tue, 14 Mar 2023 15:59:38 +0000</nobr> <br>File: [Disable-privacy-issues-in-password-manager.patch](/build/patches/Disable-privacy-issues-in-password-manager.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Disable privacy issues in password manager** <br><sub><nobr> Tue, 14 Mar 2023 15:59:38 +0000</nobr> <br>File: [Disable-privacy-issues-in-password-manager.patch](/build/patches/Disable-privacy-issues-in-password-manager.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Need: Add-cromite-flags-support.patch|
|**Disable privacy sandbox** <br><sub><nobr> Sat, 13 Nov 2021 09:17:06 +0000</nobr> <br>File: [Disable-privacy-sandbox.patch](/build/patches/Disable-privacy-sandbox.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Remove UI from the settings and set the flags to inactive<br>Permanently removes FLoC support, disabling the download of LSH clusters,<br>the marking the history navigation and the javascript API and permission policies.<br>Also disable FirstPartySets and StorageAccessAPI.|
|**Disable ranker_url_fetcher** <br><sub><nobr> Sun, 8 Oct 2023 16:04:56 +0000</nobr> <br>File: [Disable-ranker-url-fetcher.patch](/build/patches/Disable-ranker-url-fetcher.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Disable references to fonts.googleapis.com** <br><sub><nobr> Sun, 15 Oct 2017 21:45:46 +0200</nobr> <br>File: [Disable-references-to-fonts.googleapis.com.patch](/build/patches/Disable-references-to-fonts.googleapis.com.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
@@ -117,6 +121,7 @@
|**Disable some signed exchange features** <br><sub><nobr> Sat, 2 Nov 2019 16:22:56 +0100</nobr> <br>File: [Disable-some-signed-exchange-features.patch](/build/patches/Disable-some-signed-exchange-features.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Disable speechSynthesis getVoices API** <br><sub><nobr> Thu, 20 Apr 2023 15:03:13 +0000</nobr> <br>File: [Disable-speechSynthesis-getVoices-API.patch](/build/patches/Disable-speechSynthesis-getVoices-API.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Adds flag disable-speechsynthesis-voice-list to disable<br>SpeechSynthesis.getVoices() call.<br>If not active the user must also set the system timezone override<br>to enable it.<br>Disable LiveCaption<br>Require: Timezone-customization.patch|
|**Disable support for RAR files inspection** <br><sub><nobr> Wed, 21 Nov 2018 02:37:35 +0000</nobr> <br>File: [Disable-support-for-RAR-files-inspection.patch](/build/patches/Disable-support-for-RAR-files-inspection.patch) <br><nobr>Author: Michael</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Disable support for pointer device id** <br><sub><nobr> Thu, 25 Jul 2024 08:25:37 +0000</nobr> <br>File: [Disable-support-for-pointer-device-id.patch](/build/patches/Disable-support-for-pointer-device-id.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |disable pointerEvent.deviceId for Windows devices that are able to provide a GUID<br>or serial number and id making them identical to the mouse pointer-id.<br>see https://groups.google.com/a/chromium.org/g/blink-dev/c/3eU-AHH8x4k<br>Need: Add-cromite-flags-support.patch|
|**Disable text fragments by default** <br><sub><nobr> Sat, 22 Aug 2020 12:46:20 +0200</nobr> <br>File: [Disable-text-fragments-by-default.patch](/build/patches/Disable-text-fragments-by-default.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Revert "[Text Fragment] Unflag fragment directive removal."|
|**Disable the DIAL repeating discovery** <br><sub><nobr> Sun, 23 Aug 2020 14:32:55 -0500</nobr> <br>File: [Disable-the-DIAL-repeating-discovery.patch](/build/patches/Disable-the-DIAL-repeating-discovery.patch) <br><nobr>Author: Blaise</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |This causes unnecessary SSDP network spam|
|**Disable third-party origin trials** <br><sub><nobr> Thu, 4 Nov 2021 09:19:24 +0100</nobr> <br>File: [Disable-third-party-origin-trials.patch](/build/patches/Disable-third-party-origin-trials.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
@@ -134,6 +139,7 @@
|**Do not store passwords by default** <br><sub><nobr> Wed, 11 Oct 2017 23:17:17 +0200</nobr> <br>File: [Do-not-store-passwords-by-default.patch](/build/patches/Do-not-store-passwords-by-default.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Do not use Windows ClearType Text Tuner setting** <br><sub><nobr> Tue, 16 Apr 2024 12:29:29 +0000</nobr> <br>File: [Do-not-use-Windows-ClearType-Text-Tuner-setting.patch](/build/patches/Do-not-use-Windows-ClearType-Text-Tuner-setting.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**DoH improvements** <br><sub><nobr> Sat, 26 Sep 2020 14:23:19 +0100</nobr> <br>File: [DoH-improvements.patch](/build/patches/DoH-improvements.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Enable secure mode by default<br>Always enforce DoH even with inconsistent system DNS configuration|
|**Downstream validate opaque origins checking their precursor** <br><sub><nobr> Mon, 29 Jul 2024 10:22:46 +0000</nobr> <br>File: [Downstream-validate-opaque-origins-checking-their-precursor.patch](/build/patches/Downstream-validate-opaque-origins-checking-their-precursor.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: </nobr> |commit https://source.chromium.org/chromium/chromium/src/+/4043b7370f9b845cd06f07296e115c7094662c66|
|**Enable -fwrapv in Clang for non-UBSan builds** <br><sub><nobr> Thu, 22 Dec 2016 07:15:34 -0500</nobr> <br>File: [Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch](/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch) <br><nobr>Author: Daniel</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Using -fwrapv (notably only when not using signed integer overflow checking -<br>since it will override it and result in not performing checks) is just common<br>sense since it eliminates the chance of security vulnerabilities being<br>introduced by optimizations based on signed overflow being undefined.<br>That has happened before, and those optimizations don't even add up to a 0.1%<br>performance increase for this kind of software. It's not worth having.<br>The Linux kernel passes -fwrapv and also -fno-strict-aliasing to disable those<br>dangerous optimizations (since there is so much incorrect code they can break).<br>In fact, it is easy to point to dozens of known examples of invalid code that<br>could potentially be broken by those optimizations.<br>It is not acceptable for projects to be using optimizations that are known to<br>be broken with a bunch of code in their tree.<br>They put barely any effort into even fixing the known cases.<br>Chromium has blacklists for UBSan for 'false positives' (none of which are<br>actually false positives, but rather "undefined, but not a bug beyond<br>potentially being broken by optimizations or even code generation without<br>them") and also for components too full of these bugs for them to currently<br>want to bother with it. That includes a bunch of signed overflow issues<br>(there is sadly no detection for aliasing violations, which are fairly common,<br>but not that common).<br>Ideally, -fwrapv could be always passed, but unfortunately the way it is<br>implemented has silly interactions with other switches.<br>The reason it would still make sense to pass it is because due to their UBSan<br>blacklists, they get far from full coverage with it, so -fwrapv would still<br>be better than nothing where it's not being used.<br>Since -fwrapv makes signed integer overflow well-defined, Clang will disable<br>the UBSan checks for signed integer overflow, including in the<br>production-oriented trapping mode used for hardening.<br>Excerpt from https://github.com/bromite/bromite/issues/226|
|**Enable Android Dynamic Performance Framework** <br><sub><nobr> Wed, 23 Aug 2023 13:49:19 +0000</nobr> <br>File: [Enable-Android-Dynamic-Performance-Framework.patch](/build/patches/Enable-Android-Dynamic-Performance-Framework.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Enable Certificate Transparency** <br><sub><nobr> Fri, 10 Jun 2022 14:20:02 +0200</nobr> <br>File: [Enable-Certificate-Transparency.patch](/build/patches/Enable-Certificate-Transparency.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Reporting/auditing functionalities are disabled; a flag is exposed.<br>Add guard to make sure that certificate transparency stays enabled<br>by default.|
@@ -222,6 +228,7 @@
|**Remove voice recognition integration** <br><sub><nobr> Sun, 19 Jun 2022 12:57:56 +0200</nobr> <br>File: [Remove-voice-recognition-integration.patch](/build/patches/Remove-voice-recognition-integration.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Remove window name on cross origin navigation** <br><sub><nobr> Sat, 9 Jul 2022 06:59:18 +0000</nobr> <br>File: [Remove-window-name-on-cross-origin-navigation.patch](/build/patches/Remove-window-name-on-cross-origin-navigation.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |See also: https://trac.webkit.org/changeset/209076/webkit|
|**Replace DoH probe domain with RIPE domain** <br><sub><nobr> Sun, 27 Oct 2019 10:00:13 +0100</nobr> <br>File: [Replace-DoH-probe-domain-with-RIPE-domain.patch](/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Replace known good hostname|
|**Restore BookmarkToolbar#setCurrentFolder** <br><sub><nobr> Thu, 18 Jul 2024 14:03:12 +0000</nobr> <br>File: [Restore-BookmarkToolbar-setCurrentFolder.patch](/build/patches/Restore-BookmarkToolbar-setCurrentFolder.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |restore https://chromium-review.googlesource.com/c/chromium/src/+/5554182|
|**Restore LastTabStandingTracker** <br><sub><nobr> Tue, 30 May 2023 15:13:31 +0000</nobr> <br>File: [Restore-LastTabStandingTracker.patch](/build/patches/Restore-LastTabStandingTracker.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Restore Search Ready Omnibox flag** <br><sub><nobr> Thu, 10 Oct 2019 23:30:16 +0200</nobr> <br>File: [Restore-Search-Ready-Omnibox-flag.patch](/build/patches/Restore-Search-Ready-Omnibox-flag.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Revert "Cleanup Search Ready Omnibox flag since it has launched"<br>This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2.<br>Disable search-ready omnibox by default|
|**Restore Simplified NTP launch** <br><sub><nobr> Sat, 7 Nov 2020 23:51:29 +0100</nobr> <br>File: [Restore-Simplified-NTP-launch.patch](/build/patches/Restore-Simplified-NTP-launch.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |This reverts commit 4d0e4483c5f77c66a8b6193e8a3bec5d0624d6ad.|
@@ -237,7 +244,6 @@
|**Revert remove AllowScript content settings per secondary url** <br><sub><nobr> Sun, 14 Apr 2024 07:35:57 +0000</nobr> <br>File: [Revert-remove-allowscript-content-setting-secondary-url.patch](/build/patches/Revert-remove-allowscript-content-setting-secondary-url.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: </nobr> |https://chromium-review.googlesource.com/c/chromium/src/+/5307559|
|**Samsung Note 9 SDK27 crazylinker workaround** <br><sub><nobr> Thu, 3 Feb 2022 19:48:49 +0000</nobr> <br>File: [Samsung-Note-9-SDK27-crazylinker-workaround.patch](/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Show NTP at startup** <br><sub><nobr> Tue, 27 Feb 2024 16:20:43 +0000</nobr> <br>File: [Show-NTP-at-startup.patch](/build/patches/Show-NTP-at-startup.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> |Adds an active option by default to automatically open the<br>NTP at each reboot and allows the user to continue the old browsing.<br>Until the real tab is opened, no data is retrieved.|
|**Show full urls for bookmark** <br><sub><nobr> Fri, 20 Oct 2023 12:36:07 +0000</nobr> <br>File: [Show-full-urls-for-bookmark.patch](/build/patches/Show-full-urls-for-bookmark.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: </nobr> |Restore omnibox-bookmark-paths flag and show full urls<br>in android bookmark page<br>See https://source.chromium.org/chromium/chromium/src/+/4a9dd5ab3709d60f40beb2f801a0185ab2ba992a|
|**Show site settings for cookies, javascript and ads** <br><sub><nobr> Sat, 28 Dec 2019 10:23:04 +0100</nobr> <br>File: [Show-site-settings-for-cookies-javascript-and-ads.patch](/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Avoid displaying info about intrusive ads|
|**Site setting for images** <br><sub><nobr> Tue, 5 Oct 2021 08:38:52 +0000</nobr> <br>File: [Site-setting-for-images.patch](/build/patches/Site-setting-for-images.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Require: Content-settings-infrastructure.patch|
|**Switch to -fstack-protector-strong** <br><sub><nobr> Wed, 26 Dec 2018 10:20:24 -0500</nobr> <br>File: [Switch-to-fstack-protector-strong.patch](/build/patches/Switch-to-fstack-protector-strong.patch) <br><nobr>Author: Daniel</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |This compiler option is already used for ChromeOS, but not yet on other<br>platforms because there is push back against enabling an option resulting in<br>~1-2% lower performance and ~2-3% larger binaries.<br>The size increase on Android is something they care a lot about since some<br>devices have very little storage space. That also means ever so slightly<br>higher memory/cache usage but not by the full 2-3%.|
@@ -245,8 +251,8 @@
|**Temp PerformanceNavigationTiming privacy fix** <br><sub><nobr> Wed, 11 Oct 2023 09:40:53 +0000</nobr> <br>File: [Temp-PerformanceNavigationTiming-privacy-fix.patch](/build/patches/Temp-PerformanceNavigationTiming-privacy-fix.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Temp disable predictive back gesture** <br><sub><nobr> Sat, 12 Aug 2023 14:48:57 +0000</nobr> <br>File: [Temp-disable-predictive-back-gesture.patch](/build/patches/Temp-disable-predictive-back-gesture.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Temp guard FileSystemAccessPersistentPermissions** <br><sub><nobr> Sun, 29 Oct 2023 15:18:24 +0000</nobr> <br>File: [Temp-guard-FileSystemAccessPersistentPermissions.patch](/build/patches/Temp-guard-FileSystemAccessPersistentPermissions.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: </nobr> ||
|**Temp try to fix DIPS service** <br><sub><nobr> Mon, 29 Jul 2024 12:12:37 +0000</nobr> <br>File: [Temp-try-to-fix-DIPS-service.patch](/build/patches/Temp-try-to-fix-DIPS-service.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: </nobr> ||
|**Timezone customization** <br><sub><nobr> Wed, 30 Sep 2020 07:40:01 +0000</nobr> <br>File: [Timezone-customization.patch](/build/patches/Timezone-customization.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |Allow specifying a custom timezone, or using a random one.<br>See also: https://github.com/bromite/bromite/wiki/TimezoneOverride<br>Require: Content-settings-infrastructure.patch|
|**Use 4 tile rows, never show logo** <br><sub><nobr> Wed, 21 Feb 2018 00:32:09 +0100</nobr> <br>File: [Use-4-tile-rows-never-show-logo.patch](/build/patches/Use-4-tile-rows-never-show-logo.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
|**Use 64-bit WebView processes** <br><sub><nobr> Thu, 26 Jan 2017 01:30:12 -0500</nobr> <br>File: [Use-64-bit-WebView-processes.patch](/build/patches/Use-64-bit-WebView-processes.patch) <br><nobr>Author: Daniel</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> |64-bit processes introduce 10% or so higher memory consumption.<br>The reason for preferring 64-bit processes is providing substantially better<br>exploit mitigations at the expense of slightly more memory usage.<br>In addition to the standard mitigations, it also enables usage of<br>https://github.com/AndroidHardening/hardened_malloc (where available).<br>It will provide high entropy ASLR (24-bit to 32-bit depending on whether the<br>kernel uses 3 or 4 level page tables rather than 16-bit for 32-bit processes),<br>high entropy stack canaries (56/64-bit instead of 24/32-bit depending on<br>whether a zero byte is used) and also features like pointer authentication and<br>memory tagging when those are made available in the future.<br>The reason why upstream started preferring 32-bit processes is to save memory,<br>particularly since saving memory makes it feasible to use finer-grained<br>sandboxing.|
|**Use BoringSSL for RandBytes** <br><sub><nobr> Wed, 30 Sep 2020 07:40:01 +0000</nobr> <br>File: [Use-BoringSSL-for-RandBytes.patch](/build/patches/Use-BoringSSL-for-RandBytes.patch) <br><nobr>Author: uazo</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-2.0-or-later</nobr> ||
|**Use dummy DFM installer** <br><sub><nobr> Sun, 15 Dec 2019 19:40:37 +0100</nobr> <br>File: [Use-dummy-DFM-installer.patch](/build/patches/Use-dummy-DFM-installer.patch) <br><nobr>Author: csagan5</nobr> <br><nobr>Context: </nobr> <br><nobr>License: GPL-3.0-only</nobr> ||
tools/images/cromite-build/pre-start.sh
+3 -4
View File
@@ -30,7 +30,6 @@ sudo cp $WORKSPACE/goma_auth.py $WORKSPACE/goma/
echo -e ${RED} -------- prepare vpython virtual environment ${NC}
rm -rf /tmp/vpython*
cd $WORKSPACE/chromium/src
vpython -vpython-spec .vpython -vpython-root $VPYTHON_VIRTUALENV_ROOT -vpython-log-level debug -vpython-tool install
vpython3 -vpython-spec .vpython3 -vpython-root $VPYTHON_VIRTUALENV_ROOT -vpython-log-level debug -vpython-tool install
echo -e ${RED} -------- download pgo profiles ${NC}
@@ -66,9 +65,9 @@ CXX=clang++ ./configure.py --bootstrap
echo -e ${RED} -------- download clang indexer ${NC}
cd $WORKSPACE/
wget https://github.com/clangd/clangd/releases/download/snapshot_20211205/clangd_indexing_tools-linux-snapshot_20211205.zip
unzip clangd_indexing_tools-linux-snapshot_20211205.zip
rm clangd_indexing_tools-linux-snapshot_20211205.zip
wget https://github.com/clangd/clangd/releases/download/17.0.3/clangd_indexing_tools-linux-17.0.3.zip
unzip clangd_indexing_tools-linux-17.0.3.zip
rm clangd_indexing_tools-linux-17.0.3.zip
echo -e ${RED} -------- download rc ${NC}
cd $WORKSPACE/chromium/src
tools/images/squid/squid.conf
+1
View File
@@ -7,6 +7,7 @@ acl localnet src 192.168.0.0/16 # RFC 1918 possible internal network
acl SSL_ports port 443
acl Safe_ports port 80
acl Safe_ports port 443
acl Safe_ports port 4723 # appium tcp port
acl CONNECT method CONNECT
acl whitelist dstdomain "/etc/squid/whitelist"
tools/images/squid/whitelist
+8
View File
@@ -28,3 +28,11 @@ chrome-infra-packages.appspot.com
# for pip
.pypi.org
# for appium
registry.npmjs.org
deb.nodesource.com
# for browserstack
api-cloud.browserstack.com
hub-cloud.browserstack.com
tools/under-control/file_list.txt
+1
View File
@@ -12,6 +12,7 @@ third_party/blink/renderer/core/exported/web_view_impl.cc
third_party/blink/renderer/core/css/parser/media_query_parser.cc
third_party/blink/renderer/core/frame/settings.json5
third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
third_party/blink/renderer/platform/runtime_enabled_features.json5
third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom
third_party/blink/public/mojom/webpreferences/web_preferences.mojom
third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
tools/under-control/src/RELEASE
+1 -1
View File
@@ -1 +1 @@
127.0.6533.73
127.0.6533.94
tools/under-control/src/android_webview/browser/aw_field_trials.cc
Executable
+218
View File
@@ -0,0 +1,218 @@
// Copyright 2020 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "android_webview/browser/aw_field_trials.h"
#include "android_webview/common/aw_switches.h"
#include "base/base_paths_android.h"
#include "base/feature_list.h"
#include "base/memory/raw_ref.h"
#include "base/metrics/persistent_histogram_allocator.h"
#include "base/path_service.h"
#include "components/history/core/browser/features.h"
#include "components/metrics/persistent_histograms.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/core/common/features.h"
#include "components/translate/core/common/translate_util.h"
#include "components/viz/common/features.h"
#include "content/public/common/content_features.h"
#include "gpu/config/gpu_finch_features.h"
#include "media/base/media_switches.h"
#include "mojo/public/cpp/bindings/features.h"
#include "net/base/features.h"
#include "services/network/public/cpp/features.h"
#include "third_party/blink/public/common/features.h"
#include "ui/android/ui_android_features.h"
#include "ui/gl/gl_features.h"
namespace {
class AwFeatureOverrides {
public:
explicit AwFeatureOverrides(base::FeatureList& feature_list)
: feature_list_(feature_list) {}
AwFeatureOverrides(const AwFeatureOverrides& other) = delete;
AwFeatureOverrides& operator=(const AwFeatureOverrides& other) = delete;
~AwFeatureOverrides() {
feature_list_->RegisterExtraFeatureOverrides(std::move(overrides_));
}
// Enable a feature with WebView-specific override.
void EnableFeature(const base::Feature& feature) {
overrides_.emplace_back(
std::cref(feature),
base::FeatureList::OverrideState::OVERRIDE_ENABLE_FEATURE);
}
// Disable a feature with WebView-specific override.
void DisableFeature(const base::Feature& feature) {
overrides_.emplace_back(
std::cref(feature),
base::FeatureList::OverrideState::OVERRIDE_DISABLE_FEATURE);
}
private:
base::raw_ref<base::FeatureList> feature_list_;
std::vector<base::FeatureList::FeatureOverrideInfo> overrides_;
};
} // namespace
void AwFieldTrials::OnVariationsSetupComplete() {
// Persistent histograms must be enabled ASAP, but depends on Features.
base::FilePath metrics_dir;
if (base::PathService::Get(base::DIR_ANDROID_APP_DATA, &metrics_dir)) {
InstantiatePersistentHistogramsWithFeaturesAndCleanup(metrics_dir);
} else {
NOTREACHED_IN_MIGRATION();
}
}
// TODO(crbug.com/40271903): Consider to migrate all WebView feature overrides
// from the AwMainDelegate to the new mechanism here.
void AwFieldTrials::RegisterFeatureOverrides(base::FeatureList* feature_list) {
if (!feature_list) {
return;
}
AwFeatureOverrides aw_feature_overrides(*feature_list);
// Disable third-party storage partitioning on WebView.
aw_feature_overrides.DisableFeature(
net::features::kThirdPartyStoragePartitioning);
if (!base::FeatureList::IsEnabled(
mojo::features::kMojoFixAssociatedHandleLeak)) {
// Disable support for partitioning blob URLs if the bug fix that prevents
// blob URL creation from hanging under certain conditions isn't enabled.
aw_feature_overrides.DisableFeature(
net::features::kSupportPartitionedBlobUrl);
}
// Disable the passthrough on WebView.
aw_feature_overrides.DisableFeature(
::features::kDefaultPassthroughCommandDecoder);
// HDR does not support webview yet. See crbug.com/1493153 for an explanation.
aw_feature_overrides.DisableFeature(ui::kAndroidHDR);
// Disable Reducing User Agent minor version on WebView.
aw_feature_overrides.DisableFeature(
blink::features::kReduceUserAgentMinorVersion);
// Disable fenced frames on WebView.
aw_feature_overrides.DisableFeature(blink::features::kFencedFrames);
// Disable low latency overlay for WebView. There is currently no plan to
// enable these optimizations in WebView though they are not fundamentally
// impossible.
aw_feature_overrides.DisableFeature(
blink::features::kLowLatencyCanvas2dImageChromium);
aw_feature_overrides.DisableFeature(
blink::features::kLowLatencyWebGLImageChromium);
// Disable Shared Storage on WebView.
aw_feature_overrides.DisableFeature(blink::features::kSharedStorageAPI);
aw_feature_overrides.DisableFeature(blink::features::kSharedStorageAPIM125);
// Disable scrollbar-color on WebView.
aw_feature_overrides.DisableFeature(blink::features::kScrollbarColor);
// Disable scrollbar-width on WebView.
aw_feature_overrides.DisableFeature(blink::features::kScrollbarWidth);
// Disable Populating the VisitedLinkDatabase on WebView.
aw_feature_overrides.DisableFeature(history::kPopulateVisitedLinkDatabase);
// WebView uses kWebViewVulkan to control vulkan. Pre-emptively disable
// kVulkan in case it becomes enabled by default.
aw_feature_overrides.DisableFeature(::features::kVulkan);
aw_feature_overrides.DisableFeature(::features::kWebPayments);
aw_feature_overrides.DisableFeature(::features::kServiceWorkerPaymentApps);
// WebView does not support overlay fullscreen yet for video overlays.
aw_feature_overrides.DisableFeature(media::kOverlayFullscreenVideo);
// WebView does not support EME persistent license yet, because it's not
// clear on how user can remove persistent media licenses from UI.
aw_feature_overrides.DisableFeature(media::kMediaDrmPersistentLicense);
aw_feature_overrides.DisableFeature(::features::kBackgroundFetch);
// SurfaceControl is controlled by kWebViewSurfaceControl flag.
aw_feature_overrides.DisableFeature(::features::kAndroidSurfaceControl);
// TODO(crbug.com/40627649): WebOTP is not yet supported on
// WebView.
aw_feature_overrides.DisableFeature(::features::kWebOTP);
// TODO(crbug.com/40652382): WebXR is not yet supported on WebView.
aw_feature_overrides.DisableFeature(::features::kWebXr);
// TODO(crbug.com/40831925): Digital Goods API is not yet supported
// on WebView.
aw_feature_overrides.DisableFeature(::features::kDigitalGoodsApi);
aw_feature_overrides.DisableFeature(::features::kDynamicColorGamut);
// COOP is not supported on WebView yet. See:
// https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/XBKAGb2_7uAi.
aw_feature_overrides.DisableFeature(
network::features::kCrossOriginOpenerPolicy);
aw_feature_overrides.DisableFeature(::features::kInstalledApp);
aw_feature_overrides.DisableFeature(::features::kPeriodicBackgroundSync);
// Disabled until viz scheduling can be improved.
aw_feature_overrides.DisableFeature(
::features::kUseSurfaceLayerForVideoDefault);
// Disable dr-dc on webview.
aw_feature_overrides.DisableFeature(::features::kEnableDrDc);
// TODO(crbug.com/40703318): Web Bluetooth is not yet supported on WebView.
aw_feature_overrides.DisableFeature(::features::kWebBluetooth);
// TODO(crbug.com/41441927): WebUSB is not yet supported on WebView.
aw_feature_overrides.DisableFeature(::features::kWebUsb);
// Disable TFLite based language detection on webview until webview supports
// ML model delivery via Optimization Guide component.
// TODO(crbug.com/40819484): Enable the feature on Webview.
aw_feature_overrides.DisableFeature(
::translate::kTFLiteLanguageDetectionEnabled);
// Disable key pinning enforcement on webview.
aw_feature_overrides.DisableFeature(
net::features::kStaticKeyPinningEnforcement);
// FedCM is not yet supported on WebView.
aw_feature_overrides.DisableFeature(::features::kFedCm);
// TODO(crbug.com/40272633): Web MIDI permission prompt for all usage.
aw_feature_overrides.DisableFeature(blink::features::kBlockMidiByDefault);
// Disable device posture API as the framework implementation causes
// AwContents to leak in apps that don't call destroy().
aw_feature_overrides.DisableFeature(blink::features::kDevicePosture);
aw_feature_overrides.DisableFeature(blink::features::kViewportSegments);
// New Safe Browsing API is still being rolled out on WebView.
aw_feature_overrides.DisableFeature(
safe_browsing::kSafeBrowsingNewGmsApiForBrowseUrlDatabaseCheck);
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDebugBlindauth)) {
aw_feature_overrides.EnableFeature(net::features::kEnableIpProtectionProxy);
aw_feature_overrides.EnableFeature(network::features::kMaskedDomainList);
}
// Delete Incidental Party State (DIPS) feature is not yet supported on
// WebView.
// TODO(b/344852824): Enable the feature for WebView
aw_feature_overrides.DisableFeature(::features::kDIPS);
}
tools/under-control/src/testing/variations/fieldtrial_testing_config.json
-21
View File
@@ -21872,27 +21872,6 @@
]
}
],
"TopLevelOriginTrialForThirdPartyCookieDeprecation": [
{
"platforms": [
"android",
"chromeos",
"chromeos_lacros",
"fuchsia",
"linux",
"mac",
"windows"
],
"experiments": [
{
"name": "Enabled",
"enable_features": [
"TopLevelTpcdOriginTrial"
]
}
]
}
],
"TopLevelThirdPartyCookieDeprecationTrialService": [
{
"platforms": [
tools/under-control/src/third_party/blink/renderer/platform/runtime_enabled_features.json5
Vendored Executable
+4719
View File
File diff suppressed because it is too large Load Diff
tools/under-control/src/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
Vendored Executable
+12050
View File
File diff suppressed because it is too large Load Diff