diff --git a/build/patches/AImageReader-CFI-crash-mitigations.patch b/build/patches/AImageReader-CFI-crash-mitigations.patch index 3daed2ad7..86c2a6ffe 100644 --- a/build/patches/AImageReader-CFI-crash-mitigations.patch +++ b/build/patches/AImageReader-CFI-crash-mitigations.patch @@ -248,4 +248,3 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ : TextureOwner::Mode::kSurfaceTextureInsecure; } -- -2.25.1 diff --git a/build/patches/Add-AllowUserCertificates-flag.patch b/build/patches/Add-AllowUserCertificates-flag.patch index 5577cb973..90340f251 100644 --- a/build/patches/Add-AllowUserCertificates-flag.patch +++ b/build/patches/Add-AllowUserCertificates-flag.patch @@ -131,4 +131,3 @@ diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/j CertVerifyStatusAndroid.OK, isIssuedByKnownRoot, verifiedChain); } -- -2.25.1 diff --git a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch index de8a43aab..fa2a0be84 100644 --- a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch +++ b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch @@ -20,4 +20,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu KeyboardShortcutGroup webpageShortcutGroup = -- -2.25.1 diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index 3cd9341d8..6bdfae8b5 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -57,4 +57,3 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque // Check whether the app allows cleartext traffic to this host, and return // ERR_CLEARTEXT_NOT_PERMITTED if not. -- -2.25.1 diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index c157dd038..283ddce19 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -1413,4 +1413,3 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp, // &fallback_proxies}, or NULL if there is no proxy to use. -- -2.25.1 diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index ba3845f26..ef0b019d5 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -2201,4 +2201,3 @@ diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc file = base::OpenContentUriForRead(path); } else { -- -2.25.1 diff --git a/build/patches/Add-autoplay-site-setting.patch b/build/patches/Add-autoplay-site-setting.patch index 9bbed8c99..fb3be1be3 100644 --- a/build/patches/Add-autoplay-site-setting.patch +++ b/build/patches/Add-autoplay-site-setting.patch @@ -341,4 +341,3 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.h b/thir bool IsOrWillBeAutoplayingMutedInternal(bool muted) const; -- -2.25.1 diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index f8eb3a591..d1d0f4ce6 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -1848,4 +1848,3 @@ diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/selec if (!owning_window->GetRootWindow()) return false; -- -2.25.1 diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index bba6b8e4c..cc948b9e6 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -229,4 +229,3 @@ new file mode 100644 +SET_CROMITE_FEATURE_DISABLED(kCCTIntentFeatureOverrides); +SET_CROMITE_FEATURE_DISABLED(kCCTPostMessageAPI); -- -2.25.1 diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 28b3dde99..aa7a6acd1 100644 --- a/build/patches/Add-exit-menu-item.patch +++ b/build/patches/Add-exit-menu-item.patch @@ -130,4 +130,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Appearance -- -2.25.1 diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index 02864e8cb..30bbe2cd4 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -135,4 +135,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 3bdc1e9fa..da2a0f9ce 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -71,4 +71,3 @@ new file mode 100644 @@ -0,0 +1 @@ +COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader); -- -2.25.1 diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index 09d957988..6c7edc640 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -124,4 +124,3 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket } -- -2.25.1 diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch index 3d295070c..35bf730c3 100644 --- a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch +++ b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch @@ -37,4 +37,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kResumeBackgroundVideo); -- -2.25.1 diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index f04ada65a..dd80869e8 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -89,4 +89,3 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc ipv6_request_callbacks_.push_back(std::move(callback)); return ERR_IO_PENDING; -- -2.25.1 diff --git a/build/patches/Add-flag-to-disable-external-intent-requests.patch b/build/patches/Add-flag-to-disable-external-intent-requests.patch index 8e37f8c7b..4682e102b 100644 --- a/build/patches/Add-flag-to-disable-external-intent-requests.patch +++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch @@ -30,4 +30,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index e0e044621..91ad5f843 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -116,4 +116,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 name: "OriginIsolationHeader", status: "stable", -- -2.25.1 diff --git a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch index 95b81ae28..22a7a5bb4 100644 --- a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch +++ b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch @@ -40,4 +40,3 @@ diff --git a/build_overrides/build.gni b/build_overrides/build.gni # TODO(crbug.com/1402249): evaluate removing this end of 2023 use_cxx17 = false -- -2.25.1 diff --git a/build/patches/Add-lifetime-options-for-permissions.patch b/build/patches/Add-lifetime-options-for-permissions.patch index 302e18fb0..99c341f06 100644 --- a/build/patches/Add-lifetime-options-for-permissions.patch +++ b/build/patches/Add-lifetime-options-for-permissions.patch @@ -58,9 +58,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../one_time_permissions_tracker_factory.cc | 2 +- .../permissions/embedded_permission_prompt.cc | 2 +- .../permission_prompt_bubble_base_view.cc | 2 +- - .../browser/content_autofill_driver.cc | 64 ++++++++------- - .../content/browser/content_autofill_driver.h | 2 +- - .../autofill/core/browser/autofill_driver.h | 2 + .../site_settings/PermissionInfo.java | 14 +++- .../site_settings/SingleWebsiteSettings.java | 10 +++ .../WebsitePreferenceBridge.java | 6 +- @@ -91,7 +88,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/permissions/permission_request.h | 16 +++- .../permissions/permission_request_manager.cc | 45 ++++++---- .../permissions/permission_request_manager.h | 11 ++- - 39 files changed, 548 insertions(+), 92 deletions(-) + 36 files changed, 511 insertions(+), 61 deletions(-) diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc --- a/chrome/browser/permissions/last_tab_standing_tracker.cc @@ -254,207 +251,6 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_v return; case PermissionDialogButton::kDeny: RecordDecision(permissions::PermissionAction::DENIED); -diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc ---- a/components/autofill/content/browser/content_autofill_driver.cc -+++ b/components/autofill/content/browser/content_autofill_driver.cc -@@ -455,8 +455,8 @@ void ContentAutofillDriver::FormsSeen( - const std::vector& removed_forms) { - target->GetAutofillManager().OnFormsSeen( - WithNewVersion(updated_forms), removed_forms); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnFormsSeen( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnFormsSeen( - WithNewVersion(updated_forms), removed_forms); - } - }); -@@ -486,8 +486,8 @@ void ContentAutofillDriver::FormSubmitted( - } - target->GetAutofillManager().OnFormSubmitted( - WithNewVersion(form), known_success, submission_source); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnFormSubmitted( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnFormSubmitted( - WithNewVersion(form), known_success, submission_source); - } - }); -@@ -511,8 +511,8 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form, - base::TimeTicks timestamp) { - target->GetAutofillManager().OnTextFieldDidChange( - WithNewVersion(form), field, bounding_box, timestamp); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnTextFieldDidChange( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnTextFieldDidChange( - WithNewVersion(form), field, bounding_box, timestamp); - } - }); -@@ -534,8 +534,8 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form, - const FormFieldData& field, const gfx::RectF& bounding_box) { - target->GetAutofillManager().OnTextFieldDidScroll(WithNewVersion(form), - field, bounding_box); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnTextFieldDidScroll( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnTextFieldDidScroll( - WithNewVersion(form), field, bounding_box); - } - }); -@@ -558,8 +558,8 @@ void ContentAutofillDriver::SelectControlDidChange( - const FormFieldData& field, const gfx::RectF& bounding_box) { - target->GetAutofillManager().OnSelectControlDidChange( - WithNewVersion(form), field, bounding_box); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnSelectControlDidChange( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnSelectControlDidChange( - WithNewVersion(form), field, bounding_box); - } - }); -@@ -584,8 +584,8 @@ void ContentAutofillDriver::AskForValuesToFill( - AutofillSuggestionTriggerSource trigger_source) { - target->GetAutofillManager().OnAskForValuesToFill( - WithNewVersion(form), field, bounding_box, trigger_source); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnAskForValuesToFill( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnAskForValuesToFill( - WithNewVersion(form), field, bounding_box, trigger_source); - } - }); -@@ -599,8 +599,8 @@ void ContentAutofillDriver::HidePopup() { - DCHECK(!target->IsPrerendering()) - << "We should never affect UI while prerendering"; - target->GetAutofillManager().OnHidePopup(); -- if (target->secondary_autofill_manager_) -- target->secondary_autofill_manager_->OnHidePopup(); -+ if (target->secondary_autofill_manager()) -+ target->secondary_autofill_manager()->OnHidePopup(); - }); - } - -@@ -612,8 +612,8 @@ void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) { - this, had_interacted_form, - [](autofill::AutofillDriver* target, bool had_interacted_form) { - target->GetAutofillManager().OnFocusNoLongerOnForm(had_interacted_form); -- if (target->secondary_autofill_manager_) -- target->secondary_autofill_manager_->OnFocusNoLongerOnForm(had_interacted_form); -+ if (target->secondary_autofill_manager()) -+ target->secondary_autofill_manager()->OnFocusNoLongerOnForm(had_interacted_form); - }); - } - -@@ -633,15 +633,15 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form, - const FormFieldData& field, const gfx::RectF& bounding_box) { - target->GetAutofillManager().OnFocusOnFormField(WithNewVersion(form), - field, bounding_box); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnFocusOnFormField( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnFocusOnFormField( - WithNewVersion(form), field, bounding_box); - } - }, - [](autofill::AutofillDriver* target) { - target->GetAutofillManager().OnFocusNoLongerOnForm(true); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnFocusNoLongerOnForm(true); -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnFocusNoLongerOnForm(true); - } - }); - } -@@ -657,8 +657,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form, - base::TimeTicks timestamp) { - target->GetAutofillManager().OnDidFillAutofillFormData( - WithNewVersion(form), timestamp); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnDidFillAutofillFormData( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnDidFillAutofillFormData( - WithNewVersion(form), timestamp); - } - }); -@@ -670,8 +670,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() { - } - router().DidEndTextFieldEditing(this, [](autofill::AutofillDriver* target) { - target->GetAutofillManager().OnDidEndTextFieldEditing(); -- if (target->secondary_autofill_manager_) -- target->secondary_autofill_manager_->OnDidEndTextFieldEditing(); -+ if (target->secondary_autofill_manager()) -+ target->secondary_autofill_manager()->OnDidEndTextFieldEditing(); - }); - } - -@@ -686,8 +686,8 @@ void ContentAutofillDriver::SelectOrSelectListFieldOptionsDidChange( - cast(target) - ->GetAutofillManager() - .OnSelectOrSelectListFieldOptionsDidChange(WithNewVersion(form)); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnSelectOrSelectMenuFieldOptionsDidChange( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnSelectOrSelectListFieldOptionsDidChange( - WithNewVersion(form)); - } - }); -@@ -709,8 +709,8 @@ void ContentAutofillDriver::JavaScriptChangedAutofilledValue( - const FormFieldData& field, const std::u16string& old_value) { - target->GetAutofillManager().OnJavaScriptChangedAutofilledValue( - WithNewVersion(form), field, old_value); -- if (target->secondary_autofill_manager_) { -- target->secondary_autofill_manager_->OnJavaScriptChangedAutofilledValue( -+ if (target->secondary_autofill_manager()) { -+ target->secondary_autofill_manager()->OnJavaScriptChangedAutofilledValue( - WithNewVersion(form), field, old_value); - } - }); -@@ -725,8 +725,8 @@ void ContentAutofillDriver::OnContextMenuShownInField( - const FieldGlobalId& field_global_id) { - target->GetAutofillManager().OnContextMenuShownInField(form_global_id, - field_global_id); -- if (target->secondary_autofill_manager_) -- target->secondary_autofill_manager_->OnContextMenuShownInField(form_global_id, field_global_id); -+ if (target->secondary_autofill_manager()) -+ target->secondary_autofill_manager()->OnContextMenuShownInField(form_global_id, field_global_id); - }); - } - -@@ -751,6 +751,10 @@ ContentAutofillDriver::GetAutofillAgent() { - return autofill_agent_; - } - -+raw_ptr ContentAutofillDriver::secondary_autofill_manager() { -+ return secondary_autofill_manager_.get(); -+} -+ - void ContentAutofillDriver::SetFrameAndFormMetaData( - FormData& form, - FormFieldData* optional_field) const { -diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h ---- a/components/autofill/content/browser/content_autofill_driver.h -+++ b/components/autofill/content/browser/content_autofill_driver.h -@@ -133,7 +133,7 @@ class ContentAutofillDriver : public AutofillDriver, - autofill_manager_ = std::move(autofill_manager); - secondary_autofill_manager_ = std::move(secondary_autofill_manager); - } -- AutofillManager* secondary_autofill_manager() { return secondary_autofill_manager_.get(); } -+ raw_ptr secondary_autofill_manager() override; - - content::RenderFrameHost* render_frame_host() { return &*render_frame_host_; } - const content::RenderFrameHost* render_frame_host() const { -diff --git a/components/autofill/core/browser/autofill_driver.h b/components/autofill/core/browser/autofill_driver.h ---- a/components/autofill/core/browser/autofill_driver.h -+++ b/components/autofill/core/browser/autofill_driver.h -@@ -69,6 +69,8 @@ class AutofillDriver { - // Returns the AutofillManager owned by the AutofillDriver. - virtual AutofillManager& GetAutofillManager() = 0; - -+ virtual raw_ptr secondary_autofill_manager() = 0; -+ - // Returns whether the AutofillDriver instance is associated with an active - // frame in the MPArch sense. - virtual bool IsInActiveFrame() const = 0; diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java @@ -1648,4 +1444,3 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe void CancelledIncludingDuplicates(PermissionRequest* request, bool is_final_decision = true); -- -2.25.1 diff --git a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch index 42a76a66e..2377193ef 100644 --- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch +++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch @@ -746,4 +746,3 @@ diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/compo return sync_pb::BookmarkSpecifics::FOLDER; } -- -2.25.1 diff --git a/build/patches/Add-menu-item-to-view-source.patch b/build/patches/Add-menu-item-to-view-source.patch index 0b0043256..6145def88 100644 --- a/build/patches/Add-menu-item-to-view-source.patch +++ b/build/patches/Add-menu-item-to-view-source.patch @@ -127,4 +127,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro You and Google -- -2.25.1 diff --git a/build/patches/Add-option-to-force-tablet-UI.patch b/build/patches/Add-option-to-force-tablet-UI.patch index 98d4e4082..dd9be165b 100644 --- a/build/patches/Add-option-to-force-tablet-UI.patch +++ b/build/patches/Add-option-to-force-tablet-UI.patch @@ -287,4 +287,3 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui } -- -2.25.1 diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch index b09faf753..2d68ac2bc 100644 --- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch +++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch @@ -119,4 +119,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro LINK -- -2.25.1 diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch index 3eddc9276..aea46321f 100644 --- a/build/patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch @@ -260,4 +260,3 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h // The old key value is kept to avoid unnecessary migration code. inline constexpr char kSpeechRecognitionFilterProfanities[] = -- -2.25.1 diff --git a/build/patches/Add-search-engine.patch b/build/patches/Add-search-engine.patch index 77bfe6f7a..f3562c93b 100644 --- a/build/patches/Add-search-engine.patch +++ b/build/patches/Add-search-engine.patch @@ -94,4 +94,3 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon } -- -2.25.1 diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch index 5e92669fc..667d1b171 100644 --- a/build/patches/Add-site-engagement-flag.patch +++ b/build/patches/Add-site-engagement-flag.patch @@ -205,4 +205,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch index ec71bec13..56f129f95 100644 --- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch +++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch @@ -48,4 +48,3 @@ diff --git a/components/browser_ui/settings/android/java/src/org/chromium/compon + } } -- -2.25.1 diff --git a/build/patches/Add-support-for-writing-URIs.patch b/build/patches/Add-support-for-writing-URIs.patch index eaa5f6ec7..4b3ba99fd 100644 --- a/build/patches/Add-support-for-writing-URIs.patch +++ b/build/patches/Add-support-for-writing-URIs.patch @@ -97,4 +97,3 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base * Check whether a content URI exists. * -- -2.25.1 diff --git a/build/patches/Add-webGL-site-setting.patch b/build/patches/Add-webGL-site-setting.patch index 811d2711b..db26b62d7 100644 --- a/build/patches/Add-webGL-site-setting.patch +++ b/build/patches/Add-webGL-site-setting.patch @@ -284,4 +284,3 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba private: -- -2.25.1 diff --git a/build/patches/Add-webRTC-site-settings.patch b/build/patches/Add-webRTC-site-settings.patch index 7159c218b..b1dd0017e 100644 --- a/build/patches/Add-webRTC-site-settings.patch +++ b/build/patches/Add-webRTC-site-settings.patch @@ -262,4 +262,3 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc capabilities->setCodecs(HeapVector>()); capabilities->setHeaderExtensions( -- -2.25.1 diff --git a/build/patches/Allow-building-without-enable_reporting.patch b/build/patches/Allow-building-without-enable_reporting.patch index bafe7e315..3f8470996 100644 --- a/build/patches/Allow-building-without-enable_reporting.patch +++ b/build/patches/Allow-building-without-enable_reporting.patch @@ -508,4 +508,3 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_observer.cc b/third bool ReportingObserver::Buffered() { -- -2.25.1 diff --git a/build/patches/Allow-building-without-supervised-users.patch b/build/patches/Allow-building-without-supervised-users.patch index 0d8589d2d..31b443a69 100644 --- a/build/patches/Allow-building-without-supervised-users.patch +++ b/build/patches/Allow-building-without-supervised-users.patch @@ -291,4 +291,3 @@ diff --git a/components/supervised_user/core/common/supervised_user_utils.cc b/c bool EmitLogSegmentHistogram(const std::vector& primary_accounts) { -- -2.25.1 diff --git a/build/patches/Allow-playing-audio-in-background.patch b/build/patches/Allow-playing-audio-in-background.patch index 9f4b3d315..f1987a08d 100644 --- a/build/patches/Allow-playing-audio-in-background.patch +++ b/build/patches/Allow-playing-audio-in-background.patch @@ -50,4 +50,3 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b const WebVector& enabledTrackIds) override; void SelectedVideoTrackChanged( -- -2.25.1 diff --git a/build/patches/Always-use-new-tab-page-for-default-home-page.patch b/build/patches/Always-use-new-tab-page-for-default-home-page.patch index 982b33678..11eaf6546 100644 --- a/build/patches/Always-use-new-tab-page-for-default-home-page.patch +++ b/build/patches/Always-use-new-tab-page-for-default-home-page.patch @@ -70,4 +70,3 @@ new file mode 100755 +SET_CROMITE_FEATURE_DISABLED(kNewTabSearchEngineUrlAndroid); +SET_CROMITE_FEATURE_DISABLED(kPartnerCustomizationsUma); -- -2.25.1 diff --git a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch index c8677db76..67cf3c401 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch @@ -204,4 +204,3 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/ } } -- -2.25.1 diff --git a/build/patches/Battery-API-return-nothing.patch b/build/patches/Battery-API-return-nothing.patch index 0aac3bc2b..4e54e96aa 100644 --- a/build/patches/Battery-API-return-nothing.patch +++ b/build/patches/Battery-API-return-nothing.patch @@ -64,4 +64,3 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi void BatteryManager::RegisterWithDispatcher() { -- -2.25.1 diff --git a/build/patches/Block-gateway-attacks-via-websockets.patch b/build/patches/Block-gateway-attacks-via-websockets.patch index 29d534450..907162294 100644 --- a/build/patches/Block-gateway-attacks-via-websockets.patch +++ b/build/patches/Block-gateway-attacks-via-websockets.patch @@ -302,4 +302,3 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.h b/ // Returns true if |protocol| is a valid WebSocket subprotocol name. -- -2.25.1 diff --git a/build/patches/Block-qjz9zk-or-trk-requests.patch b/build/patches/Block-qjz9zk-or-trk-requests.patch index 9d2166cf2..4e38f1320 100644 --- a/build/patches/Block-qjz9zk-or-trk-requests.patch +++ b/build/patches/Block-qjz9zk-or-trk-requests.patch @@ -287,4 +287,3 @@ diff --git a/url/url_util.cc b/url/url_util.cc // Schemes that can be sent CORS requests. -- -2.25.1 diff --git a/build/patches/Bookmarks-select-all-menu-entry.patch b/build/patches/Bookmarks-select-all-menu-entry.patch index 8bbf8a336..a2248c179 100644 --- a/build/patches/Bookmarks-select-all-menu-entry.patch +++ b/build/patches/Bookmarks-select-all-menu-entry.patch @@ -104,4 +104,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Import -- -2.25.1 diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index 34582bbef..926a22ef9 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -1623,4 +1623,3 @@ new file mode 100644 @@ -0,0 +1 @@ +BASE_DECLARE_FEATURE(kInlineUpdateFlow); -- -2.25.1 diff --git a/build/patches/Bromite-package-name.patch b/build/patches/Bromite-package-name.patch index 0c339f28b..139e2d540 100644 --- a/build/patches/Bromite-package-name.patch +++ b/build/patches/Bromite-package-name.patch @@ -20,4 +20,3 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_p chrome_public_manifest_package += ".stable" } else if (android_channel != "default" && android_channel != "stable") { -- -2.25.1 diff --git a/build/patches/Bromite-subresource-adblocker.patch b/build/patches/Bromite-subresource-adblocker.patch index 6553f5ec9..6f4f31976 100644 --- a/build/patches/Bromite-subresource-adblocker.patch +++ b/build/patches/Bromite-subresource-adblocker.patch @@ -1999,4 +1999,3 @@ new file mode 100644 +SET_CROMITE_FEATURE_DISABLED(kAutomaticLazyFrameLoadingToEmbeds); +SET_CROMITE_FEATURE_DISABLED(kAutomaticLazyFrameLoadingToEmbedUrls); -- -2.25.1 diff --git a/build/patches/Client-hints-overrides.patch b/build/patches/Client-hints-overrides.patch index eb1e8f836..305420c40 100644 --- a/build/patches/Client-hints-overrides.patch +++ b/build/patches/Client-hints-overrides.patch @@ -151,4 +151,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 { // https://chromestatus.com/feature/5132477781245952 -- -2.25.1 diff --git a/build/patches/Content-settings-infrastructure.patch b/build/patches/Content-settings-infrastructure.patch index 8ba9a89bf..3d018e675 100644 --- a/build/patches/Content-settings-infrastructure.patch +++ b/build/patches/Content-settings-infrastructure.patch @@ -2392,4 +2392,3 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context enum ReasonForCallingCanExecuteScripts { kAboutToExecuteScript, -- -2.25.1 diff --git a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch index 29d16b58c..7a60a7690 100644 --- a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch +++ b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch @@ -95,4 +95,3 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow @Override -- -2.25.1 diff --git a/build/patches/Disable-Accessibility-service-by-default.patch b/build/patches/Disable-Accessibility-service-by-default.patch index ff0272295..1d1c10d7a 100644 --- a/build/patches/Disable-Accessibility-service-by-default.patch +++ b/build/patches/Disable-Accessibility-service-by-default.patch @@ -55,4 +55,3 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/access final ViewStructure viewRoot = structure.asyncNewChild(0); viewRoot.setClassName(""); -- -2.25.1 diff --git a/build/patches/Disable-AsyncDNS-by-default.patch b/build/patches/Disable-AsyncDNS-by-default.patch index 8a4455e7b..1fa632332 100644 --- a/build/patches/Disable-AsyncDNS-by-default.patch +++ b/build/patches/Disable-AsyncDNS-by-default.patch @@ -18,4 +18,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kAsyncDns); -- -2.25.1 diff --git a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch index 0725132e6..c08b4a6e7 100644 --- a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch +++ b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch @@ -19,4 +19,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Disable-FLoC-and-privacy-sandbox.patch b/build/patches/Disable-FLoC-and-privacy-sandbox.patch index 273e1387c..7bff8650e 100644 --- a/build/patches/Disable-FLoC-and-privacy-sandbox.patch +++ b/build/patches/Disable-FLoC-and-privacy-sandbox.patch @@ -220,4 +220,3 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo // allows to query whether the site associated with the |url| is allowed to // access Site data (aka ContentSettingsType::COOKIES) without considering any -- -2.25.1 diff --git a/build/patches/Disable-NTP-remote-suggestions-by-default.patch b/build/patches/Disable-NTP-remote-suggestions-by-default.patch index b5bfbdb15..7b5fc2b60 100644 --- a/build/patches/Disable-NTP-remote-suggestions-by-default.patch +++ b/build/patches/Disable-NTP-remote-suggestions-by-default.patch @@ -22,4 +22,3 @@ diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/c } -- -2.25.1 diff --git a/build/patches/Disable-PrivacyGuide.patch b/build/patches/Disable-PrivacyGuide.patch index bd37adaf6..61cf841d6 100644 --- a/build/patches/Disable-PrivacyGuide.patch +++ b/build/patches/Disable-PrivacyGuide.patch @@ -37,4 +37,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Disable-StartSurface-feature.patch b/build/patches/Disable-StartSurface-feature.patch index a52441539..f9a35d5af 100644 --- a/build/patches/Disable-StartSurface-feature.patch +++ b/build/patches/Disable-StartSurface-feature.patch @@ -30,4 +30,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kStartSurfaceAndroid); -- -2.25.1 diff --git a/build/patches/Disable-TLS-resumption.patch b/build/patches/Disable-TLS-resumption.patch index 7ce1f498a..8ab79fc0d 100644 --- a/build/patches/Disable-TLS-resumption.patch +++ b/build/patches/Disable-TLS-resumption.patch @@ -250,4 +250,3 @@ diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_ void DoReadCallback(int result); void DoWriteCallback(int result); -- -2.25.1 diff --git a/build/patches/Disable-UA-full-version.patch b/build/patches/Disable-UA-full-version.patch index 39d59e366..7eb11dd28 100644 --- a/build/patches/Disable-UA-full-version.patch +++ b/build/patches/Disable-UA-full-version.patch @@ -58,4 +58,3 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_ void NavigatorUAData::SetBitness(const String& bitness) { -- -2.25.1 diff --git a/build/patches/Disable-add-to-home-screen-prompt.patch b/build/patches/Disable-add-to-home-screen-prompt.patch index 2de50ccab..70042dd70 100644 --- a/build/patches/Disable-add-to-home-screen-prompt.patch +++ b/build/patches/Disable-add-to-home-screen-prompt.patch @@ -24,4 +24,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHo } mLastClickedMostVisitedTileUrl = null; -- -2.25.1 diff --git a/build/patches/Disable-all-predictors-code.patch b/build/patches/Disable-all-predictors-code.patch index 9a959e6e4..1d49a57bc 100644 --- a/build/patches/Disable-all-predictors-code.patch +++ b/build/patches/Disable-all-predictors-code.patch @@ -506,4 +506,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 { name: "Presentation", -- -2.25.1 diff --git a/build/patches/Disable-all-promo-dialogs.patch b/build/patches/Disable-all-promo-dialogs.patch index 5e10a0ff4..186613a56 100644 --- a/build/patches/Disable-all-promo-dialogs.patch +++ b/build/patches/Disable-all-promo-dialogs.patch @@ -88,4 +88,3 @@ new file mode 100755 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kChromeLabs); -- -2.25.1 diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index 4cc41c99c..35d398a32 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -781,4 +781,3 @@ diff --git a/ui/events/android/motion_event_android.cc b/ui/events/android/motio } -- -2.25.1 diff --git a/build/patches/Disable-crash-reporting.patch b/build/patches/Disable-crash-reporting.patch index e8d9f7bbd..fa5ef5917 100644 --- a/build/patches/Disable-crash-reporting.patch +++ b/build/patches/Disable-crash-reporting.patch @@ -26,4 +26,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kCrashReporting); -- -2.25.1 diff --git a/build/patches/Disable-feeds-support-by-default.patch b/build/patches/Disable-feeds-support-by-default.patch index df7e266ee..ba2ff9710 100644 --- a/build/patches/Disable-feeds-support-by-default.patch +++ b/build/patches/Disable-feeds-support-by-default.patch @@ -72,4 +72,3 @@ diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature +SET_CROMITE_FEATURE_DISABLED(kWebFeed); } // namespace feed -- -2.25.1 diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index 30e5cc204..899b131bd 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -409,4 +409,3 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p } -- -2.25.1 diff --git a/build/patches/Disable-idle-detection.patch b/build/patches/Disable-idle-detection.patch index 41b037fdb..acad45f7b 100644 --- a/build/patches/Disable-idle-detection.patch +++ b/build/patches/Disable-idle-detection.patch @@ -68,4 +68,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 name: "ImplicitRootScroller", public: true, -- -2.25.1 diff --git a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch index 7fa1133a6..844bdf60b 100644 --- a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch +++ b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch @@ -22,4 +22,3 @@ diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/ // Feature used to default typed navigations to use HTTPS instead of HTTP. // This only applies to navigations that don't have a scheme such as -- -2.25.1 diff --git a/build/patches/Disable-media-router-and-remoting-by-default.patch b/build/patches/Disable-media-router-and-remoting-by-default.patch index be3460bb1..ca42dd5ea 100644 --- a/build/patches/Disable-media-router-and-remoting-by-default.patch +++ b/build/patches/Disable-media-router-and-remoting-by-default.patch @@ -98,4 +98,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 { name: "RemoveDanglingMarkupInTarget", -- -2.25.1 diff --git a/build/patches/Disable-minidump-upload-scheduling.patch b/build/patches/Disable-minidump-upload-scheduling.patch index fbe27b9b6..474f477d8 100644 --- a/build/patches/Disable-minidump-upload-scheduling.patch +++ b/build/patches/Disable-minidump-upload-scheduling.patch @@ -36,4 +36,3 @@ diff --git a/components/minidump_uploader/android/java/src/org/chromium/componen (JobScheduler) ContextUtils.getApplicationContext() -- -2.25.1 diff --git a/build/patches/Disable-offline-pages-in-CCT.patch b/build/patches/Disable-offline-pages-in-CCT.patch index 9d361f5e8..cc53099c4 100644 --- a/build/patches/Disable-offline-pages-in-CCT.patch +++ b/build/patches/Disable-offline-pages-in-CCT.patch @@ -15,4 +15,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kOfflinePagesInDownloadHomeOpenInCctFeature); -- -2.25.1 diff --git a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch index cb573f7e1..e6f26b606 100644 --- a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch +++ b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch @@ -54,4 +54,3 @@ new file mode 100755 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kAndroidVisibleUrlTruncation); -- -2.25.1 diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch index ea4f90c38..c2bdfe42c 100644 --- a/build/patches/Disable-plugins-enumeration.patch +++ b/build/patches/Disable-plugins-enumeration.patch @@ -21,4 +21,3 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ void LocalFrame::SetAdTrackerForTesting(AdTracker* ad_tracker) { -- -2.25.1 diff --git a/build/patches/Disable-references-to-fonts.googleapis.com.patch b/build/patches/Disable-references-to-fonts.googleapis.com.patch index 0383cfec9..6012bb56d 100644 --- a/build/patches/Disable-references-to-fonts.googleapis.com.patch +++ b/build/patches/Disable-references-to-fonts.googleapis.com.patch @@ -60,4 +60,3 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th body, table, -- -2.25.1 diff --git a/build/patches/Disable-requests-for-single-word-Omnibar-searches.patch b/build/patches/Disable-requests-for-single-word-Omnibar-searches.patch index 3ebc23383..2ed5b3692 100644 --- a/build/patches/Disable-requests-for-single-word-Omnibar-searches.patch +++ b/build/patches/Disable-requests-for-single-word-Omnibar-searches.patch @@ -43,4 +43,3 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/c ChromeOmniboxNavigationObserver::~ChromeOmniboxNavigationObserver() { -- -2.25.1 diff --git a/build/patches/Disable-safety-check.patch b/build/patches/Disable-safety-check.patch index 329a4382b..91a4266e1 100644 --- a/build/patches/Disable-safety-check.patch +++ b/build/patches/Disable-safety-check.patch @@ -144,4 +144,3 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow delegate.openSettingsPage(SettingsFragment.SITE); break; -- -2.25.1 diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch index c28e21b36..4107a4d3e 100644 --- a/build/patches/Disable-smart-selection-by-default.patch +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -89,4 +89,3 @@ new file mode 100644 @@ -0,0 +1 @@ +BASE_DECLARE_FEATURE(kChromeSmartSelection); -- -2.25.1 diff --git a/build/patches/Disable-some-signed-exchange-features.patch b/build/patches/Disable-some-signed-exchange-features.patch index c72e3a22e..e09ef6d4d 100644 --- a/build/patches/Disable-some-signed-exchange-features.patch +++ b/build/patches/Disable-some-signed-exchange-features.patch @@ -23,4 +23,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kSignedHTTPExchange); -- -2.25.1 diff --git a/build/patches/Disable-support-for-RAR-files-inspection.patch b/build/patches/Disable-support-for-RAR-files-inspection.patch index a1745ad4b..3fea92122 100644 --- a/build/patches/Disable-support-for-RAR-files-inspection.patch +++ b/build/patches/Disable-support-for-RAR-files-inspection.patch @@ -92,4 +92,3 @@ diff --git a/chrome/utility/safe_browsing/archive_analyzer.cc b/chrome/utility/s return std::make_unique(); } else if (file_type == DownloadFileType::SEVEN_ZIP) { -- -2.25.1 diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index 669fd6d01..5eff35acc 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -106,4 +106,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 { name: "TextFragmentTapOpensContextMenu", -- -2.25.1 diff --git a/build/patches/Disable-the-DIAL-repeating-discovery.patch b/build/patches/Disable-the-DIAL-repeating-discovery.patch index fedfaebf3..b23bfcd02 100644 --- a/build/patches/Disable-the-DIAL-repeating-discovery.patch +++ b/build/patches/Disable-the-DIAL-repeating-discovery.patch @@ -33,4 +33,3 @@ diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrom } -- -2.25.1 diff --git a/build/patches/Disable-third-party-origin-trials.patch b/build/patches/Disable-third-party-origin-trials.patch index d60b6748e..686cd2210 100644 --- a/build/patches/Disable-third-party-origin-trials.patch +++ b/build/patches/Disable-third-party-origin-trials.patch @@ -261,4 +261,3 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context. return base::FeatureList::IsEnabled(features::kPrivacySandboxAdsAPIs); -- -2.25.1 diff --git a/build/patches/Disable-update-scheduler.patch b/build/patches/Disable-update-scheduler.patch index d8922060e..08d35e406 100644 --- a/build/patches/Disable-update-scheduler.patch +++ b/build/patches/Disable-update-scheduler.patch @@ -20,4 +20,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/background_task return new BackgroundSyncBackgroundTask(); case TaskIds.NOTIFICATION_SCHEDULER_JOB_ID: -- -2.25.1 diff --git a/build/patches/Disable-various-metrics.patch b/build/patches/Disable-various-metrics.patch index fd9ebbc23..f19b83982 100644 --- a/build/patches/Disable-various-metrics.patch +++ b/build/patches/Disable-various-metrics.patch @@ -229,4 +229,3 @@ diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/publ +SET_CROMITE_FEATURE_DISABLED(kUkmFeature); } // namespace ukm -- -2.25.1 diff --git a/build/patches/Do-not-build-API-keys-infobar.patch b/build/patches/Do-not-build-API-keys-infobar.patch index 566a8393f..bd5b9ee49 100644 --- a/build/patches/Do-not-build-API-keys-infobar.patch +++ b/build/patches/Do-not-build-API-keys-infobar.patch @@ -34,4 +34,3 @@ diff --git a/chrome/browser/ui/startup/infobar_utils.cc b/chrome/browser/ui/star PrefService* local_state = g_browser_process->local_state(); if (!local_state || -- -2.25.1 diff --git a/build/patches/Do-not-compile-QR-code-sharing.patch b/build/patches/Do-not-compile-QR-code-sharing.patch index dd26e9510..be297b389 100644 --- a/build/patches/Do-not-compile-QR-code-sharing.patch +++ b/build/patches/Do-not-compile-QR-code-sharing.patch @@ -125,4 +125,3 @@ diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/shar "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java", -- -2.25.1 diff --git a/build/patches/Do-not-ignore-download-location-prompt-setting.patch b/build/patches/Do-not-ignore-download-location-prompt-setting.patch index 8a21ea06d..022159984 100644 --- a/build/patches/Do-not-ignore-download-location-prompt-setting.patch +++ b/build/patches/Do-not-ignore-download-location-prompt-setting.patch @@ -40,4 +40,3 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse if (mDialogModel != null) return; -- -2.25.1 diff --git a/build/patches/Do-not-link-with-libatomic.patch b/build/patches/Do-not-link-with-libatomic.patch index 78f3b5162..dc4825382 100644 --- a/build/patches/Do-not-link-with-libatomic.patch +++ b/build/patches/Do-not-link-with-libatomic.patch @@ -24,4 +24,3 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn if (use_allocator_shim) { -- -2.25.1 diff --git a/build/patches/Do-not-store-passwords-by-default.patch b/build/patches/Do-not-store-passwords-by-default.patch index c79c4d4fc..bdc846948 100644 --- a/build/patches/Do-not-store-passwords-by-default.patch +++ b/build/patches/Do-not-store-passwords-by-default.patch @@ -40,4 +40,3 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp registry->RegisterIntegerPref( prefs::kCurrentMigrationVersionToGoogleMobileServices, 0); -- -2.25.1 diff --git a/build/patches/DoH-improvements.patch b/build/patches/DoH-improvements.patch index cb179fd81..ac37ead3c 100644 --- a/build/patches/DoH-improvements.patch +++ b/build/patches/DoH-improvements.patch @@ -91,4 +91,3 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc // Only invalidate cache if new overrides have resulted in a config change. -- -2.25.1 diff --git a/build/patches/Enable-Certificate-Transparency.patch b/build/patches/Enable-Certificate-Transparency.patch index 00e8fc24c..e2682096d 100644 --- a/build/patches/Enable-Certificate-Transparency.patch +++ b/build/patches/Enable-Certificate-Transparency.patch @@ -160,4 +160,3 @@ diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/ne auto reporter = std::make_unique( owner_network_context_, reporter_key, std::move(report), -- -2.25.1 diff --git a/build/patches/Enable-ECH-by-default.patch b/build/patches/Enable-ECH-by-default.patch index be75b2683..20739b767 100644 --- a/build/patches/Enable-ECH-by-default.patch +++ b/build/patches/Enable-ECH-by-default.patch @@ -16,4 +16,3 @@ new file mode 100644 +SET_CROMITE_FEATURE_ENABLED(kEncryptedClientHello); +SET_CROMITE_FEATURE_ENABLED(kEncryptedClientHelloQuic); -- -2.25.1 diff --git a/build/patches/Enable-HEVC-by-default.patch b/build/patches/Enable-HEVC-by-default.patch index acd72e0e5..04c83a07b 100644 --- a/build/patches/Enable-HEVC-by-default.patch +++ b/build/patches/Enable-HEVC-by-default.patch @@ -24,4 +24,3 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) // Enables HEVC hardware accelerated encoding for Windows, Mac, and Android. -- -2.25.1 diff --git a/build/patches/Enable-PermuteTLSExtensions-by-default.patch b/build/patches/Enable-PermuteTLSExtensions-by-default.patch index d26df4c12..01f9ac50f 100644 --- a/build/patches/Enable-PermuteTLSExtensions-by-default.patch +++ b/build/patches/Enable-PermuteTLSExtensions-by-default.patch @@ -15,4 +15,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_ENABLED(kPermuteTLSExtensions); -- -2.25.1 diff --git a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch index 58e2c8275..e0b171492 100644 --- a/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch +++ b/build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch @@ -78,4 +78,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_ENABLED(kStrictOriginIsolation); -- -2.25.1 diff --git a/build/patches/Enable-darken-websites-checkbox-in-themes.patch b/build/patches/Enable-darken-websites-checkbox-in-themes.patch index 5510d5637..943f37ecf 100644 --- a/build/patches/Enable-darken-websites-checkbox-in-themes.patch +++ b/build/patches/Enable-darken-websites-checkbox-in-themes.patch @@ -38,4 +38,3 @@ new file mode 100644 + +#endif // BUILDFLAG(IS_ANDROID) -- -2.25.1 diff --git a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch index 0c718bd5c..faf0df8bd 100644 --- a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch +++ b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch @@ -57,4 +57,3 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn if (fatal_linker_warnings && !is_apple && current_os != "aix" && current_os != "zos") { -- -2.25.1 diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index 70638c5f7..76339bc1f 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -30,17 +30,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../autofill/AutofillManagerWrapper.java | 5 +- .../components/autofill/AutofillProvider.java | 7 ++ .../BrowserSelectionActionMenuDelegate.java | 62 ++++++++++++++ - .../browser/content_autofill_driver.cc | 53 ++++++++++++ + .../browser/content_autofill_driver.cc | 57 +++++++++++++ .../content/browser/content_autofill_driver.h | 9 ++- .../content_autofill_driver_factory.cc | 11 ++- .../browser/content_autofill_driver_factory.h | 1 + .../renderer/password_autofill_agent.cc | 5 +- + .../autofill/core/browser/autofill_driver.h | 2 + .../autofill/core/common/autofill_prefs.cc | 6 ++ .../autofill/core/common/autofill_prefs.h | 2 + .../embedder_support/view/ContentView.java | 46 +++++++++++ .../selection/FloatingPastePopupMenu.java | 3 +- .../chromium/ui/base/ViewAndroidDelegate.java | 8 ++ - 25 files changed, 404 insertions(+), 10 deletions(-) + 26 files changed, 410 insertions(+), 10 deletions(-) create mode 100644 components/android_autofill/browser/java/src/org/chromium/components/autofill/BrowserSelectionActionMenuDelegate.java diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn @@ -585,8 +586,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co const std::vector& removed_forms) { target->GetAutofillManager().OnFormsSeen( WithNewVersion(updated_forms), removed_forms); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnFormsSeen( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnFormsSeen( + WithNewVersion(updated_forms), removed_forms); + } }); @@ -596,8 +597,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } target->GetAutofillManager().OnFormSubmitted( WithNewVersion(form), known_success, submission_source); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnFormSubmitted( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnFormSubmitted( + WithNewVersion(form), known_success, submission_source); + } }); @@ -607,8 +608,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co base::TimeTicks timestamp) { target->GetAutofillManager().OnTextFieldDidChange( WithNewVersion(form), field, bounding_box, timestamp); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnTextFieldDidChange( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnTextFieldDidChange( + WithNewVersion(form), field, bounding_box, timestamp); + } }); @@ -618,8 +619,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co const FormFieldData& field, const gfx::RectF& bounding_box) { target->GetAutofillManager().OnTextFieldDidScroll(WithNewVersion(form), field, bounding_box); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnTextFieldDidScroll( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnTextFieldDidScroll( + WithNewVersion(form), field, bounding_box); + } }); @@ -629,8 +630,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co const FormFieldData& field, const gfx::RectF& bounding_box) { target->GetAutofillManager().OnSelectControlDidChange( WithNewVersion(form), field, bounding_box); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnSelectControlDidChange( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnSelectControlDidChange( + WithNewVersion(form), field, bounding_box); + } }); @@ -640,8 +641,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co AutofillSuggestionTriggerSource trigger_source) { target->GetAutofillManager().OnAskForValuesToFill( WithNewVersion(form), field, bounding_box, trigger_source); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnAskForValuesToFill( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnAskForValuesToFill( + WithNewVersion(form), field, bounding_box, trigger_source); + } }); @@ -651,8 +652,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co DCHECK(!target->IsPrerendering()) << "We should never affect UI while prerendering"; target->GetAutofillManager().OnHidePopup(); -+ if (target->secondary_autofill_manager_) -+ target->secondary_autofill_manager_->OnHidePopup(); ++ if (target->secondary_autofill_manager()) ++ target->secondary_autofill_manager()->OnHidePopup(); }); } @@ -660,8 +661,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co this, had_interacted_form, [](autofill::AutofillDriver* target, bool had_interacted_form) { target->GetAutofillManager().OnFocusNoLongerOnForm(had_interacted_form); -+ if (target->secondary_autofill_manager_) -+ target->secondary_autofill_manager_->OnFocusNoLongerOnForm(had_interacted_form); ++ if (target->secondary_autofill_manager()) ++ target->secondary_autofill_manager()->OnFocusNoLongerOnForm(had_interacted_form); }); } @@ -669,15 +670,15 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co const FormFieldData& field, const gfx::RectF& bounding_box) { target->GetAutofillManager().OnFocusOnFormField(WithNewVersion(form), field, bounding_box); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnFocusOnFormField( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnFocusOnFormField( + WithNewVersion(form), field, bounding_box); + } }, [](autofill::AutofillDriver* target) { target->GetAutofillManager().OnFocusNoLongerOnForm(true); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnFocusNoLongerOnForm(true); ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnFocusNoLongerOnForm(true); + } }); } @@ -686,8 +687,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co base::TimeTicks timestamp) { target->GetAutofillManager().OnDidFillAutofillFormData( WithNewVersion(form), timestamp); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnDidFillAutofillFormData( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnDidFillAutofillFormData( + WithNewVersion(form), timestamp); + } }); @@ -697,8 +698,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } router().DidEndTextFieldEditing(this, [](autofill::AutofillDriver* target) { target->GetAutofillManager().OnDidEndTextFieldEditing(); -+ if (target->secondary_autofill_manager_) -+ target->secondary_autofill_manager_->OnDidEndTextFieldEditing(); ++ if (target->secondary_autofill_manager()) ++ target->secondary_autofill_manager()->OnDidEndTextFieldEditing(); }); } @@ -706,8 +707,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co cast(target) ->GetAutofillManager() .OnSelectOrSelectListFieldOptionsDidChange(WithNewVersion(form)); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnSelectOrSelectMenuFieldOptionsDidChange( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnSelectOrSelectListFieldOptionsDidChange( + WithNewVersion(form)); + } }); @@ -717,8 +718,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co const FormFieldData& field, const std::u16string& old_value) { target->GetAutofillManager().OnJavaScriptChangedAutofilledValue( WithNewVersion(form), field, old_value); -+ if (target->secondary_autofill_manager_) { -+ target->secondary_autofill_manager_->OnJavaScriptChangedAutofilledValue( ++ if (target->secondary_autofill_manager()) { ++ target->secondary_autofill_manager()->OnJavaScriptChangedAutofilledValue( + WithNewVersion(form), field, old_value); + } }); @@ -728,8 +729,8 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co const FieldGlobalId& field_global_id) { target->GetAutofillManager().OnContextMenuShownInField(form_global_id, field_global_id); -+ if (target->secondary_autofill_manager_) -+ target->secondary_autofill_manager_->OnContextMenuShownInField(form_global_id, field_global_id); ++ if (target->secondary_autofill_manager()) ++ target->secondary_autofill_manager()->OnContextMenuShownInField(form_global_id, field_global_id); }); } @@ -742,6 +743,17 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co } const mojo::AssociatedRemote& +@@ -698,6 +751,10 @@ ContentAutofillDriver::GetAutofillAgent() { + return autofill_agent_; + } + ++raw_ptr ContentAutofillDriver::secondary_autofill_manager() { ++ return secondary_autofill_manager_.get(); ++} ++ + void ContentAutofillDriver::SetFrameAndFormMetaData( + FormData& form, + FormFieldData* optional_field) const { diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h --- a/components/autofill/content/browser/content_autofill_driver.h +++ b/components/autofill/content/browser/content_autofill_driver.h @@ -755,7 +767,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com autofill_manager_ = std::move(autofill_manager); + secondary_autofill_manager_ = std::move(secondary_autofill_manager); } -+ AutofillManager* secondary_autofill_manager() { return secondary_autofill_manager_.get(); } ++ raw_ptr secondary_autofill_manager() override; content::RenderFrameHost* render_frame_host() { return &*render_frame_host_; } const content::RenderFrameHost* render_frame_host() const { @@ -826,6 +838,18 @@ diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/c } void PasswordAutofillAgent::FillPasswordSuggestion( +diff --git a/components/autofill/core/browser/autofill_driver.h b/components/autofill/core/browser/autofill_driver.h +--- a/components/autofill/core/browser/autofill_driver.h ++++ b/components/autofill/core/browser/autofill_driver.h +@@ -69,6 +69,8 @@ class AutofillDriver { + // Returns the AutofillManager owned by the AutofillDriver. + virtual AutofillManager& GetAutofillManager() = 0; + ++ virtual raw_ptr secondary_autofill_manager() = 0; ++ + // Returns whether the AutofillDriver instance is associated with an active + // frame in the MPArch sense. + virtual bool IsInActiveFrame() const = 0; diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc @@ -972,4 +996,3 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b + public void autofill(final SparseArray values) {} } -- -2.25.1 diff --git a/build/patches/Enable-network-isolation-features.patch b/build/patches/Enable-network-isolation-features.patch index a600388f2..33f66f433 100644 --- a/build/patches/Enable-network-isolation-features.patch +++ b/build/patches/Enable-network-isolation-features.patch @@ -37,4 +37,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_ENABLED(kSplitAuthCacheByNetworkIsolationKey); -- -2.25.1 diff --git a/build/patches/Enable-prefetch-privacy-changes-by-default.patch b/build/patches/Enable-prefetch-privacy-changes-by-default.patch index 427ab601d..913d3627b 100644 --- a/build/patches/Enable-prefetch-privacy-changes-by-default.patch +++ b/build/patches/Enable-prefetch-privacy-changes-by-default.patch @@ -15,4 +15,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_ENABLED(kPrefetchPrivacyChanges); -- -2.25.1 diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index 1d1fccab7..998a0661a 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -468,4 +468,3 @@ new file mode 100644 @@ -0,0 +1 @@ +BASE_DECLARE_FEATURE(kSharedIntentUI); -- -2.25.1 diff --git a/build/patches/Enable-third-party-storage-partitioning.patch b/build/patches/Enable-third-party-storage-partitioning.patch index 6f0230ed7..5ada1ef65 100644 --- a/build/patches/Enable-third-party-storage-partitioning.patch +++ b/build/patches/Enable-third-party-storage-partitioning.patch @@ -15,4 +15,3 @@ new file mode 100644 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_ENABLED(kThirdPartyStoragePartitioning); -- -2.25.1 diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch index cc017d287..7e688bfb6 100644 --- a/build/patches/Experimental-user-scripts-support.patch +++ b/build/patches/Experimental-user-scripts-support.patch @@ -10485,4 +10485,3 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ # START ios/ section. -- -2.25.1 diff --git a/build/patches/Follow-only-system-dark-mode.patch b/build/patches/Follow-only-system-dark-mode.patch index 22c928892..5d2c26655 100644 --- a/build/patches/Follow-only-system-dark-mode.patch +++ b/build/patches/Follow-only-system-dark-mode.patch @@ -22,4 +22,3 @@ diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/b final boolean newNightModeOn = theme == ThemeType.SYSTEM_DEFAULT -- -2.25.1 diff --git a/build/patches/Guard-for-user-agent-reduction.patch b/build/patches/Guard-for-user-agent-reduction.patch index 0cb8a8174..91856fa03 100644 --- a/build/patches/Guard-for-user-agent-reduction.patch +++ b/build/patches/Guard-for-user-agent-reduction.patch @@ -87,4 +87,3 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 { name: "ReferenceBoxNoPixelSnapping", -- -2.25.1 diff --git a/build/patches/Hardening-against-incognito-mode-detection.patch b/build/patches/Hardening-against-incognito-mode-detection.patch index 4021ccc07..6fcc3b415 100644 --- a/build/patches/Hardening-against-incognito-mode-detection.patch +++ b/build/patches/Hardening-against-incognito-mode-detection.patch @@ -20,4 +20,3 @@ diff --git a/storage/browser/quota/quota_settings.cc b/storage/browser/quota/quo device_info_helper->AmountOfPhysicalMemory()); } -- -2.25.1 diff --git a/build/patches/History-number-of-days-privacy-setting.patch b/build/patches/History-number-of-days-privacy-setting.patch index a76b3c369..0ad177d69 100644 --- a/build/patches/History-number-of-days-privacy-setting.patch +++ b/build/patches/History-number-of-days-privacy-setting.patch @@ -611,4 +611,3 @@ diff --git a/components/history/core/common/pref_names.h b/components/history/co } // namespace prefs -- -2.25.1 diff --git a/build/patches/Ignore-enterprise-policies-for-secure-DNS.patch b/build/patches/Ignore-enterprise-policies-for-secure-DNS.patch index 5415854d5..846471e1d 100644 --- a/build/patches/Ignore-enterprise-policies-for-secure-DNS.patch +++ b/build/patches/Ignore-enterprise-policies-for-secure-DNS.patch @@ -26,4 +26,3 @@ diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome EnterpriseInfo.getInstance().getDeviceEnterpriseInfo(callback); -- -2.25.1 diff --git a/build/patches/Improve-plain-text-rendering-on-mobile.patch b/build/patches/Improve-plain-text-rendering-on-mobile.patch index 566a48552..7a8a2149f 100644 --- a/build/patches/Improve-plain-text-rendering-on-mobile.patch +++ b/build/patches/Improve-plain-text-rendering-on-mobile.patch @@ -32,4 +32,3 @@ diff --git a/third_party/blink/renderer/core/html/parser/text_document_parser.cc attributes); TreeBuilder()->ConstructTree(&fake_pre); -- -2.25.1 diff --git a/build/patches/Improve-the-browser-sandbox.patch b/build/patches/Improve-the-browser-sandbox.patch index 222f71d81..560b4bc96 100644 --- a/build/patches/Improve-the-browser-sandbox.patch +++ b/build/patches/Improve-the-browser-sandbox.patch @@ -39,4 +39,3 @@ diff --git a/sandbox/policy/features.cc b/sandbox/policy/features.cc +#endif } // namespace sandbox::policy::features -- -2.25.1 diff --git a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch index 44b4284af..66549360c 100644 --- a/build/patches/Increase-number-of-autocomplete-matches-to-10.patch +++ b/build/patches/Increase-number-of-autocomplete-matches-to-10.patch @@ -44,4 +44,3 @@ diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omni std::string param_value; if (OmniboxFieldTrial::IsMlUrlScoringEnabled()) { -- -2.25.1 diff --git a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch index b5fa07184..2b94c0024 100644 --- a/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch +++ b/build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch @@ -189,4 +189,3 @@ diff --git a/third_party/blink/renderer/core/html/html_script_element.h b/third_ void setAsync(bool); bool async() const; -- -2.25.1 diff --git a/build/patches/Invalidate-components-public-key.patch b/build/patches/Invalidate-components-public-key.patch index 23b839916..157bddea0 100644 --- a/build/patches/Invalidate-components-public-key.patch +++ b/build/patches/Invalidate-components-public-key.patch @@ -23,4 +23,3 @@ diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.c const base::FilePath::CharType kCTConfigProtoFileName[] = -- -2.25.1 diff --git a/build/patches/JIT-site-settings.patch b/build/patches/JIT-site-settings.patch index e453073c3..48a308fa2 100644 --- a/build/patches/JIT-site-settings.patch +++ b/build/patches/JIT-site-settings.patch @@ -284,4 +284,3 @@ diff --git a/components/content_settings/core/browser/content_settings_registry. /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK}, WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, -- -2.25.1 diff --git a/build/patches/Keep-empty-tabs-between-sessions.patch b/build/patches/Keep-empty-tabs-between-sessions.patch index ad35010fd..c79326267 100644 --- a/build/patches/Keep-empty-tabs-between-sessions.patch +++ b/build/patches/Keep-empty-tabs-between-sessions.patch @@ -31,4 +31,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer Tab fallbackTab = mTabCreatorManager -- -2.25.1 diff --git a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch index 5e0ebb163..4737a4f38 100644 --- a/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -29,4 +29,3 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js { "name": "indexed-db-compress-values-with-snappy", -- -2.25.1 diff --git a/build/patches/Logcat-crash-reports-UI.patch b/build/patches/Logcat-crash-reports-UI.patch index 4c31fe2d3..5744c719c 100644 --- a/build/patches/Logcat-crash-reports-UI.patch +++ b/build/patches/Logcat-crash-reports-UI.patch @@ -957,4 +957,3 @@ diff --git a/components/upload_list/upload_list.h b/components/upload_list/uploa virtual ~UploadList(); -- -2.25.1 diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index 3c047e7d4..7a8340d7a 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -305,4 +305,3 @@ new file mode 100755 @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_ENABLED(kIsolateSandboxedIframes); -- -2.25.1 diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index 722f0dbc8..46e9ef8df 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -2872,4 +2872,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch index a68701d86..ba82bcaa8 100644 --- a/build/patches/Move-some-account-settings-back-to-privacy-settings.patch +++ b/build/patches/Move-some-account-settings-back-to-privacy-settings.patch @@ -121,4 +121,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Search engine -- -2.25.1 diff --git a/build/patches/Multiple-fingerprinting-mitigations.patch b/build/patches/Multiple-fingerprinting-mitigations.patch index 4f8548e9d..19ae4cbdc 100644 --- a/build/patches/Multiple-fingerprinting-mitigations.patch +++ b/build/patches/Multiple-fingerprinting-mitigations.patch @@ -860,4 +860,3 @@ new file mode 100644 + +#endif // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_ -- -2.25.1 diff --git a/build/patches/Never-fetch-popular-sites.patch b/build/patches/Never-fetch-popular-sites.patch index 211f17e56..595474e4d 100644 --- a/build/patches/Never-fetch-popular-sites.patch +++ b/build/patches/Never-fetch-popular-sites.patch @@ -42,4 +42,3 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p } -- -2.25.1 diff --git a/build/patches/Never-use-HTTP-probes-for-connection-detection.patch b/build/patches/Never-use-HTTP-probes-for-connection-detection.patch index 2f634240c..f6f650123 100644 --- a/build/patches/Never-use-HTTP-probes-for-connection-detection.patch +++ b/build/patches/Never-use-HTTP-probes-for-connection-detection.patch @@ -24,4 +24,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivit } -- -2.25.1 diff --git a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch index 5dbfed3f9..14cb12654 100644 --- a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch +++ b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch @@ -20,4 +20,3 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL)); builtins_to_provide.push_back(base::ASCIIToUTF16(chrome::kChromeUIFlagsURL)); -- -2.25.1 diff --git a/build/patches/OpenSearch-miscellaneous.patch b/build/patches/OpenSearch-miscellaneous.patch index a7b273b12..6313998a9 100644 --- a/build/patches/OpenSearch-miscellaneous.patch +++ b/build/patches/OpenSearch-miscellaneous.patch @@ -275,4 +275,3 @@ diff --git a/components/search_engines/template_url_service.h b/components/searc void AddTabToSearchVisit(const TemplateURL& t_url); -- -2.25.1 diff --git a/build/patches/Override-Navigator-Language.patch b/build/patches/Override-Navigator-Language.patch index 65855f946..713ed035a 100644 --- a/build/patches/Override-Navigator-Language.patch +++ b/build/patches/Override-Navigator-Language.patch @@ -74,4 +74,3 @@ 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 diff --git a/build/patches/Partition-Blink-memory-cache.patch b/build/patches/Partition-Blink-memory-cache.patch index bb75b8528..965bcb723 100644 --- a/build/patches/Partition-Blink-memory-cache.patch +++ b/build/patches/Partition-Blink-memory-cache.patch @@ -254,4 +254,3 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h // If `url` exists as a resource in a subresource bundle in this frame, // returns its UnguessableToken; otherwise, returns absl::nullopt. -- -2.25.1 diff --git a/build/patches/Partition-blobs-by-top-frame-URL.patch b/build/patches/Partition-blobs-by-top-frame-URL.patch index 03c40445f..71760995a 100644 --- a/build/patches/Partition-blobs-by-top-frame-URL.patch +++ b/build/patches/Partition-blobs-by-top-frame-URL.patch @@ -214,4 +214,3 @@ diff --git a/third_party/blink/renderer/core/fileapi/public_url_manager.cc b/thi } -- -2.25.1 diff --git a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch index b32182961..6b1c3f751 100644 --- a/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch +++ b/build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch @@ -107,4 +107,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Re-introduce-override_build_timestamp.patch b/build/patches/Re-introduce-override_build_timestamp.patch index bacf4f022..896d5d2b3 100644 --- a/build/patches/Re-introduce-override_build_timestamp.patch +++ b/build/patches/Re-introduce-override_build_timestamp.patch @@ -47,4 +47,3 @@ diff --git a/build_overrides/build.gni b/build_overrides/build.gni # to lack of toolchain support. gtest_enable_absl_printers = !is_nacl -- -2.25.1 diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch index 59425d582..21f148f9e 100644 --- a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch +++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch @@ -73,4 +73,3 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque // specified. std::string accept_language = -- -2.25.1 diff --git a/build/patches/Remove-EV-certificates.patch b/build/patches/Remove-EV-certificates.patch index 9175f3642..779a62b76 100644 --- a/build/patches/Remove-EV-certificates.patch +++ b/build/patches/Remove-EV-certificates.patch @@ -58,4 +58,3 @@ diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h namespace base { -- -2.25.1 diff --git a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch index e4d6d36f6..a1dd464d1 100644 --- a/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch +++ b/build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch @@ -654,4 +654,3 @@ diff --git a/third_party/blink/public/common/renderer_preferences/renderer_prefe bool enable_do_not_track{false}; bool enable_encrypted_media{true}; -- -2.25.1 diff --git a/build/patches/Remove-SMS-integration.patch b/build/patches/Remove-SMS-integration.patch index 14659d961..b4679fb2f 100644 --- a/build/patches/Remove-SMS-integration.patch +++ b/build/patches/Remove-SMS-integration.patch @@ -440,4 +440,3 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Wr // --------------------------------------------------------------------- -- -2.25.1 diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index bd6e26029..b01ee5617 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -4393,4 +4393,3 @@ diff --git a/third_party/cardboard/BUILD.gn b/third_party/cardboard/BUILD.gn "//third_party/androidx:androidx_annotation_annotation_jvm_java", "//third_party/androidx:androidx_appcompat_appcompat_java", -- -2.25.1 diff --git a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch index bf007d302..7bb14da31 100644 --- a/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch +++ b/build/patches/Remove-blocklisted-URLs-upon-bookmark-creation.patch @@ -45,4 +45,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/TabBo final BookmarkModel bookmarkModel = mBookmarkModelSupplier.get(); if (bookmarkModel == null || !bookmarkModel.isEditBookmarksEnabled()) { -- -2.25.1 diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index 400435524..874f18eb5 100644 --- a/build/patches/Remove-help-menu-item.patch +++ b/build/patches/Remove-help-menu-item.patch @@ -260,4 +260,3 @@ diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/b @Override -- -2.25.1 diff --git a/build/patches/Remove-navigator.connection-info.patch b/build/patches/Remove-navigator.connection-info.patch index 706d5e9b0..91ca6266d 100644 --- a/build/patches/Remove-navigator.connection-info.patch +++ b/build/patches/Remove-navigator.connection-info.patch @@ -91,4 +91,3 @@ diff --git a/third_party/blink/renderer/platform/network/network_state_notifier. NetworkStateNotifier& operator=(const NetworkStateNotifier&) = delete; -- -2.25.1 diff --git a/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch b/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch index 4fd858ef0..eb8f27445 100644 --- a/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch +++ b/build/patches/Remove-preload-of-com.google.android.gms.fonts.patch @@ -68,4 +68,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPrelo OnFontCallback callback = new OnFontCallback(); for (int font : mFonts) { -- -2.25.1 diff --git a/build/patches/Remove-segmentation-platform.patch b/build/patches/Remove-segmentation-platform.patch index 5c2784557..2d28d6a64 100644 --- a/build/patches/Remove-segmentation-platform.patch +++ b/build/patches/Remove-segmentation-platform.patch @@ -55,4 +55,3 @@ diff --git a/components/segmentation_platform/public/features.cc b/components/se +SET_CROMITE_FEATURE_DISABLED(kSegmentationPlatformFeedSegmentFeature); } // namespace segmentation_platform::features -- -2.25.1 diff --git a/build/patches/Remove-voice-recognition-integration.patch b/build/patches/Remove-voice-recognition-integration.patch index a8479f9b4..4e19ee515 100644 --- a/build/patches/Remove-voice-recognition-integration.patch +++ b/build/patches/Remove-voice-recognition-integration.patch @@ -866,4 +866,3 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow * @return The current native pointer to the autocomplete results. TODO(crbug.com/1138587): * Figure out how to remove this. -- -2.25.1 diff --git a/build/patches/Remove-window-name-on-cross-origin-navigation.patch b/build/patches/Remove-window-name-on-cross-origin-navigation.patch index bc812142e..ea8ce8194 100644 --- a/build/patches/Remove-window-name-on-cross-origin-navigation.patch +++ b/build/patches/Remove-window-name-on-cross-origin-navigation.patch @@ -39,4 +39,3 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p } -- -2.25.1 diff --git a/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch b/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch index 4f279d89b..ef244d962 100644 --- a/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch +++ b/build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch @@ -35,4 +35,3 @@ diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h // DnsTransaction implements a stub DNS resolver as defined in RFC 1034. // The DnsTransaction takes care of retransmissions, name server fallback (or -- -2.25.1 diff --git a/build/patches/Restore-Search-Ready-Omnibox-flag.patch b/build/patches/Restore-Search-Ready-Omnibox-flag.patch index 7167dbb9c..8d9c9fda4 100644 --- a/build/patches/Restore-Search-Ready-Omnibox-flag.patch +++ b/build/patches/Restore-Search-Ready-Omnibox-flag.patch @@ -118,4 +118,3 @@ new file mode 100644 @@ -0,0 +1 @@ +BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature); -- -2.25.1 diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index 231459750..c3a86c1fb 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -389,4 +389,3 @@ new file mode 100644 @@ -0,0 +1 @@ +BASE_DECLARE_FEATURE(kSimplifiedNTP); -- -2.25.1 diff --git a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch index 7858472f9..bfde04d46 100644 --- a/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch +++ b/build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch @@ -286,4 +286,3 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow @SmallTest public void testManualOverride() { -- -2.25.1 diff --git a/build/patches/Restore-classic-new-tab-page.patch b/build/patches/Restore-classic-new-tab-page.patch index 9668a9f63..19f93aa56 100644 --- a/build/patches/Restore-classic-new-tab-page.patch +++ b/build/patches/Restore-classic-new-tab-page.patch @@ -88,4 +88,3 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc const GURL url; -- -2.25.1 diff --git a/build/patches/Restore-offline-indicator-v2-flag.patch b/build/patches/Restore-offline-indicator-v2-flag.patch index 6fcd572a8..45494d31b 100644 --- a/build/patches/Restore-offline-indicator-v2-flag.patch +++ b/build/patches/Restore-offline-indicator-v2-flag.patch @@ -166,4 +166,3 @@ new file mode 100644 @@ -0,0 +1 @@ +BASE_DECLARE_FEATURE(kOfflineIndicatorV2); -- -2.25.1 diff --git a/build/patches/Revert-Delete-block-external-form-redirects.patch b/build/patches/Revert-Delete-block-external-form-redirects.patch index bfdbea8a3..7f6fe0347 100644 --- a/build/patches/Revert-Delete-block-external-form-redirects.patch +++ b/build/patches/Revert-Delete-block-external-form-redirects.patch @@ -126,4 +126,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Revert-Permit-blocking-of-view-source.patch b/build/patches/Revert-Permit-blocking-of-view-source.patch index cdaf2ecd8..f8b4e518e 100644 --- a/build/patches/Revert-Permit-blocking-of-view-source.patch +++ b/build/patches/Revert-Permit-blocking-of-view-source.patch @@ -68,4 +68,3 @@ diff --git a/components/policy/content/policy_blocklist_navigation_throttle.h b/ // SafeSitesNavigationThrottle must be consulted as part of this throttle // rather than added separately to the list of throttles. -- -2.25.1 diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 28d480e7d..09917acb6 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -44,4 +44,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index 4c13d85df..d5e8998b6 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -39,4 +39,3 @@ new file mode 100644 + +#endif -- -2.25.1 diff --git a/build/patches/Revert-removal-of-execution-context-address-space.patch b/build/patches/Revert-removal-of-execution-context-address-space.patch index a2fe436b2..1b6c136e2 100644 --- a/build/patches/Revert-removal-of-execution-context-address-space.patch +++ b/build/patches/Revert-removal-of-execution-context-address-space.patch @@ -910,4 +910,3 @@ diff --git a/third_party/blink/renderer/modules/worklet/worklet_thread_test_comm base::UnguessableToken::Create(), nullptr /* worker_settings */, mojom::blink::V8CacheOptions::kDefault, -- -2.25.1 diff --git a/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch b/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch index ae875e4f3..be60ed417 100644 --- a/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch +++ b/build/patches/Samsung-Note-9-SDK27-crazylinker-workaround.patch @@ -43,4 +43,3 @@ diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoade .ensureInitialized( /* asRelroProducer= */ true, Linker.PreferAddress.FIND_RESERVED, 0); -- -2.25.1 diff --git a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch index 8b19eece0..e0ce12302 100644 --- a/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch +++ b/build/patches/Show-site-settings-for-cookies-javascript-and-ads.patch @@ -132,4 +132,3 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c /* isEmbargoed= */ false); setContentSettingException(type, exception); -- -2.25.1 diff --git a/build/patches/Site-setting-for-images.patch b/build/patches/Site-setting-for-images.patch index 7d32be9b3..a234bbf6b 100644 --- a/build/patches/Site-setting-for-images.patch +++ b/build/patches/Site-setting-for-images.patch @@ -275,4 +275,3 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc // it. rules->mixed_content_rules.push_back(ContentSettingPatternSource( -- -2.25.1 diff --git a/build/patches/Switch-to-fstack-protector-strong.patch b/build/patches/Switch-to-fstack-protector-strong.patch index f1bb7a211..409ddcc3c 100644 --- a/build/patches/Switch-to-fstack-protector-strong.patch +++ b/build/patches/Switch-to-fstack-protector-strong.patch @@ -36,4 +36,3 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn } } -- -2.25.1 diff --git a/build/patches/Timezone-customization.patch b/build/patches/Timezone-customization.patch index 694b37a0f..892186fb9 100644 --- a/build/patches/Timezone-customization.patch +++ b/build/patches/Timezone-customization.patch @@ -968,4 +968,3 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.h } // namespace content_settings -- -2.25.1 diff --git a/build/patches/Use-4-tile-rows-never-show-logo.patch b/build/patches/Use-4-tile-rows-never-show-logo.patch index d86bce1e2..e4b0007f2 100644 --- a/build/patches/Use-4-tile-rows-never-show-logo.patch +++ b/build/patches/Use-4-tile-rows-never-show-logo.patch @@ -77,4 +77,3 @@ diff --git a/components/history/core/browser/top_sites_impl.h b/components/histo // This class allows requests for most visited urls on any thread. All other // methods must be invoked on the UI thread. All mutations to internal state -- -2.25.1 diff --git a/build/patches/Use-64-bit-WebView-processes.patch b/build/patches/Use-64-bit-WebView-processes.patch index 529113308..0410c7191 100644 --- a/build/patches/Use-64-bit-WebView-processes.patch +++ b/build/patches/Use-64-bit-WebView-processes.patch @@ -39,4 +39,3 @@ diff --git a/android_webview/nonembedded/java/AndroidManifest.xml b/android_webv {# This part is shared between stand-alone WebView and Monochrome #} {% macro common(manifest_package, webview_lib) %} -- -2.25.1 diff --git a/build/patches/Use-dummy-DFM-installer.patch b/build/patches/Use-dummy-DFM-installer.patch index f65edcad5..f14d7c2f7 100644 --- a/build/patches/Use-dummy-DFM-installer.patch +++ b/build/patches/Use-dummy-DFM-installer.patch @@ -519,4 +519,3 @@ diff --git a/components/module_installer/android/java/src/org/chromium/component } -- -2.25.1 diff --git a/build/patches/User-agent-customization.patch b/build/patches/User-agent-customization.patch index 73410f7a4..b825425e4 100644 --- a/build/patches/User-agent-customization.patch +++ b/build/patches/User-agent-customization.patch @@ -1209,4 +1209,3 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_th user_agent_ = WebString::FromUTF8(user_agent); GetContentClient()->renderer()->DidSetUserAgent(user_agent); -- -2.25.1 diff --git a/build/patches/Viewport-Protection-flag.patch b/build/patches/Viewport-Protection-flag.patch index 9c15eb8ec..056227f1c 100644 --- a/build/patches/Viewport-Protection-flag.patch +++ b/build/patches/Viewport-Protection-flag.patch @@ -20,7 +20,6 @@ Require: Content-settings-infrastructure.patch .../common/widget/device_emulation_params.h | 6 +- .../blink/renderer/core/css/media_values.cc | 2 +- .../core/css/resolver/style_resolver.cc | 7 +- - .../renderer/core/events/keyboard_event.cc | 13 ++- .../blink/renderer/core/events/mouse_event.h | 19 +++- .../renderer/core/events/pointer_event.h | 11 +++ .../renderer/core/exported/web_view_impl.cc | 2 +- @@ -34,7 +33,7 @@ Require: Content-settings-infrastructure.patch .../blink/renderer/core/input/touch.cc | 17 +++- third_party/blink/renderer/core/page/page.cc | 93 ++++++++++++++++++ third_party/blink/renderer/core/page/page.h | 9 ++ - 25 files changed, 435 insertions(+), 20 deletions(-) + 24 files changed, 423 insertions(+), 19 deletions(-) create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteViewportContentSetting.java create mode 100644 components/browser_ui/strings/bromite_content_settings/viewport.grdp create mode 100644 components/content_settings/core/browser/bromite_content_settings/viewport.inc @@ -307,36 +306,6 @@ diff --git a/third_party/blink/renderer/core/css/resolver/style_resolver.cc b/th builder.SetEffectiveZoom(InitialZoom()); builder.SetInForcedColorsMode(GetDocument().InForcedColorsMode()); builder.SetTapHighlightColor( -diff --git a/third_party/blink/renderer/core/events/keyboard_event.cc b/third_party/blink/renderer/core/events/keyboard_event.cc ---- a/third_party/blink/renderer/core/events/keyboard_event.cc -+++ b/third_party/blink/renderer/core/events/keyboard_event.cc -@@ -36,6 +36,7 @@ - #include "third_party/blink/renderer/core/input/input_device_capabilities.h" - #include "third_party/blink/renderer/platform/bindings/dom_wrapper_world.h" - #include "third_party/blink/renderer/platform/bindings/script_state.h" -+#include "third_party/blink/renderer/platform/weborigin/scheme_registry.h" - #include "third_party/blink/renderer/platform/windows_keyboard_codes.h" - #include "ui/base/ui_base_features.h" - #include "ui/events/keycodes/dom/keycode_converter.h" -@@ -139,7 +140,17 @@ KeyboardEvent::KeyboardEvent(const WebKeyboardEvent& key, - else - key_code_ = char_code_; - -- if (features::IsSystemKeyboardProtectionEnabled()) { -+ bool keyboard_protection = features::IsSystemKeyboardProtectionEnabled(); -+ if (dom_window) { -+ if (auto* frame = dom_window->GetFrame()) { -+ String protocol = -+ frame->GetSecurityContext()->GetSecurityOrigin()->Protocol(); -+ if (SchemeRegistry::IsWebUIScheme(protocol)) { -+ keyboard_protection = false; -+ } -+ } -+ } -+ if (keyboard_protection) { - // we need character for transformation - ui::DomKey ascii_key; - ui::DomKey original_dom_key = static_cast(key.dom_key); diff --git a/third_party/blink/renderer/core/events/mouse_event.h b/third_party/blink/renderer/core/events/mouse_event.h --- a/third_party/blink/renderer/core/events/mouse_event.h +++ b/third_party/blink/renderer/core/events/mouse_event.h @@ -877,4 +846,3 @@ diff --git a/third_party/blink/renderer/core/page/page.h b/third_party/blink/ren blink::FencedFrame::DeprecatedFencedFrameMode fenced_frame_mode_ = blink::FencedFrame::DeprecatedFencedFrameMode::kDefault; -- -2.25.1 diff --git a/build/patches/Welcome-screen.patch b/build/patches/Welcome-screen.patch index 48bb90d43..a020b552f 100644 --- a/build/patches/Welcome-screen.patch +++ b/build/patches/Welcome-screen.patch @@ -1269,4 +1269,3 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro Welcome to Chrome -- -2.25.1 diff --git a/build/patches/autofill-miscellaneous.patch b/build/patches/autofill-miscellaneous.patch index 78e4c54e4..e8e4a5312 100644 --- a/build/patches/autofill-miscellaneous.patch +++ b/build/patches/autofill-miscellaneous.patch @@ -245,4 +245,3 @@ diff --git a/components/password_manager/core/browser/password_generation_frame_ if (logger) logger->LogMessage(Logger::STRING_GENERATION_DISABLED_SAVING_DISABLED); -- -2.25.1 diff --git a/build/patches/bromite-build-utils.patch b/build/patches/bromite-build-utils.patch index 2372165ab..8065bd00b 100644 --- a/build/patches/bromite-build-utils.patch +++ b/build/patches/bromite-build-utils.patch @@ -716,4 +716,3 @@ diff --git a/tools/grit/preprocess_if_expr.py b/tools/grit/preprocess_if_expr.py removal_comments_extension = None # None means no removal comments if args.enable_removal_comments: -- -2.25.1 diff --git a/build/patches/build-remove-calling-untrusted-hooks.patch b/build/patches/build-remove-calling-untrusted-hooks.patch index dca87a128..047e6a4ce 100644 --- a/build/patches/build-remove-calling-untrusted-hooks.patch +++ b/build/patches/build-remove-calling-untrusted-hooks.patch @@ -176,4 +176,3 @@ diff --git a/DEPS b/DEPS { 'name': 'opus_test_files', -- -2.25.1 diff --git a/build/patches/disable-AdsBlockedInfoBar.patch b/build/patches/disable-AdsBlockedInfoBar.patch index ef83d181c..ef9a009c5 100644 --- a/build/patches/disable-AdsBlockedInfoBar.patch +++ b/build/patches/disable-AdsBlockedInfoBar.patch @@ -73,4 +73,3 @@ diff --git a/components/subresource_filter/content/browser/profile_interaction_m content::WebContents* ProfileInteractionManager::GetWebContents() { -- -2.25.1 diff --git a/build/patches/disable-WebView-variations-support.patch b/build/patches/disable-WebView-variations-support.patch index 2ad7a72a2..1c847f321 100644 --- a/build/patches/disable-WebView-variations-support.patch +++ b/build/patches/disable-WebView-variations-support.patch @@ -40,4 +40,3 @@ diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewC setSingleton(this); -- -2.25.1 diff --git a/build/patches/disable-appending-variations-header.patch b/build/patches/disable-appending-variations-header.patch index 6554ecc3b..885fdbfe0 100644 --- a/build/patches/disable-appending-variations-header.patch +++ b/build/patches/disable-appending-variations-header.patch @@ -23,4 +23,3 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v // Returns true if the request is sent from a Google web property, i.e. from a -- -2.25.1 diff --git a/build/patches/disable-battery-status-updater.patch b/build/patches/disable-battery-status-updater.patch index 1fe0870ff..91bdc7769 100644 --- a/build/patches/disable-battery-status-updater.patch +++ b/build/patches/disable-battery-status-updater.patch @@ -43,4 +43,3 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device return callback_list_.Add(callback); } -- -2.25.1 diff --git a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch index 5bdc78823..dbaa52ac8 100644 --- a/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch +++ b/build/patches/dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch @@ -34,4 +34,3 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc // ICANN uses this localhost address to indicate a name collision. // -- -2.25.1 diff --git a/build/patches/do-not-add-suffix-to-package-name.patch b/build/patches/do-not-add-suffix-to-package-name.patch index ce9595d2b..a2dd93b2e 100644 --- a/build/patches/do-not-add-suffix-to-package-name.patch +++ b/build/patches/do-not-add-suffix-to-package-name.patch @@ -20,4 +20,3 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_p } } -- -2.25.1 diff --git a/build/patches/do-not-hide-.orig-files.patch b/build/patches/do-not-hide-.orig-files.patch index 87a998c06..797a4bc7f 100644 --- a/build/patches/do-not-hide-.orig-files.patch +++ b/build/patches/do-not-hide-.orig-files.patch @@ -20,4 +20,3 @@ diff --git a/.gitignore b/.gitignore *.props *.pyc -- -2.25.1 diff --git a/build/patches/enable-ftrivial-auto-var-init-zero.patch b/build/patches/enable-ftrivial-auto-var-init-zero.patch index 5afa35c87..1ab1191e4 100644 --- a/build/patches/enable-ftrivial-auto-var-init-zero.patch +++ b/build/patches/enable-ftrivial-auto-var-init-zero.patch @@ -23,4 +23,3 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn if (fatal_linker_warnings && !is_apple && current_os != "aix" && current_os != "zos") { -- -2.25.1 diff --git a/build/patches/exit-on-failure-of-inclusion.patch b/build/patches/exit-on-failure-of-inclusion.patch index aca0a4325..27c61edce 100644 --- a/build/patches/exit-on-failure-of-inclusion.patch +++ b/build/patches/exit-on-failure-of-inclusion.patch @@ -30,4 +30,3 @@ diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/deb eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \ "${OUTPUTDIR}/installer/theme/BRANDING") -- -2.25.1 diff --git a/build/patches/eyeo-beta-118.0.5993.48-android_api.patch b/build/patches/eyeo-beta-118.0.5993.48-android_api.patch index bec83f3bc..b773d1ef5 100644 --- a/build/patches/eyeo-beta-118.0.5993.48-android_api.patch +++ b/build/patches/eyeo-beta-118.0.5993.48-android_api.patch @@ -5352,4 +5352,3 @@ new file mode 100644 + +#endif // COMPONENTS_ADBLOCK_ANDROID_RESOURCE_CLASSIFICATION_NOTIFIER_BINDINGS_H_ -- -2.25.1 diff --git a/build/patches/eyeo-beta-118.0.5993.48-android_settings.patch b/build/patches/eyeo-beta-118.0.5993.48-android_settings.patch index f13248353..98716d113 100644 --- a/build/patches/eyeo-beta-118.0.5993.48-android_settings.patch +++ b/build/patches/eyeo-beta-118.0.5993.48-android_settings.patch @@ -3641,4 +3641,3 @@ new file mode 100644 + + -- -2.25.1 diff --git a/build/patches/eyeo-beta-118.0.5993.48-base.patch b/build/patches/eyeo-beta-118.0.5993.48-base.patch index 61223e3d2..a9120e5be 100644 --- a/build/patches/eyeo-beta-118.0.5993.48-base.patch +++ b/build/patches/eyeo-beta-118.0.5993.48-base.patch @@ -155510,4 +155510,3 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ "META": {"sizes": {"includes": [10]}}, "includes": [5260], -- -2.25.1 diff --git a/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch b/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch index 5a0aed7fa..1511b1e47 100644 --- a/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch +++ b/build/patches/eyeo-beta-118.0.5993.48-chrome_integration.patch @@ -9935,4 +9935,3 @@ new file mode 100644 + + -- -2.25.1 diff --git a/build/patches/eyeo-beta-118.0.5993.48-extension_api.patch b/build/patches/eyeo-beta-118.0.5993.48-extension_api.patch index bb25103e0..13fb07981 100644 --- a/build/patches/eyeo-beta-118.0.5993.48-extension_api.patch +++ b/build/patches/eyeo-beta-118.0.5993.48-extension_api.patch @@ -5889,4 +5889,3 @@ new file mode 100644 + } +} -- -2.25.1 diff --git a/build/patches/kill-Auth.patch b/build/patches/kill-Auth.patch index e53426540..967f8cac1 100644 --- a/build/patches/kill-Auth.patch +++ b/build/patches/kill-Auth.patch @@ -126,4 +126,3 @@ diff --git a/components/signin/public/android/java/src/org/chromium/components/s @Override -- -2.25.1 diff --git a/build/patches/kill-Location-fall-back-to-system.patch b/build/patches/kill-Location-fall-back-to-system.patch index 11a86c5bd..d6f723f7a 100644 --- a/build/patches/kill-Location-fall-back-to-system.patch +++ b/build/patches/kill-Location-fall-back-to-system.patch @@ -45,4 +45,3 @@ diff --git a/services/device/geolocation/android/java/src/org/chromium/device/ge } } -- -2.25.1 diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index 4e5fd2605..64a7947e1 100644 --- a/build/patches/kill-Vision.patch +++ b/build/patches/kill-Vision.patch @@ -126,4 +126,3 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect } } -- -2.25.1 diff --git a/build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch b/build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch index ba37c8c4f..864f1ecc8 100644 --- a/build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch +++ b/build/patches/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch @@ -22,4 +22,3 @@ diff --git a/third_party/blink/common/mime_util/mime_util.cc b/third_party/blink "text/csv", "text/tab-separated-values", -- -2.25.1 diff --git a/build/patches/net-cert-increase-default-key-length.patch b/build/patches/net-cert-increase-default-key-length.patch index c49bb3875..632b55c92 100644 --- a/build/patches/net-cert-increase-default-key-length.patch +++ b/build/patches/net-cert-increase-default-key-length.patch @@ -23,4 +23,3 @@ diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc // Certificates made by CreateKeyAndSelfSignedCert will be signed using this // digest algorithm. -- -2.25.1 diff --git a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch index 8050fe4fa..b0532b288 100644 --- a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch +++ b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch @@ -78,4 +78,3 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn include_dirs = openh264_encoder_include_dirs -- -2.25.1 diff --git a/build/patches/prefs-always-prompt-for-download-directory.patch b/build/patches/prefs-always-prompt-for-download-directory.patch index 1d179d8fb..8612a3617 100644 --- a/build/patches/prefs-always-prompt-for-download-directory.patch +++ b/build/patches/prefs-always-prompt-for-download-directory.patch @@ -41,4 +41,3 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download registry->RegisterStringPref(prefs::kDownloadExtensionsToOpen, std::string()); registry->RegisterListPref(prefs::kDownloadExtensionsToOpenByPolicy, {}); -- -2.25.1 diff --git a/build/patches/profile-resetter-disable-send-settings.patch b/build/patches/profile-resetter-disable-send-settings.patch index 31a465410..98a007099 100644 --- a/build/patches/profile-resetter-disable-send-settings.patch +++ b/build/patches/profile-resetter-disable-send-settings.patch @@ -28,4 +28,3 @@ diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/b GURL GetClientReportUrl(const std::string& report_url) { GURL url(report_url); -- -2.25.1 diff --git a/build/patches/sharing-hub-always-use-visible-URL.patch b/build/patches/sharing-hub-always-use-visible-URL.patch index 0185bf159..a1ff8bd67 100644 --- a/build/patches/sharing-hub-always-use-visible-URL.patch +++ b/build/patches/sharing-hub-always-use-visible-URL.patch @@ -28,4 +28,3 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDele private static void logCanonicalUrlResult(GURL visibleUrl, GURL canonicalUrl) { -- -2.25.1 diff --git a/build/patches/translate-disable-fetching-of-languages-from-server.patch b/build/patches/translate-disable-fetching-of-languages-from-server.patch index becd50dd2..448cf928d 100644 --- a/build/patches/translate-disable-fetching-of-languages-from-server.patch +++ b/build/patches/translate-disable-fetching-of-languages-from-server.patch @@ -27,4 +27,3 @@ diff --git a/components/translate/core/browser/translate_language_list.cc b/comp void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) { -- -2.25.1 diff --git a/build/patches/ungoogled-chromium-Disable-Gaia.patch b/build/patches/ungoogled-chromium-Disable-Gaia.patch index b04c80909..0497ba7b2 100644 --- a/build/patches/ungoogled-chromium-Disable-Gaia.patch +++ b/build/patches/ungoogled-chromium-Disable-Gaia.patch @@ -41,4 +41,3 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_ // static -- -2.25.1 diff --git a/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch b/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch index eeca1c2c8..de42ad055 100644 --- a/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch +++ b/build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch @@ -25,4 +25,3 @@ diff --git a/components/network_time/network_time_tracker.cc b/components/networ NetworkTimeTracker::FetchBehavior NetworkTimeTracker::GetFetchBehavior() const { -- -2.25.1 diff --git a/build/patches/ungoogled-chromium-Disable-intranet-detector.patch b/build/patches/ungoogled-chromium-Disable-intranet-detector.patch index 95bb81b05..8aa3504cf 100644 --- a/build/patches/ungoogled-chromium-Disable-intranet-detector.patch +++ b/build/patches/ungoogled-chromium-Disable-intranet-detector.patch @@ -26,4 +26,3 @@ diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intra DCHECK(simple_loaders_.empty() && resulting_origins_.empty()); -- -2.25.1 diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch index e510b099d..640c65e2d 100644 --- a/build/patches/ungoogled-chromium-Disable-profile-avatar.patch +++ b/build/patches/ungoogled-chromium-Disable-profile-avatar.patch @@ -52,4 +52,3 @@ diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/brow profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index); DCHECK(file_name); -- -2.25.1 diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index cdf496adf..3320db958 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -228,4 +228,3 @@ diff --git a/components/translate/core/browser/translate_script.cc b/components/ // Load embedded translate.js. data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( -- -2.25.1 diff --git a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch index 7fd0c08e8..2ccaef2af 100644 --- a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch +++ b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch @@ -74,4 +74,3 @@ diff --git a/rlz/lib/lib_values.h b/rlz/lib/lib_values.h extern const int kFinancialPort; -- -2.25.1 diff --git a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch index a9832b5ef..f6913c50e 100644 --- a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch +++ b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch @@ -20,4 +20,3 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u // Dictionaries to keep track of default tasks in the file browser. registry->RegisterDictionaryPref( -- -2.25.1 diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index 0c472495b..90acbd0e9 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -1691,4 +1691,3 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont std::make_unique( result.url_request_context.get(), -- -2.25.1 diff --git a/build/patches/updater-disable-updater-pings.patch b/build/patches/updater-disable-updater-pings.patch index f8ae7db4f..64a8a5907 100644 --- a/build/patches/updater-disable-updater-pings.patch +++ b/build/patches/updater-disable-updater-pings.patch @@ -62,4 +62,3 @@ diff --git a/components/component_updater/configurator_impl.h b/components/compo const base::TimeDelta initial_delay_; }; -- -2.25.1 diff --git a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch index 47ace74ba..644cb0765 100644 --- a/build/patches/webRTC-do-not-expose-local-IP-addresses.patch +++ b/build/patches/webRTC-do-not-expose-local-IP-addresses.patch @@ -50,4 +50,3 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d << ", multiple_routes: " << port_config.enable_multiple_routes << ", nonproxied_udp: " << port_config.enable_nonproxied_udp -- -2.25.1 diff --git a/build/patches/webview-Hard-no-to-persistent-histograms.patch b/build/patches/webview-Hard-no-to-persistent-histograms.patch index 166f6ff1c..0524573e3 100644 --- a/build/patches/webview-Hard-no-to-persistent-histograms.patch +++ b/build/patches/webview-Hard-no-to-persistent-histograms.patch @@ -33,4 +33,3 @@ diff --git a/android_webview/browser/aw_field_trials.cc b/android_webview/browse // TODO(crbug.com/1453407): Consider to migrate all WebView feature overrides -- -2.25.1