0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 93ce1fd149 into 6f40f8341a

Browse source
This commit is contained in:
Chirayu Desai 2023-01-27 15:43:54 -10:00 • committed by GitHub
commit 2db1cfa000
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
build/patches/Override-Navigator-Language.patch
View file

@ -9,9 +9,8 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../browser/language/AppLocaleUtils.java | 20 +++++++++++++++++++
.../AppLanguagePreferenceDelegate.java | 8 ++++++++
.../renderer_host/render_process_host_impl.cc | 6 +++++-
3 files changed, 33 insertions(+), 1 deletion(-)
2 files changed, 25 insertions(+), 1 deletion(-)
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
@ -50,24 +49,6 @@ 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
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
@@ -87,6 +87,14 @@ public class AppLanguagePreferenceDelegate {
// Disable preference so a second downloaded cannot be started while one is in progress.
mPreference.setEnabled(false);
+
+ AppLocaleUtils.setAppLanguagePref(code, (success) -> {
+ if (success) {
+ languageSplitDownloadComplete();
+ } else {
+ languageSplitDownloadFailed();
+ }
+ });
}
/**
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
@ -93,4 +74,5 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
// A non-empty RendererCmdPrefix implies that Zygote is disabled.
--
2.25.1
2.39.0

24
build/patches/Remove-binary-blob-integrations.patch
View file

@ -44,7 +44,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/browser/BUILD.gn | 2 -
chrome/browser/language/android/BUILD.gn | 2 -
.../language/AppLanguagePromoDialog.java | 23 -
.../AppLanguagePreferenceDelegate.java | 8 -
.../language/settings/LanguageSettings.java | 6 -
.../prefetch/prefetch_service_factory.cc | 16 -
.../browser/password_manager/android/BUILD.gn | 4 -
@ -110,7 +109,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
third_party/android_deps/BUILD.gn | 539 +-----------------
.../preconditions/javatests/BUILD.gn | 1 -
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
86 files changed, 99 insertions(+), 2060 deletions(-)
85 files changed, 99 insertions(+), 2052 deletions(-)
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@ -1010,24 +1009,6 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
- });
}
/**
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
@@ -87,14 +87,6 @@ public class AppLanguagePreferenceDelegate {
// Disable preference so a second downloaded cannot be started while one is in progress.
mPreference.setEnabled(false);
-
- AppLocaleUtils.setAppLanguagePref(code, (success) -> {
- if (success) {
- languageSplitDownloadComplete();
- } else {
- languageSplitDownloadFailed();
- }
- });
}
/**
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
@ -4318,4 +4299,5 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices
}
}
--
2.25.1
2.39.0