From cef459eab98c4bb7d7a1ffb05ba008db0e34a95f Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Tue, 16 Feb 2021 22:44:19 +0100 Subject: [PATCH] Release 88.0.4324.185 --- CHANGELOG.md | 6 ++++++ build/RELEASE | 2 +- build/bromite_patches_list.txt | 2 +- .../AImageReader-CFI-crash-mitigations.patch | 4 ++-- build/patches/Add-an-always-incognito-mode.patch | 2 +- build/patches/Bromite-AdBlockUpdaterService.patch | 2 +- .../Disable-autofill-assistant-by-default.patch | 2 +- ...ble-promos-displayed-in-bookmarks-manager.patch | 12 ++++++------ build/patches/Disable-safe-browsing.patch | 2 +- .../Disable-smart-selection-by-default.patch | 2 +- .../Disable-the-DIAL-repeating-discovery.patch | 4 ++-- ...Enable-darken-websites-checkbox-in-themes.patch | 2 +- ...ck.patch => Fix-favicons-fallback-search.patch} | 2 +- ...pendency-on-auth-signin-dynamic-and-tasks.patch | 2 +- ...dependency-on-com.google.android.gms.auth.patch | 2 +- ...dependency-on-com.google.android.gms.cast.patch | 2 +- ...pendency-on-fido-iid-instantapps-location.patch | 2 +- ...Remove-signin-and-data-saver-integrations.patch | 2 +- .../Restore-Search-Ready-Omnibox-flag.patch | 6 +++--- build/patches/Restore-Simplified-NTP-launch.patch | 6 +++--- build/patches/Update-i18n-zh_CN-support.patch | 2 +- build/patches/User-agent-customization.patch | 14 +++++++------- build/patches/kill-GCM.patch | 6 +++--- 23 files changed, 47 insertions(+), 41 deletions(-) rename build/patches/{fix-favicons-fallback.patch => Fix-favicons-fallback-search.patch} (95%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01d92093..b9033562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 88.0.4324.185 +* fix favicons fallback search (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/788) +* fix potential DIAL crash when network state changes (thanks to @Ahrotahn) +* fix crash when opening links in incognito-only mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/899) +* disallow empty custom user agent (thanks to @uazo) + # 88.0.4324.149 * fix proxy PAC URL option not working (fixes https://github.com/bromite/bromite/issues/908) * store proxy configuration in LocalState instead of Profile (thanks to @uazo) diff --git a/build/RELEASE b/build/RELEASE index 990da4bc..28e68994 100644 --- a/build/RELEASE +++ b/build/RELEASE @@ -1 +1 @@ -88.0.4324.149 +88.0.4324.185 diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 30ea7fe0..d19ebf78 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -156,5 +156,5 @@ Revert-flags-remove-num-raster-threads.patch webview-Hard-no-to-persistent-histograms.patch Ignore-managed-state-and-policies-for-secure-DNS.patch Do-not-permit-user-installed-certificates.patch +Fix-favicons-fallback-search.patch Automated-domain-substitution.patch -fix-favicons-fallback.patch diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 923509f9..4ec937ac 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -121,7 +121,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc --- a/gpu/config/gpu_finch_features.cc +++ b/gpu/config/gpu_finch_features.cc -@@ -37,6 +37,11 @@ bool FieldIsInBlocklist(const char* current_value, std::string blocklist_str) { +@@ -38,6 +38,11 @@ bool FieldIsInBlocklist(const char* current_value, std::string blocklist_str) { } // namespace #if defined(OS_ANDROID) @@ -133,7 +133,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc // Used to limit GL version to 2.0 for skia raster on Android. const base::Feature kUseGles2ForOopR{"UseGles2ForOopR", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -49,7 +54,11 @@ const base::Feature kAndroidSurfaceControl{"AndroidSurfaceControl", +@@ -55,7 +60,11 @@ const base::FeatureParam kAndroidSurfaceControlBlocklist{ // Use AImageReader for MediaCodec and MediaPlyer on android. const base::Feature kAImageReader{"AImageReader", diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 59ad6bc9..0879e6f5 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -441,7 +441,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI 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 -@@ -374,7 +374,7 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", +@@ -377,7 +377,7 @@ const base::Feature kCCTExternalLinkHandling{"CCTExternalLinkHandling", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kCCTIncognito{"CCTIncognito", diff --git a/build/patches/Bromite-AdBlockUpdaterService.patch b/build/patches/Bromite-AdBlockUpdaterService.patch index 263d12fb..ef9b57f5 100644 --- a/build/patches/Bromite-AdBlockUpdaterService.patch +++ b/build/patches/Bromite-AdBlockUpdaterService.patch @@ -77,7 +77,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1300,6 +1300,8 @@ chrome_java_sources = [ +@@ -1301,6 +1301,8 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/ui/ShoppingCart.java", "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java", "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java", diff --git a/build/patches/Disable-autofill-assistant-by-default.patch b/build/patches/Disable-autofill-assistant-by-default.patch index 43987fb5..2596e107 100644 --- a/build/patches/Disable-autofill-assistant-by-default.patch +++ b/build/patches/Disable-autofill-assistant-by-default.patch @@ -17,7 +17,7 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro + ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, false); } - /** Checks whether the proactive help switch preference in settings is on. */ + /** Checks whether proactive help is enabled. */ -- 2.17.1 diff --git a/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch b/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch index ed40d6dd..3eca0613 100644 --- a/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch +++ b/build/patches/Disable-promos-displayed-in-bookmarks-manager.patch @@ -79,7 +79,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private String mSearchText; private BookmarkId mCurrentFolder; private ProfileSyncService mProfileSyncService; -@@ -180,9 +178,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -183,9 +181,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter case ViewType.PERSONALIZED_SIGNIN_PROMO: // fall through case ViewType.PERSONALIZED_SYNC_PROMO: @@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm case ViewType.SECTION_HEADER: return createSectionHeaderViewHolder(parent, viewType); case ViewType.FOLDER: -@@ -202,11 +200,7 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -205,11 +203,7 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter @Override public void onBindViewHolder(ViewHolder holder, int position) { if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO) { @@ -103,7 +103,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm } else if (holder.getItemViewType() == ViewType.SECTION_HEADER) { bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position)); } else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) { -@@ -254,7 +248,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -257,7 +251,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter case ViewType.PERSONALIZED_SIGNIN_PROMO: // fall through case ViewType.PERSONALIZED_SYNC_PROMO: @@ -111,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm break; default: // Other view holders don't have special recycling code. -@@ -280,7 +273,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -283,7 +276,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter updateHeader(!topLevelFoldersShowing()); }; @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm populateTopLevelFoldersList(); mElements = new ArrayList<>(); -@@ -295,7 +287,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -298,7 +290,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter mDelegate.getModel().removeObserver(mBookmarkModelObserver); mDelegate.getSelectionDelegate().removeObserver(this); mDelegate = null; @@ -127,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm mProfileSyncService.removeSyncStateChangedListener(this); } -@@ -418,23 +409,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter +@@ -421,23 +412,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter return; } else if (currentUIState == BookmarkUIState.STATE_SEARCHING) { mPromoHeaderType = ViewType.INVALID; diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index 2ded4e08..600585ea 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -502,7 +502,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn "download/download_dir_policy_handler.cc", "download/download_dir_policy_handler.h", "download/download_dir_util.cc", -@@ -6617,8 +6596,6 @@ static_library("test_support") { +@@ -6619,8 +6598,6 @@ static_library("test_support") { "//components/policy/core/browser:test_support", "//components/policy/proto:reporting_record_proto", "//components/prefs:test_support", diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index 9ebe6c8f..2520cd77 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -15,7 +15,7 @@ leak information through the TextClassifier set by OEM, if any 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 -@@ -476,7 +476,7 @@ const base::Feature kDownloadProgressInfoBar{"DownloadProgressInfoBar", +@@ -479,7 +479,7 @@ const base::Feature kDownloadProgressInfoBar{"DownloadProgressInfoBar", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kDownloadFileProvider{"DownloadFileProvider", diff --git a/build/patches/Disable-the-DIAL-repeating-discovery.patch b/build/patches/Disable-the-DIAL-repeating-discovery.patch index 1e3c67b2..4fa94c0a 100644 --- a/build/patches/Disable-the-DIAL-repeating-discovery.patch +++ b/build/patches/Disable-the-DIAL-repeating-discovery.patch @@ -4,7 +4,7 @@ Subject: Disable the DIAL repeating discovery This causes unnecessary SSDP network spam --- - chrome/browser/media/router/discovery/dial/dial_registry.cc | 6 ---- + chrome/browser/media/router/discovery/dial/dial_registry.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrome/browser/media/router/discovery/dial/dial_registry.cc @@ -21,7 +21,7 @@ diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrom } void DialRegistry::DoDiscovery() { -@@ -209,8 +205,6 @@ void DialRegistry::StopPeriodicDiscovery +@@ -209,8 +205,6 @@ void DialRegistry::StopPeriodicDiscovery() { if (!dial_) return; diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index 844571ca..54704bc4 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -23,7 +23,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 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 -@@ -464,7 +464,7 @@ const base::Feature kContextualSearchTranslations{ +@@ -467,7 +467,7 @@ const base::Feature kContextualSearchTranslations{ "ContextualSearchTranslations", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kDarkenWebsitesCheckboxInThemesSetting{ diff --git a/build/patches/fix-favicons-fallback.patch b/build/patches/Fix-favicons-fallback-search.patch similarity index 95% rename from build/patches/fix-favicons-fallback.patch rename to build/patches/Fix-favicons-fallback-search.patch index 6c602489..559f48e5 100644 --- a/build/patches/fix-favicons-fallback.patch +++ b/build/patches/Fix-favicons-fallback-search.patch @@ -1,6 +1,6 @@ From: uazo Date: Sat, 13 Feb 2021 10:34:06 +0000 -Subject: Fix favicons search for fallback +Subject: Fix favicons fallback search --- components/favicon/core/favicon_database.cc | 4 +++- diff --git a/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch b/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch index e3c1e5e9..04566433 100644 --- a/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch +++ b/build/patches/Remove-dependency-on-auth-signin-dynamic-and-tasks.patch @@ -624,7 +624,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -2608,9 +2608,6 @@ if (is_android) { +@@ -2609,9 +2609,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch b/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch index 32092002..3dc7e1a3 100644 --- a/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch +++ b/build/patches/Remove-dependency-on-com.google.android.gms.auth.patch @@ -92,7 +92,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -2608,7 +2608,6 @@ if (is_android) { +@@ -2609,7 +2609,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ diff --git a/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch b/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch index 43e51a70..9fe33203 100644 --- a/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch +++ b/build/patches/Remove-dependency-on-com.google.android.gms.cast.patch @@ -92,7 +92,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% endif %} diff --git a/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch b/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch index 0806f071..1dbaf686 100644 --- a/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch +++ b/build/patches/Remove-dependency-on-fido-iid-instantapps-location.patch @@ -50,7 +50,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1684,9 +1684,6 @@ chrome_java_sources = [ +@@ -1685,9 +1685,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewDelegate.java", "java/src/org/chromium/chrome/browser/webauth/AuthenticatorFactory.java", "java/src/org/chromium/chrome/browser/webauth/AuthenticatorImpl.java", diff --git a/build/patches/Remove-signin-and-data-saver-integrations.patch b/build/patches/Remove-signin-and-data-saver-integrations.patch index ec7fcb89..07b07010 100644 --- a/build/patches/Remove-signin-and-data-saver-integrations.patch +++ b/build/patches/Remove-signin-and-data-saver-integrations.patch @@ -83,7 +83,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} {% endblock %} -@@ -908,16 +900,6 @@ by a child template that "extends" this file. +@@ -898,16 +890,6 @@ by a child template that "extends" this file. android:resource="@xml/file_paths" /> diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index c54b3115..4c8f5024 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -110,7 +110,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -194,6 +194,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -197,6 +197,7 @@ const base::Feature* kFeaturesExposedToJava[] = { &kReachedCodeProfiler, &kReaderModeInCCT, &kReengagementNotification, @@ -118,7 +118,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kRelatedSearches, &kSearchEnginePromoExistingDevice, &kSearchEnginePromoNewDevice, -@@ -576,6 +577,9 @@ const base::Feature kReengagementNotification{ +@@ -579,6 +580,9 @@ const base::Feature kReengagementNotification{ const base::Feature kRelatedSearches{"RelatedSearches", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -142,7 +142,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -342,6 +342,7 @@ public abstract class ChromeFeatureList { +@@ -347,6 +347,7 @@ public abstract class ChromeFeatureList { public static final String OMNIBOX_ADAPTIVE_SUGGESTIONS_COUNT = "OmniboxAdaptiveSuggestionsCount"; public static final String OMNIBOX_ASSISTANT_VOICE_SEARCH = "OmniboxAssistantVoiceSearch"; diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index ba6d0166..61ebdbb3 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -345,7 +345,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 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 -@@ -186,6 +186,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -189,6 +189,7 @@ const base::Feature* kFeaturesExposedToJava[] = { &kNewPhotoPicker, &kNotificationSuspender, &kOfflineIndicatorV2, @@ -353,7 +353,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &kOmniboxSpareRenderer, &kPayWithGoogleV1, &kPhotoPickerVideoSupport, -@@ -548,6 +549,9 @@ const base::Feature kNotificationSuspender{"NotificationSuspender", +@@ -551,6 +552,9 @@ const base::Feature kNotificationSuspender{"NotificationSuspender", const base::Feature kOfflineIndicatorV2{"OfflineIndicatorV2", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -377,7 +377,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser 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 -@@ -322,6 +322,7 @@ public abstract class ChromeFeatureList { +@@ -327,6 +327,7 @@ public abstract class ChromeFeatureList { public static final String LOOKALIKE_NAVIGATION_URL_SUGGESTIONS_UI = "LookalikeUrlNavigationSuggestionsUI"; public static final String MARK_HTTP_AS = "MarkHttpAs"; diff --git a/build/patches/Update-i18n-zh_CN-support.patch b/build/patches/Update-i18n-zh_CN-support.patch index dabc9cbd..7954e1fe 100644 --- a/build/patches/Update-i18n-zh_CN-support.patch +++ b/build/patches/Update-i18n-zh_CN-support.patch @@ -76,7 +76,7 @@ diff --git a/components/browser_ui/strings/android/translations/browser_ui_strin diff --git a/components/strings/components_strings_zh-CN.xtb b/components/strings/components_strings_zh-CN.xtb --- a/components/strings/components_strings_zh-CN.xtb +++ b/components/strings/components_strings_zh-CN.xtb -@@ -2082,4 +2082,5 @@ +@@ -2083,4 +2083,5 @@ </ul> JIS B1 来自 Google Pay diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 62a00714..2f16b606 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -69,7 +69,7 @@ diff --git a/base/base_switches.h b/base/base_switches.h diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni --- a/chrome/android/chrome_java_resources.gni +++ b/chrome/android/chrome_java_resources.gni -@@ -1072,4 +1072,6 @@ chrome_java_resources = [ +@@ -1071,4 +1071,6 @@ chrome_java_resources = [ "java/res/xml/sync_and_services_preferences.xml", "java/res/xml/theme_preferences.xml", "java/res/xml/tracing_preferences.xml", @@ -79,7 +79,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1289,6 +1289,7 @@ chrome_java_sources = [ +@@ -1290,6 +1290,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java", "java/src/org/chromium/chrome/browser/payments/ui/LineItem.java", "java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java", @@ -254,7 +254,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -73,6 +73,7 @@ import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; +@@ -69,6 +69,7 @@ import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl; import org.chromium.chrome.browser.app.flags.ChromeCachedFlags; import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFactory; import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton; @@ -262,7 +262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem; import org.chromium.chrome.browser.bookmarks.BookmarkModel; -@@ -213,6 +214,13 @@ import org.chromium.ui.modaldialog.ModalDialogManager; +@@ -206,6 +207,13 @@ import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.widget.Toast; import org.chromium.url.Origin; import org.chromium.webapk.lib.client.WebApkNavigationClient; @@ -276,7 +276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv import org.chromium.url.GURL; -@@ -2095,11 +2103,18 @@ public abstract class ChromeActivity +@@ -2074,11 +2082,18 @@ public abstract class ChromeActivity } else if (id == R.id.view_source_id) { currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrlString())); } else if (id == R.id.request_desktop_site_id || id == R.id.request_desktop_site_check_id) { @@ -1081,7 +1081,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -3121,4 +3121,17 @@ const char kIncognitoTabHistoryEnabled[] = +@@ -3124,4 +3124,17 @@ const char kIncognitoTabHistoryEnabled[] = "incognito_tab_history_enabled"; #endif @@ -1102,7 +1102,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -1096,6 +1096,14 @@ extern const char kSecurityTokenSessionNotificationSeconds[]; +@@ -1097,6 +1097,14 @@ extern const char kSecurityTokenSessionNotificationSeconds[]; extern const char kIncognitoTabHistoryEnabled[]; #endif diff --git a/build/patches/kill-GCM.patch b/build/patches/kill-GCM.patch index b920a7fa..d06a3320 100644 --- a/build/patches/kill-GCM.patch +++ b/build/patches/kill-GCM.patch @@ -63,7 +63,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java "java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java", -@@ -1344,10 +1343,6 @@ chrome_java_sources = [ +@@ -1345,10 +1344,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivity.java", "java/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java", "java/src/org/chromium/chrome/browser/services/AndroidChildAccountHelper.java", @@ -101,7 +101,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro {% block extra_uses_permissions %} -@@ -970,36 +965,6 @@ by a child template that "extends" this file. +@@ -960,36 +955,6 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" android:hardwareAccelerated="false" /> @@ -138,7 +138,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -1023,28 +988,10 @@ by a child template that "extends" this file. +@@ -1013,28 +978,10 @@ by a child template that "extends" this file. android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE"/>