Skip to content

Commit

Permalink
Patches for v130 - only context change
Browse files Browse the repository at this point in the history
  • Loading branch information
uazo committed Oct 15, 2024
1 parent b7f393a commit de68c0d
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions build/patches/Add-setting-to-invert-tap-and-long-tap.patch
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
@@ -136,6 +136,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
mSnackbarManager.showSnackbar(mSnackbar);
@@ -137,6 +137,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
}

+ private static class ShowAlwaysContextMenuOnLinksDelegate implements BooleanPreferenceDelegate {
Expand Down
4 changes: 2 additions & 2 deletions build/patches/Add-support-for-ISupportHelpAndFeedback.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ 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
@@ -51,6 +51,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
@@ -54,6 +54,7 @@ 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;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
import org.chromium.components.browser_ui.settings.SettingsPage;
import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat;
@@ -411,8 +412,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -419,8 +420,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
}
return true;
} else if (item.getItemId() == R.id.menu_id_general_help) {
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Cromite-Branding--improve-settings-ui.patch
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ new file mode 100644
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
@@ -141,7 +141,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -142,7 +142,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
mPageTitle.set(getString(R.string.prefs_privacy_security));

Expand Down
4 changes: 2 additions & 2 deletions build/patches/Disable-speechSynthesis-getVoices-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
--- a/components/content_settings/renderer/content_settings_agent_impl.cc
+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
@@ -448,6 +448,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
@@ -445,6 +445,14 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
cached_script_permissions_.clear();
}

Expand All @@ -58,7 +58,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc
bool ContentSettingsAgentImpl::UpdateOverrides() {
// Evaluate the content setting rules
ContentSetting setting = CONTENT_SETTING_ALLOW;
@@ -458,7 +466,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
@@ -455,7 +463,6 @@ bool ContentSettingsAgentImpl::UpdateOverrides() {
}
return UpdateTimeZoneOverride(
setting, content_setting_rules_->timezone_override_value);
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Keep-disabled-FetchLaterAPI.patch
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ diff --git a/third_party/blink/renderer/platform/loader/child_url_loader_factory
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
--- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
@@ -2917,7 +2917,7 @@ void ResourceFetcher::PrepareForLeakDetection() {
@@ -2925,7 +2925,7 @@ void ResourceFetcher::PrepareForLeakDetection() {
void ResourceFetcher::StopFetchingInternal(StopFetchingTarget target) {
// TODO(toyoshim): May want to suspend scheduler while canceling loaders so
// that the cancellations below do not awake unnecessary scheduling.
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Remove-help-menu-item.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
@@ -380,6 +380,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -388,6 +388,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
help.setIcon(
TraceEventVectorDrawableCompat.create(
getResources(), R.drawable.ic_help_and_feedback, getTheme()));
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Timezone-customization.patch
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc

blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
if (frame->Parent())
@@ -445,4 +448,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
@@ -442,4 +445,78 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
cached_script_permissions_.clear();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
-->

<!-- The main_preferences file will be reordered with the upcoming autofill
@@ -131,6 +134,11 @@ for the previous order (main_preferences_legacy). -->
@@ -136,6 +139,11 @@ for the previous order (main_preferences_legacy). -->
android:key="accessibility"
android:order="24"
android:title="@string/prefs_accessibility"/>
Expand Down
2 changes: 1 addition & 1 deletion build/patches/eyeo-beta-118.0.5993.48-extension_api.patch
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ diff --git a/chrome/browser/extensions/api/BUILD.gn b/chrome/browser/extensions/

import("//chrome/common/extensions/api/api_sources.gni")
import("//chrome/common/features.gni")
@@ -107,6 +111,7 @@ function_registration("api_registration") {
@@ -106,6 +110,7 @@ function_registration("api_registration") {
# include generated headers from these targets.
# TODO(brettw) this should be made unnecessary if possible.
"//chrome/common/extensions/api",
Expand Down

0 comments on commit de68c0d

Please sign in to comment.