From 4f5f829926c46457159be0cc89ddf3dc3e8ac729 Mon Sep 17 00:00:00 2001 From: Blaise Date: Tue, 3 Mar 2026 13:55:12 -0600 Subject: [PATCH 1/2] Update to Chromium 145.0.7632.159 --- chromium_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_version.txt b/chromium_version.txt index 7e2b2f17..8ccec64c 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -145.0.7632.116 +145.0.7632.159 From 07eb5e64645c8fee2758ffa572189557d3eba56b Mon Sep 17 00:00:00 2001 From: Blaise Date: Thu, 26 Feb 2026 08:07:24 -0600 Subject: [PATCH 2/2] Update to Chromium 146.0.7680.65 --- chromium_version.txt | 2 +- domain_substitution.list | 380 ++++++---- ...01-fix-building-without-safebrowsing.patch | 16 +- ...03-disable-autofill-download-manager.patch | 2 +- .../0005-disable-default-extensions.patch | 2 +- .../core/inox-patchset/0021-disable-rlz.patch | 2 +- ...refixes-to-possibly-evil-connections.patch | 41 +- .../block-trk-and-subdomains.patch | 8 +- .../disable-google-host-detection.patch | 8 +- .../disable-mei-preload.patch | 6 +- .../disable-privacy-sandbox.patch | 18 +- .../disable-webrtc-log-uploader.patch | 22 +- .../disable-webstore-urls.patch | 4 +- .../core/ungoogled-chromium/doh-changes.patch | 2 +- .../extensions-manifestv2.patch | 10 +- .../fix-building-with-prunned-binaries.patch | 637 ++++++++++++++--- .../fix-building-without-safebrowsing.patch | 214 +++--- .../move-js-optimizer-unfamiliar-sites.patch | 4 +- .../remove-unused-preferences-fields.patch | 656 +++++++----------- .../toggle-translation-via-switch.patch | 8 +- ...g-flags-client-rects-and-measuretext.patch | 42 +- ...ngerprinting-canvas-image-data-noise.patch | 16 +- .../flag-max-connections-per-host.patch | 10 +- .../debian/disable/google-api-warning.patch | 2 +- .../0006-modify-default-prefs.patch | 12 +- .../0008-restore-classic-ntp.patch | 2 +- ...ble-profile-auto-import-on-first-run.patch | 2 +- .../updater-disable-auto-update.patch | 2 +- .../ungoogled-chromium/add-credits.patch | 4 +- .../add-flag-for-close-confirmation.patch | 54 +- .../add-flag-for-custom-ntp.patch | 2 +- .../add-flag-for-disabling-link-drag.patch | 2 +- .../add-flag-for-grab-handle.patch | 2 +- .../add-flag-for-incognito-themes.patch | 3 +- ...g-for-omnibox-autocomplete-filtering.patch | 13 +- ...dd-flag-for-search-engine-collection.patch | 10 +- .../add-flag-for-tab-hover-cards.patch | 12 +- .../add-flag-for-tabsearch-button.patch | 34 +- .../add-flag-to-clear-data-on-exit.patch | 8 +- ...d-flag-to-close-window-with-last-tab.patch | 6 +- ...g-to-configure-extension-downloading.patch | 4 +- .../add-flag-to-convert-popups-to-tabs.patch | 2 +- .../add-flag-to-hide-crashed-bubble.patch | 2 +- .../add-flag-to-hide-extensions-menu.patch | 12 +- .../add-flag-to-hide-fullscreen-exit-ui.patch | 2 +- .../add-flag-to-hide-tab-close-buttons.patch | 6 +- .../add-flag-to-reduce-system-info.patch | 10 +- .../add-flag-to-remove-client-hints.patch | 2 +- .../add-flag-to-scroll-tabs.patch | 8 +- .../add-flag-to-show-avatar-button.patch | 2 +- ...dd-flag-to-spoof-webgl-renderer-info.patch | 18 +- .../add-flags-for-existing-switches.patch | 2 +- ...add-flags-for-referrer-customization.patch | 14 +- .../add-ipv6-probing-option.patch | 2 +- .../add-suggestions-url-field.patch | 28 +- .../add-ungoogled-flag-headers.patch | 2 +- .../default-webrtc-ip-handling-policy.patch | 2 +- .../disable-ai-search-shortcuts.patch | 35 +- .../disable-chromelabs.patch | 4 +- .../disable-download-quarantine.patch | 4 +- .../disable-fedcm-by-default.patch | 2 +- .../disable-formatting-in-omnibox.patch | 2 +- .../enable-menu-on-reload-button.patch | 8 +- .../enable-page-saving-on-more-pages.patch | 4 +- .../enable-paste-and-go-new-tab-button.patch | 18 +- .../ungoogled-chromium/first-run-page.patch | 10 +- .../keep-expired-flags.patch | 10 +- .../prepopulated-search-engines.patch | 2 +- .../remove-uneeded-ui.patch | 43 +- .../upstream-fixes/missing-dependencies.patch | 22 +- pruning.list | 34 +- 71 files changed, 1502 insertions(+), 1094 deletions(-) diff --git a/chromium_version.txt b/chromium_version.txt index 8ccec64c..cee9e122 100644 --- a/chromium_version.txt +++ b/chromium_version.txt @@ -1 +1 @@ -145.0.7632.159 +146.0.7680.65 diff --git a/domain_substitution.list b/domain_substitution.list index c810d6e2..6465886a 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -28,7 +28,7 @@ ash/auth/views/auth_header_view_pixeltest.cc ash/birch/birch_item.cc ash/birch/birch_item_unittest.cc ash/birch/birch_model_unittest.cc -ash/capture_mode/capture_mode_camera_unittests.cc +ash/capture_mode/capture_mode_camera_unittest.cc ash/capture_mode/capture_mode_controller.cc ash/capture_mode/sunfish_unittest.cc ash/capture_mode/test_capture_mode_delegate.cc @@ -354,6 +354,7 @@ base/task/sequenced_task_runner.h base/task/single_thread_task_executor_unittest.cc base/task/single_thread_task_runner.h base/task/task_traits.h +base/task/thread_type.h base/test/file_path_reparse_point_win.cc base/test/gtest_links_unittest.cc base/test/gtest_xml_unittest_result_printer_unittest.cc @@ -370,7 +371,6 @@ base/third_party/cityhash/city.h base/third_party/nspr/prtime.cc base/third_party/nspr/prtime.h base/third_party/symbolize/symbolize.cc -base/threading/platform_thread.h base/threading/platform_thread_android.cc base/threading/platform_thread_unittest.cc base/threading/platform_thread_win.cc @@ -461,11 +461,11 @@ build/config/android/config.gni build/config/android/internal_rules.gni build/config/android/rules.gni build/config/arm.gni +build/config/c++/c++.gni build/config/c++/modules.gni build/config/chrome_build.gni build/config/chromeos/args.gni build/config/chromeos/rules.gni -build/config/clang/clang.gni build/config/compiler/BUILD.gn build/config/compiler/compiler.gni build/config/cronet/config.gni @@ -501,6 +501,7 @@ build/skia_gold_common/PRESUBMIT.py build/toolchain/check_rewrapper_cfg.py build/toolchain/cros_toolchain.gni build/toolchain/gcc_toolchain.gni +build/toolchain/kythe.gni build/toolchain/win/midl.py build/toolchain/win/rc/rc.py build/util/lib/common/google_storage_helper.py @@ -523,7 +524,6 @@ cc/metrics/scroll_jank_v4_decision_queue.h cc/metrics/scroll_jank_v4_processor.h cc/metrics/scroll_jank_v4_result.h cc/paint/paint_image.h -cc/paint/tone_map_util.cc cc/scheduler/scheduler_state_machine.cc cc/tiles/gpu_image_decode_cache.h cc/trees/layer_tree_host_impl.cc @@ -534,7 +534,6 @@ chrome/PRESUBMIT.py chrome/app/PRESUBMIT.py chrome/app/app_management_strings.grdp chrome/app/chrome_command_ids.h -chrome/app/chrome_main_delegate.cc chrome/app/chromeos_strings.grdp chrome/app/chromium_strings.grd chrome/app/delay_load_failure_hook_win.cc @@ -804,6 +803,8 @@ chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine_unittest.cc +chrome/browser/ash/net/network_diagnostics/google_services_connectivity_routine.cc +chrome/browser/ash/net/network_diagnostics/google_services_connectivity_routine_unittest.cc chrome/browser/ash/net/network_diagnostics/http_request_manager.h chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.cc chrome/browser/ash/net/network_diagnostics/network_diagnostics_unittest.cc @@ -859,11 +860,11 @@ chrome/browser/ash/system_web_apps/apps/help_app/help_app_notification_controlle chrome/browser/ash/system_web_apps/apps/personalization_app/personalization_app_sea_pen_provider_impl_unittest.cc chrome/browser/ash/system_web_apps/apps/personalization_app/personalization_app_utils_unittest.cc chrome/browser/ash/tpm/tpm_firmware_update.h -chrome/browser/ash/u2f/u2f_notification.cc chrome/browser/ash/wallpaper_handlers/google_photos_wallpaper_handlers.cc chrome/browser/ash/wallpaper_handlers/google_photos_wallpaper_handlers_unittest.cc chrome/browser/ash/wallpaper_handlers/sea_pen_fetcher.cc chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc +chrome/browser/autocomplete/aim_eligibility_refresh_navigation_throttle_unittest.cc chrome/browser/autocomplete/autocomplete_browsertest.cc chrome/browser/autocomplete/chrome_aim_eligibility_service_browsertest.cc chrome/browser/autocomplete/chrome_autocomplete_provider_client_browsertest.cc @@ -1002,8 +1003,6 @@ chrome/browser/enterprise/connectors/analysis/page_print_request_handler_unittes chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_cleanup_manager_unittest.cc chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_service_impl_unittest.cc chrome/browser/enterprise/connectors/device_trust/attestation/browser/google_keys.cc -chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc -chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command_unittest.cc chrome/browser/enterprise/connectors/device_trust/key_management/core/network/win_key_network_delegate_unittest.cc chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util_unittest.cc @@ -1087,6 +1086,7 @@ chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc chrome/browser/extensions/api/printing/printing_api_utils.h chrome/browser/extensions/api/protocol_handlers/protocol_handlers_manager_browsertest.cc chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc +chrome/browser/extensions/api/proxy_override_rules_private_apitest.cc chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_unittest.cc chrome/browser/extensions/api/runtime/runtime_apitest.cc chrome/browser/extensions/api/scripting/scripting_apitest.cc @@ -1161,8 +1161,6 @@ chrome/browser/extensions/webstore_installer_browsertest.cc chrome/browser/extensions/webstore_reinstaller_browsertest.cc chrome/browser/external_protocol/external_protocol_handler.cc chrome/browser/external_protocol/external_protocol_handler_browsertest.cc -chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher_impl.cc -chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher_impl_unittest.cc chrome/browser/favicon/favicon_utils_unittest.cc chrome/browser/feed/android/feed_reliability_logging_bridge.cc chrome/browser/feedback/android/family_info_feedback_source_unittest.cc @@ -1184,6 +1182,8 @@ chrome/browser/glic/fre/glic_fre_controller_interactive_uitest.cc chrome/browser/glic/fre/glic_fre_controller_unittest.cc chrome/browser/glic/fre/glic_fre_page_handler.cc chrome/browser/glic/glic_metrics_unittest.cc +chrome/browser/glic/glic_navigation_throttle.h +chrome/browser/glic/glic_navigation_throttle_browsertest.cc chrome/browser/glic/glic_user_status_browsertest.cc chrome/browser/glic/host/glic_annotation_manager_interactive_uitest.cc chrome/browser/glic/host/glic_api_browsertest.cc @@ -1212,10 +1212,8 @@ chrome/browser/importer/firefox_profile_lock_posix.cc chrome/browser/importer/firefox_profile_lock_win.cc chrome/browser/importer/ie_importer_browsertest_win.cc chrome/browser/importer/profile_writer_unittest.cc -chrome/browser/k_anonymity_service/k_anonymity_service_client_browsertest.cc -chrome/browser/k_anonymity_service/k_anonymity_service_client_unittest.cc -chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter_unittest.cc chrome/browser/keyboard_accessory/android/address_accessory_controller_impl_unittest.cc +chrome/browser/legion/connection_factory_impl_browsertest.cc chrome/browser/lifetime/switch_utils_unittest.cc chrome/browser/loader/from_gws_navigation_and_keep_alive_request_observer_unittest.cc chrome/browser/loader/keep_alive_request_browsertest_util.h @@ -1310,6 +1308,7 @@ chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevan chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption/most_relevant_tab_resumption_page_handler_unittest.cc chrome/browser/new_tab_page/modules/v2/tab_groups/tab_groups_page_handler.cc chrome/browser/new_tab_page/modules/v2/tab_groups/tab_groups_page_handler_unittest.cc +chrome/browser/new_tab_page/new_tab_page_realbox_interactive_uitest.cc chrome/browser/new_tab_page/new_tab_page_util_browsertest.cc chrome/browser/new_tab_page/ntp_promo/ntp_promo_interactive_uitest.cc chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc @@ -1349,7 +1348,6 @@ chrome/browser/page_load_metrics/observers/gws_page_load_metrics_observer_browse chrome/browser/page_load_metrics/observers/gws_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/initial_webui_page_load_metrics_observer.h chrome/browser/page_load_metrics/observers/loading_predictor_page_load_metrics_observer_unittest.cc -chrome/browser/page_load_metrics/observers/local_network_requests_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/multi_tab_loading_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/omnibox_suggestion_used_page_load_metrics_observer.cc chrome/browser/page_load_metrics/observers/page_anchors_metrics_observer_browsertest.cc @@ -1360,6 +1358,9 @@ chrome/browser/page_load_metrics/observers/protocol_page_load_metrics_observer_u chrome/browser/page_load_metrics/observers/scheme_page_load_metrics_observer_unittest.cc chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc chrome/browser/partnerbookmarks/partner_bookmarks_reader.cc +chrome/browser/password_manager/actor_login/internal/actor_login_federated_credentials_fetcher.cc +chrome/browser/password_manager/actor_login/internal/siwg_button_finder.cc +chrome/browser/password_manager/actor_login/internal/siwg_button_finder_unittest.cc chrome/browser/password_manager/android/all_passwords_bottom_sheet_controller_unittest.cc chrome/browser/password_manager/android/chromesync_status_code.h chrome/browser/password_manager/android/credential_leak_controller_android_unittest.cc @@ -1371,6 +1372,7 @@ chrome/browser/password_manager/android/unified_password_manager_proto_utils_uni chrome/browser/password_manager/chrome_password_manager_client_unittest.cc chrome/browser/password_manager/password_change_delegate_impl_unittest.cc chrome/browser/password_manager/password_manager_browsertest.cc +chrome/browser/password_manager/password_manager_captured_sites_interactive_uitest.cc chrome/browser/password_manager/password_manager_signin_intercept_test_helper.cc chrome/browser/password_manager/password_manager_util_win.cc chrome/browser/payments/android_payment_app_factory_browsertest.cc @@ -1380,7 +1382,7 @@ chrome/browser/payments/payment_request_app_store_billing_browsertest.cc chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc chrome/browser/performance_manager/mechanisms/termination_target_setter.h chrome/browser/performance_manager/policies/discard_eligibility_policy_unittest.cc -chrome/browser/performance_manager/policies/priority_boost_disabler.cc +chrome/browser/performance_manager/policies/priority_boost_helpers.cc chrome/browser/performance_manager/policies/report_page_processes_policy.cc chrome/browser/permissions/notifications_engagement_service_unittest.cc chrome/browser/permissions/permission_context_base_permissions_policy_unittest.cc @@ -1391,8 +1393,8 @@ chrome/browser/permissions/permissions_security_model_interactive_uitest.cc chrome/browser/permissions/prediction_service/prediction_service_browsertest.cc chrome/browser/permissions/quiet_permission_prompt_model_android.cc chrome/browser/policy/cloud/cloud_policy_browsertest.cc -chrome/browser/policy/cloud/cloud_policy_invalidator.h chrome/browser/policy/cloud/device_management_service_browsertest.cc +chrome/browser/policy/cloud/policy_invalidator.h chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc chrome/browser/policy/developer_tools_policy_checker_unittest.cc chrome/browser/policy/extension_policy_browsertest.cc @@ -1427,6 +1429,7 @@ chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc chrome/browser/prefs/pref_functional_browsertest.cc chrome/browser/prefs/pref_metrics_service.cc chrome/browser/prefs/session_startup_pref_unittest.cc +chrome/browser/preloading/new_tab_page_preload/new_tab_page_preload_browsertest.cc chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_unittest.cc chrome/browser/preloading/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc chrome/browser/preloading/prefetch/no_state_prefetch/tools/prerender_test_server/index.html @@ -1513,10 +1516,8 @@ chrome/browser/resources/bookmarks/command_manager.ts chrome/browser/resources/browsing_topics/browsing_topics_internals.html chrome/browser/resources/certificate_manager/certificate_manager_icons.html chrome/browser/resources/chromeos/about_os_credits.html -chrome/browser/resources/chromeos/accessibility/accessibility_common/mv2/dictation/macros/list_commands_macro.ts -chrome/browser/resources/chromeos/accessibility/accessibility_common/mv2/facegaze/mouse_controller.ts -chrome/browser/resources/chromeos/accessibility/accessibility_common/mv3/dictation/macros/list_commands_macro.ts -chrome/browser/resources/chromeos/accessibility/accessibility_common/mv3/facegaze/mouse_controller.ts +chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/macros/list_commands_macro.ts +chrome/browser/resources/chromeos/accessibility/accessibility_common/facegaze/mouse_controller.ts chrome/browser/resources/chromeos/accessibility/chromevox/mv2/background/background_test.js chrome/browser/resources/chromeos/accessibility/chromevox/mv2/background/braille/braille_input_handler_test.js chrome/browser/resources/chromeos/accessibility/chromevox/mv2/background/editing/editable_text_test.js @@ -1542,10 +1543,9 @@ chrome/browser/resources/chromeos/accessibility/common/paragraph_utils_unittest. chrome/browser/resources/chromeos/accessibility/common/testing/mock_tts.js chrome/browser/resources/chromeos/accessibility/common/tutorial/chromevox_tutorial.js chrome/browser/resources/chromeos/accessibility/definitions/command_line_private.d.ts -chrome/browser/resources/chromeos/accessibility/select_to_speak/mv2/select_to_speak.ts -chrome/browser/resources/chromeos/accessibility/select_to_speak/mv3/select_to_speak.ts -chrome/browser/resources/chromeos/accessibility/select_to_speak/mv3/select_to_speak_navigation_control_test.js -chrome/browser/resources/chromeos/accessibility/select_to_speak/mv3/select_to_speak_unittest.js +chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.ts +chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_navigation_control_test.js +chrome/browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_unittest.js chrome/browser/resources/chromeos/accessibility/select_to_speak_manifest.json.jinja2 chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp chrome/browser/resources/chromeos/accessibility/switch_access/mv3/item_scan_manager_test.js @@ -1599,7 +1599,7 @@ chrome/browser/resources/hangout_services/manifest_v2.json chrome/browser/resources/hangout_services/manifest_v3.json chrome/browser/resources/inspect/inspect.html chrome/browser/resources/key_value_pair_viewer_shared/key_value_pair_entry.ts -chrome/browser/resources/management/management_ui.ts +chrome/browser/resources/management/promotion_banner.ts chrome/browser/resources/media/mei_preload/manifest.json chrome/browser/resources/media/webrtc_logs.ts chrome/browser/resources/media_router/cast_feedback/cast_feedback_ui.ts @@ -1670,6 +1670,7 @@ chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_uni chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc chrome/browser/safe_browsing/extension_telemetry/potential_password_theft_signal_processor_unittest.cc chrome/browser/safe_browsing/extension_telemetry/remote_host_contacted_signal_processor_unittest.cc +chrome/browser/safe_browsing/gemini_antiscam_protection/gemini_antiscam_protection_service_browsertest.cc chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc @@ -1689,7 +1690,6 @@ chrome/browser/save_to_drive/resumable_drive_uploader.cc chrome/browser/save_to_drive/resumable_drive_uploader_unittest.cc chrome/browser/save_to_drive/save_to_drive_flow_browsertest.cc chrome/browser/search/background/ntp_custom_background_service.cc -chrome/browser/search/ntp_features_unittest.cc chrome/browser/search/search.h chrome/browser/search_engine_choice/search_engine_choice_dialog_browsertest.cc chrome/browser/search_engines/template_url_parser_unittest.cc @@ -1755,12 +1755,13 @@ chrome/browser/signin/header_modification_delegate_impl_unittest.cc chrome/browser/signin/mirror_browsertest.cc chrome/browser/signin/mirror_interactive_uitest.cc chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc -chrome/browser/signin/signin_manager_unittest.cc chrome/browser/signin/signin_promo_unittest.cc chrome/browser/signin/signin_ui_util.cc chrome/browser/signin/signin_ui_util_browsertest.cc +chrome/browser/signin/signin_util.cc chrome/browser/signin/signin_util_unittest.cc chrome/browser/signin/signin_util_win_browsertest.cc +chrome/browser/skills/skills_update_observer_unittest.cc chrome/browser/smart_card/smart_card_reader_tracker_impl.h chrome/browser/ssl/ask_before_http_dialog_controller.cc chrome/browser/ssl/cert_verifier_platform_browser_test.h @@ -1772,7 +1773,7 @@ chrome/browser/ssl/ssl_browsertest.cc chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc chrome/browser/ssl/typed_navigation_upgrade_throttle_interactive_uitest.cc chrome/browser/startup_data.h -chrome/browser/storage/durable_storage_permission_context_unittest.cc +chrome/browser/storage/persistent_storage_permission_context_unittest.cc chrome/browser/storage/shared_storage_browsertest.cc chrome/browser/subresource_filter/subresource_filter_browsertest.cc chrome/browser/subresource_filter/subresource_filter_fenced_frame_browsertest.cc @@ -1829,14 +1830,14 @@ chrome/browser/sync/test/integration/web_apps/two_client_web_apps_sync_test.cc chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc chrome/browser/sync_file_system/sync_file_system_service.h chrome/browser/tab_contents/navigation_metrics_recorder_browsertest.cc +chrome/browser/tab_list/tab_list_interface_observer.h chrome/browser/tab_ui/android/java/strings/android_tab_ui_strings.grd -chrome/browser/task_manager/sampling/shared_sampler_win_defines.h chrome/browser/themes/theme_syncable_service.cc chrome/browser/translate/translate_manager_browsertest.cc chrome/browser/trusted_vault/trusted_vault_encryption_keys_tab_helper_browsertest.cc chrome/browser/ui/accelerator_table.cc -chrome/browser/ui/android/browser_navigator_android_browsertest.cc chrome/browser/ui/android/extensions/extension_action_popup_contents.cc +chrome/browser/ui/android/extensions/windowing/test/test_extension/default_popup.html chrome/browser/ui/android/strings/android_chrome_strings.grd chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc chrome/browser/ui/ash/arc/arc_open_url_delegate_impl_browsertest.cc @@ -1907,8 +1908,7 @@ chrome/browser/ui/browser_navigator_browsertest.cc chrome/browser/ui/browser_navigator_browsertest_chromeos.cc chrome/browser/ui/browser_navigator_params.h chrome/browser/ui/browser_tabstrip_browsertest_chromeos.cc -chrome/browser/ui/browser_window/internal/android/android_browser_window_browsertest.cc -chrome/browser/ui/browser_window/internal/android/create_browser_window_android_browsertest.cc +chrome/browser/ui/browser_window/test/android/browser_window_android_browsertest_base.cc chrome/browser/ui/chrome_pages.cc chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_browsertest.mm chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -1920,7 +1920,6 @@ chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm chrome/browser/ui/cocoa/share_menu_controller.mm chrome/browser/ui/cocoa/share_menu_controller_browsertest.mm chrome/browser/ui/commerce/price_tracking_page_action_controller.cc -chrome/browser/ui/commerce/product_specifications_entry_point_controller.cc chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc chrome/browser/ui/crypto_module_password_dialog_nss.cc @@ -1976,6 +1975,8 @@ chrome/browser/ui/passwords/well_known_change_password_navigation_throttle_unitt chrome/browser/ui/plus_addresses/android/all_plus_addresses_bottom_sheet_view_browsertest.cc chrome/browser/ui/plus_addresses/plus_address_menu_model_unittest.cc chrome/browser/ui/profiles/profile_picker_unittest.cc +chrome/browser/ui/read_anything/read_anything_entry_point_controller.cc +chrome/browser/ui/read_anything/read_anything_entry_point_controller_browsertest.cc chrome/browser/ui/safety_hub/disruptive_notification_permissions_manager_unittest.cc chrome/browser/ui/safety_hub/notification_permission_review_service_unittest.cc chrome/browser/ui/safety_hub/password_status_check_service_unittest.cc @@ -1984,7 +1985,6 @@ chrome/browser/ui/search/search_tab_helper.h chrome/browser/ui/search/third_party_ntp_browsertest.cc chrome/browser/ui/search_engines/template_url_table_model_unittest.cc chrome/browser/ui/signin/account_settings_page_pixel_browsertest.cc -chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice_browsertest.cc chrome/browser/ui/signin/dice_migration_service.cc chrome/browser/ui/signin/dice_migration_service_browsertest.cc chrome/browser/ui/signin/dice_migration_service_interactive_uitest.cc @@ -1997,6 +1997,7 @@ chrome/browser/ui/singleton_tabs_browsertest.cc chrome/browser/ui/startup/chrome_for_testing_infobar_delegate.cc chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc chrome/browser/ui/startup/first_run_service_unittest.cc +chrome/browser/ui/startup/google_chrome_scheme_util_unittest.cc chrome/browser/ui/startup/launch_mode_recorder_unittest.cc chrome/browser/ui/startup/startup_browser_creator_browsertest.cc chrome/browser/ui/startup/startup_tab_provider_unittest.cc @@ -2011,7 +2012,6 @@ chrome/browser/ui/tabs/saved_tab_groups/collaboration_messaging_tab_data_unittes chrome/browser/ui/tabs/saved_tab_groups/instant_message_queue_processor_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/tab_group_menu_utils_unittest.cc chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_browsertest.cc -chrome/browser/ui/tabs/tab_list_interface_observer.h chrome/browser/ui/tabs/tab_strip_api/tab_strip_service_impl_browsertest.cc chrome/browser/ui/tabs/tab_strip_model_unittest.cc chrome/browser/ui/test/popup_browsertest.cc @@ -2121,7 +2121,6 @@ chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest chrome/browser/ui/views/webauthn/passkey_upgrade_bubble_view.cc chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_browsertest.cc chrome/browser/ui/wallet/walletable_pass_save_bubble_view_browsertest.cc -chrome/browser/ui/web_applications/sub_apps_admin_policy_browsertest.cc chrome/browser/ui/web_applications/web_app_browsertest.cc chrome/browser/ui/web_applications/web_app_navigate_browsertest.cc chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc @@ -2230,6 +2229,7 @@ chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc chrome/browser/ui/webui/signin/sync_confirmation_ui.cc chrome/browser/ui/webui/signin/turn_sync_on_helper_browsertest.cc chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc +chrome/browser/ui/webui/skills/skills_dialog_handler_unittest.cc chrome/browser/ui/webui/theme_source_unittest.cc chrome/browser/ui/webui/webui_allowlist_provider_unittest.cc chrome/browser/ui/webui/whats_new/whats_new_fetcher.cc @@ -2278,6 +2278,7 @@ chrome/browser/web_applications/preinstalled_web_apps/preinstalled_web_apps.cc chrome/browser/web_applications/preinstalled_web_apps/vids.cc chrome/browser/web_applications/preinstalled_web_apps/youtube.cc chrome/browser/web_applications/preinstalled_web_apps_browsertest.cc +chrome/browser/web_applications/sub_apps_admin_policy_browsertest.cc chrome/browser/web_applications/web_app_command_scheduler.cc chrome/browser/web_applications/web_app_helpers_unittest.cc chrome/browser/web_applications/web_app_install_utils_unittest.cc @@ -2578,7 +2579,6 @@ chrome/test/enterprise/e2e/webstore/enterprise_cws/enterprise_cws_webdriver.py chrome/test/fuzzing/atspi_in_process_fuzzer.cc chrome/test/fuzzing/in_process_fuzzer.cc chrome/test/interaction/interactive_browser_test_interactive_uitest.cc -chrome/test/media/performance/openscreen_cast_performance_test.py chrome/test/media_router/media_router_gmc_ui_for_test.cc chrome/test/mini_installer/PRESUBMIT.py chrome/test/mini_installer/create_zip.py @@ -2680,6 +2680,7 @@ chromeos/ash/components/data_migration/data_migration.cc chromeos/ash/components/dbus/arc/arc_obb_mounter_client.h chromeos/ash/components/dbus/biod/fake_biod_client_unittest.cc chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h +chromeos/ash/components/dbus/debug_daemon/fake_debug_daemon_client.cc chromeos/ash/components/dbus/dlcservice/dlcservice_client.h chromeos/ash/components/dbus/fwupd/fwupd_client.cc chromeos/ash/components/dbus/fwupd/fwupd_client_unittest.cc @@ -2736,7 +2737,7 @@ chromeos/ash/experiences/arc/net/passpoint_dialog_view.cc chromeos/ash/experiences/arc/session/arc_upgrade_params.h chromeos/ash/experiences/arc/session/serial_number_util_unittest.cc chromeos/ash/experiences/arc/volume_mounter/arc_volume_mounter_bridge_unittest.cc -chromeos/ash/experiences/guest_os/borealis/motd/borealis_motd_dialog.cc +chromeos/ash/experiences/guest_os/borealis/motd/borealis_motd_ui.cc chromeos/ash/services/device_sync/cryptauth_api_call_flow_unittest.cc chromeos/ash/services/device_sync/cryptauth_client_impl.cc chromeos/ash/services/device_sync/cryptauth_client_impl_unittest.cc @@ -2783,6 +2784,7 @@ chromeos/printing/uri_fuzzer_seed_corpus/uri49.txt chromeos/printing/uri_fuzzer_seed_corpus/uri5.txt components/BUILD.gn components/account_manager_core/account_manager_facade_impl_unittest.cc +components/activity_reporter/constants.h components/affiliations/core/browser/affiliation_utils.h components/affiliations/core/browser/affiliation_utils_unittest.cc components/affiliations/core/browser/hash_affiliation_fetcher.cc @@ -2806,7 +2808,7 @@ components/autofill/core/browser/data_manager/addresses/account_name_email_store components/autofill/core/browser/data_manager/addresses/address_data_cleaner_unittest.cc components/autofill/core/browser/data_manager/addresses/address_data_manager_unittest.cc components/autofill/core/browser/data_manager/payments/payments_data_manager_unittest.cc -components/autofill/core/browser/data_model/addresses/autofill_profile_unittest.cc +components/autofill/core/browser/data_model/valuables/loyalty_card_unittest.cc components/autofill/core/browser/form_import/form_data_importer_unittest.cc components/autofill/core/browser/form_qualifiers_unittest.cc components/autofill/core/browser/form_structure_unittest.cc @@ -2956,7 +2958,6 @@ components/cronet/gn2bp/gen_android_bp.py components/cronet/gn2bp/gn_utils.py components/cronet/gn2bp/run_gn2bp.py components/cronet/license/license_utils.py -components/cronet/native/cronet.idl components/cronet/tools/cr_cronet.py components/cronet/tools/utils.py components/custom_handlers/protocol_handler_registry_unittest.cc @@ -2968,15 +2969,15 @@ components/data_sharing/internal/preview_server_proxy_unittest.cc components/data_sharing/public/data_sharing_network_utils.h components/data_sharing/public/features.cc components/data_sharing/public/group_data.h -components/desks_storage/core/admin_template_service_unittests.cc -components/desks_storage/core/desk_model_wrapper_unittests.cc +components/desks_storage/core/admin_template_service_unittest.cc +components/desks_storage/core/desk_model_wrapper_unittest.cc components/desks_storage/core/desk_sync_bridge_unittest.cc components/desks_storage/core/desk_template_conversion.cc -components/desks_storage/core/desk_template_conversion_unittests.cc -components/desks_storage/core/desk_template_semantics_unittests.cc +components/desks_storage/core/desk_template_conversion_unittest.cc +components/desks_storage/core/desk_template_semantics_unittest.cc components/desks_storage/core/desk_test_util.h -components/desks_storage/core/desk_test_util_unittests.cc -components/desks_storage/core/local_desk_data_manager_unittests.cc +components/desks_storage/core/desk_test_util_unittest.cc +components/desks_storage/core/local_desk_data_manager_unittest.cc components/device_signals/core/browser/android/android_os_signals_collector_unittest.cc components/device_signals/core/browser/browser_utils.cc components/device_signals/core/browser/desktop/desktop_os_signals_collector_unittest.cc @@ -2984,10 +2985,11 @@ components/device_signals/core/common/win/platform_utils_win.cc components/device_signals/core/common/win/win_types.h components/device_signals/core/system_signals/win/wsc_client.h components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc +components/dom_distiller/content/browser/distiller_referrer_throttle_unittest.cc components/dom_distiller/content/browser/dom_distiller_viewer_source.cc components/dom_distiller/core/html/dom_distiller_viewer.html components/dom_distiller/core/html/preview.html -components/dom_distiller/core/javascript/dom_distiller_viewer.js +components/dom_distiller/core/javascript/content_processing.js components/dom_distiller/core/url_utils_unittest.cc components/dom_distiller/core/viewer.cc components/domain_reliability/bake_in_configs.py @@ -3000,7 +3002,9 @@ components/drive/service/drive_service_interface.h components/drive/service/fake_drive_service.cc components/embedder_support/android/BUILD.gn components/endpoint_fetcher/endpoint_fetcher_unittest.cc -components/enterprise/browser/reporting/saas_domain/domain_reporting_aggregation_utils_unittest.cc +components/enterprise/browser/reporting/saas_usage/saas_usage_aggregation_utils_unittest.cc +components/enterprise/browser/reporting/saas_usage/saas_usage_report_factory_unittest.cc +components/enterprise/browser/reporting/saas_usage/saas_usage_reporting_controller_unittest.cc components/enterprise/connectors/core/cloud_content_scanning/resumable_uploader_base_unittest.cc components/enterprise/connectors/core/content_area_user_provider.cc components/enterprise/connectors/core/content_area_user_provider.h @@ -3064,6 +3068,7 @@ components/gwp_asan/client/extreme_lightweight_detector_quarantine.h components/history/core/browser/BUILD.gn components/history/core/browser/browsing_history_service.cc components/history/core/browser/expire_history_backend_unittest.cc +components/history/core/browser/features.cc components/history/core/browser/history_backend.cc components/history/core/browser/history_backend.h components/history/core/browser/history_backend_notifier.h @@ -3111,13 +3116,14 @@ components/input/render_widget_host_input_event_router.cc components/input/render_widget_host_input_event_router.h components/input/render_widget_host_view_input.h components/input/touch_action_filter.h -components/input/utils.cc components/invalidation/impl/per_user_topic_subscription_manager.cc components/invalidation/impl/per_user_topic_subscription_manager_unittest.cc components/javascript_dialogs/tab_modal_dialog_manager.cc components/javascript_dialogs_strings.grdp components/keyed_service/core/keyed_service_base_factory.cc components/keyed_service/core/simple_keyed_service_factory.h +components/legion/attestation/handler_impl_unittest.cc +components/legion/attestation/server_verification_key_unittest.cc components/legion/phosphor/config_http.cc components/legion/websocket_client.cc components/lens/lens_features.cc @@ -3263,6 +3269,7 @@ components/optimization_guide/core/hints/optimization_metadata_unittest.cc components/optimization_guide/core/inference/model_handler_unittest.cc components/optimization_guide/core/inference/tflite_model_executor_unittest.cc components/optimization_guide/core/model_execution/json_response_parser_unittest.cc +components/optimization_guide/core/model_execution/model_execution_fetcher.cc components/optimization_guide/core/model_execution/model_execution_fetcher_impl.cc components/optimization_guide/core/model_execution/model_execution_fetcher_impl_unittest.cc components/optimization_guide/core/model_execution/model_execution_manager_unittest.cc @@ -3445,7 +3452,6 @@ components/permissions/prediction_service/prediction_model_handler.cc components/permissions/prediction_service/prediction_service_base.h components/permissions/test/mock_permission_request.h components/permissions_strings.grdp -components/persistent_cache/sqlite/vfs/sandboxed_file.cc components/plus_addresses/core/browser/metrics/plus_address_submission_logger_unittest.cc components/plus_addresses/core/browser/plus_address_http_client_impl.cc components/plus_addresses/core/browser/plus_address_http_client_impl_unittest.cc @@ -3535,6 +3541,10 @@ components/policy/test/data/pref_mapping/LocalFontsAllowedForUrls.json components/policy/test/data/pref_mapping/LocalFontsBlockedForUrls.json components/policy/test/data/pref_mapping/LocalNetworkAccessAllowedForUrls.json components/policy/test/data/pref_mapping/LocalNetworkAccessBlockedForUrls.json +components/policy/test/data/pref_mapping/LocalNetworkAllowedForUrls.json +components/policy/test/data/pref_mapping/LocalNetworkBlockedForUrls.json +components/policy/test/data/pref_mapping/LoopbackNetworkAllowedForUrls.json +components/policy/test/data/pref_mapping/LoopbackNetworkBlockedForUrls.json components/policy/test/data/pref_mapping/ManagedBookmarks.json components/policy/test/data/pref_mapping/MultiScreenCaptureAllowedForUrls.json components/policy/test/data/pref_mapping/NotificationsAllowedForUrls.json @@ -3549,8 +3559,8 @@ components/policy/test/data/pref_mapping/ReportWebsiteActivityAllowlist.json components/policy/test/data/pref_mapping/ReportWebsiteTelemetryAllowlist.json components/policy/test/data/pref_mapping/RestoreOnStartupURLs.json components/policy/test/data/pref_mapping/RestrictSigninToPattern.json -components/policy/test/data/pref_mapping/SaaSReportDomainUrlsForBrowser.json -components/policy/test/data/pref_mapping/SaaSReportDomainUrlsForProfile.json +components/policy/test/data/pref_mapping/SaasUsageReportingDomainUrlsForBrowsers.json +components/policy/test/data/pref_mapping/SaasUsageReportingDomainUrlsForProfiles.json components/policy/test/data/pref_mapping/SafeBrowsingAllowlistDomains.json components/policy/test/data/pref_mapping/SameOriginTabCaptureAllowedByOrigins.json components/policy/test/data/pref_mapping/ScreenCaptureAllowedByOrigins.json @@ -3560,7 +3570,6 @@ components/policy/test/data/pref_mapping/SerialAllowAllPortsForUrls.json components/policy/test/data/pref_mapping/SerialAllowUsbDevicesForUrls.json components/policy/test/data/pref_mapping/SerialBlockedForUrls.json components/policy/test/data/pref_mapping/TabCaptureAllowedByOrigins.json -components/policy/test/data/pref_mapping/ThirdPartyStoragePartitioningBlockedForOrigins.json components/policy/test/data/pref_mapping/URLAllowlist.json components/policy/test/data/pref_mapping/URLBlocklist.json components/policy/test/data/pref_mapping/VideoCaptureAllowedUrls.json @@ -3596,11 +3605,7 @@ components/policy/tools/template_writers/writers/json_writer_unittest.py components/policy/tools/template_writers/writers/template_writer.py components/policy/tools/template_writers/writers/template_writer_unittest.py components/policy_strings.grdp -components/power_bookmarks/common/power.cc -components/power_bookmarks/common/power_unittest.cc -components/power_bookmarks/core/power_bookmark_service_unittest.cc components/power_bookmarks/core/power_bookmark_utils_unittest.cc -components/power_bookmarks/storage/power_bookmark_database_impl_unittest.cc components/power_metrics/energy_metrics_provider_win.cc components/prefs/pref_change_registrar.cc components/prefs/pref_change_registrar_unittest.cc @@ -3623,57 +3628,109 @@ components/reporting/encryption/testing_primitives.cc components/reporting/storage/storage_queue_unittest.cc components/resources/PRESUBMIT.py components/resources/terms/terms_am.html +components/resources/terms/terms_am.txt components/resources/terms/terms_ar.html +components/resources/terms/terms_ar.txt components/resources/terms/terms_bg.html +components/resources/terms/terms_bg.txt components/resources/terms/terms_bn.html +components/resources/terms/terms_bn.txt components/resources/terms/terms_ca.html +components/resources/terms/terms_ca.txt components/resources/terms/terms_cs.html +components/resources/terms/terms_cs.txt components/resources/terms/terms_da.html +components/resources/terms/terms_da.txt components/resources/terms/terms_de.html +components/resources/terms/terms_de.txt components/resources/terms/terms_el.html +components/resources/terms/terms_el.txt components/resources/terms/terms_en-GB.html +components/resources/terms/terms_en-GB.txt components/resources/terms/terms_en.html +components/resources/terms/terms_en.txt components/resources/terms/terms_es-419.html +components/resources/terms/terms_es-419.txt components/resources/terms/terms_es.html +components/resources/terms/terms_es.txt components/resources/terms/terms_et.html +components/resources/terms/terms_et.txt components/resources/terms/terms_fa.html +components/resources/terms/terms_fa.txt components/resources/terms/terms_fi.html +components/resources/terms/terms_fi.txt components/resources/terms/terms_fil.html +components/resources/terms/terms_fil.txt components/resources/terms/terms_fr.html +components/resources/terms/terms_fr.txt components/resources/terms/terms_gu.html +components/resources/terms/terms_gu.txt components/resources/terms/terms_he.html +components/resources/terms/terms_he.txt components/resources/terms/terms_hi.html +components/resources/terms/terms_hi.txt components/resources/terms/terms_hr.html +components/resources/terms/terms_hr.txt components/resources/terms/terms_hu.html +components/resources/terms/terms_hu.txt components/resources/terms/terms_id.html +components/resources/terms/terms_id.txt components/resources/terms/terms_it.html +components/resources/terms/terms_it.txt components/resources/terms/terms_ja.html +components/resources/terms/terms_ja.txt components/resources/terms/terms_kn.html +components/resources/terms/terms_kn.txt components/resources/terms/terms_ko.html +components/resources/terms/terms_ko.txt components/resources/terms/terms_lt.html +components/resources/terms/terms_lt.txt components/resources/terms/terms_lv.html +components/resources/terms/terms_lv.txt components/resources/terms/terms_ml.html +components/resources/terms/terms_ml.txt components/resources/terms/terms_mr.html +components/resources/terms/terms_mr.txt components/resources/terms/terms_nb.html +components/resources/terms/terms_nb.txt components/resources/terms/terms_nl.html +components/resources/terms/terms_nl.txt components/resources/terms/terms_pl.html +components/resources/terms/terms_pl.txt components/resources/terms/terms_pt-BR.html +components/resources/terms/terms_pt-BR.txt components/resources/terms/terms_pt-PT.html +components/resources/terms/terms_pt-PT.txt components/resources/terms/terms_ro.html +components/resources/terms/terms_ro.txt components/resources/terms/terms_ru.html +components/resources/terms/terms_ru.txt components/resources/terms/terms_sk.html +components/resources/terms/terms_sk.txt components/resources/terms/terms_sl.html +components/resources/terms/terms_sl.txt components/resources/terms/terms_sr.html +components/resources/terms/terms_sr.txt components/resources/terms/terms_sv.html +components/resources/terms/terms_sv.txt components/resources/terms/terms_sw.html +components/resources/terms/terms_sw.txt components/resources/terms/terms_ta.html +components/resources/terms/terms_ta.txt components/resources/terms/terms_te.html +components/resources/terms/terms_te.txt components/resources/terms/terms_th.html +components/resources/terms/terms_th.txt components/resources/terms/terms_tr.html +components/resources/terms/terms_tr.txt components/resources/terms/terms_uk.html +components/resources/terms/terms_uk.txt components/resources/terms/terms_vi.html +components/resources/terms/terms_vi.txt components/resources/terms/terms_zh-CN.html +components/resources/terms/terms_zh-CN.txt components/resources/terms/terms_zh-TW.html +components/resources/terms/terms_zh-TW.txt components/rlz/rlz_tracker.h components/safe_browsing/android/real_time_url_checks_allowlist_resource_file_unittest.cc components/safe_browsing/android/real_time_url_checks_allowlist_unittest.cc @@ -3735,6 +3792,7 @@ components/search_engines/android/template_url_service_android_unittest.cc components/search_engines/choice_made_location.h components/search_engines/enterprise/default_search_policy_handler_unittest.cc components/search_engines/keyword_table_unittest.cc +components/search_engines/reconciling_template_url_data_holder_unittest.cc components/search_engines/template_url.cc components/search_engines/template_url_data_unittest.cc components/search_engines/template_url_prepopulate_data_unittest.cc @@ -3811,6 +3869,7 @@ components/signin/internal/identity_manager/account_tracker_service_unittest.cc components/signin/internal/identity_manager/gaia_cookie_manager_service.cc components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate.cc components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc +components/signin/internal/identity_manager/oauth_multilogin_helper.cc components/signin/internal/identity_manager/oauth_multilogin_helper_unittest.cc components/signin/internal/identity_manager/primary_account_manager_unittest.cc components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc @@ -3844,9 +3903,13 @@ components/site_engagement/content/site_engagement_helper.cc components/site_engagement/content/site_engagement_helper_unittest.cc components/site_engagement/content/site_engagement_score_unittest.cc components/site_isolation/site_isolation_policy_unittest.cc +components/skills/internal/skills_downloader.cc +components/skills/internal/skills_downloader_unittest.cc +components/skills/internal/skills_service_impl_unittest.cc components/speech/endpointer/energy_endpointer.cc components/spellcheck/browser/spelling_service_client.cc components/spellcheck/browser/windows_spell_checker.cc +components/sqlite_vfs/sandboxed_file.cc components/ssl_errors/error_classification.h components/ssl_errors/error_classification_unittest.cc components/startup_metric_utils/browser/startup_metric_utils.cc @@ -3856,6 +3919,11 @@ components/subresource_filter/content/browser/content_subresource_filter_web_con components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h components/subresource_filter/core/browser/subresource_filter_constants.h components/subresource_filter/core/common/PRESUBMIT.py +components/supervised_user/core/browser/family_link_settings_service_unittest.cc +components/supervised_user/core/browser/family_link_url_filter.cc +components/supervised_user/core/browser/family_link_url_filter.h +components/supervised_user/core/browser/family_link_url_filter_manual_behavior_unittest.cc +components/supervised_user/core/browser/family_link_url_filter_unittest.cc components/supervised_user/core/browser/family_link_user_capabilities_unittest.cc components/supervised_user/core/browser/fetcher_config.cc components/supervised_user/core/browser/fetcher_config.h @@ -3866,11 +3934,8 @@ components/supervised_user/core/browser/proto_fetcher_status.h components/supervised_user/core/browser/proto_fetcher_unittest.cc components/supervised_user/core/browser/supervised_user_log_record_unittest.cc components/supervised_user/core/browser/supervised_user_service_unittest.cc -components/supervised_user/core/browser/supervised_user_settings_service_unittest.cc components/supervised_user/core/browser/supervised_user_synthetic_field_trial_service_delegate.h -components/supervised_user/core/browser/supervised_user_url_filter.cc -components/supervised_user/core/browser/supervised_user_url_filter.h -components/supervised_user/core/browser/supervised_user_url_filter_unittest.cc +components/supervised_user/core/browser/supervised_user_url_filtering_service_android_unittest.cc components/supervised_user/core/browser/supervised_user_utils.cc components/supervised_user/core/common/supervised_user_constants.cc components/supervised_user/core/common/supervised_user_shared_constants.cc @@ -3879,6 +3944,8 @@ components/supervised_user/test_support/account_repository_unittest.cc components/supervised_user/test_support/family_link_settings_state_management.cc components/supervised_user/test_support/kids_chrome_management_test_utils.cc components/supervised_user/test_support/kids_management_api_server_mock.cc +components/surface_embed/common/features.cc +components/surface_embed/common/features.h components/sync/PRESUBMIT.py components/sync/base/data_type.cc components/sync/base/sync_util.h @@ -3909,7 +3976,6 @@ components/themes/ntp_background_service.cc components/touch_to_search/core/browser/contextual_search_context.h components/touch_to_search/core/browser/contextual_search_delegate_impl.cc components/touch_to_search/core/browser/contextual_search_delegate_impl_unittest.cc -components/tpcd/enterprise_reporting/enterprise_reporting_tab_helper_unittest.cc components/tpcd/metadata/browser/parser_unittest.cc components/tracing/common/etw_consumer_win.cc components/tracing/common/etw_consumer_win.h @@ -3977,7 +4043,7 @@ components/variations/net/omnibox_autofocus_http_headers_unittest.cc components/variations/net/omnibox_autofocus_url_loader_throttle_unittest.cc components/variations/net/variations_http_headers.cc components/variations/net/variations_http_headers_unittest.cc -components/variations/pref_names.cc +components/variations/pref_names.h components/variations/proto/PRESUBMIT.py components/variations/proto/devtools/client_variations_uncompiled.js components/variations/service/safe_seed_manager.cc @@ -4007,8 +4073,8 @@ components/viz/service/display/renderer_pixeltest.cc components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc components/viz/service/display_embedder/skia_render_copy_results.cc components/viz/service/input/input_manager.cc +components/wallet/core/browser/ingestion/walletable_pass_ingestion_controller_unittest.cc components/wallet/core/browser/network/wallet_http_client_impl.cc -components/wallet/core/browser/walletable_pass_ingestion_controller_unittest.cc components/wallet/core/browser/walletable_permission_utils_unittest.cc components/wallet_strings.grdp components/webapps/browser/android/add_to_homescreen_data_fetcher_unittest.cc @@ -4036,6 +4102,7 @@ components/zucchini/exception_filter_helper_win.cc components/zucchini/type_dex.h content/app/content_main_runner_impl.cc content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +content/app_shim_remote_cocoa/web_menu_runner_mac.mm content/browser/accessibility/accessibility_action_browsertest.cc content/browser/accessibility/accessibility_auralinux_browsertest.cc content/browser/accessibility/browser_accessibility_android.cc @@ -4093,7 +4160,6 @@ content/browser/geolocation/geolocation_service_impl_unittest.cc content/browser/gpu/gpu_data_manager_impl_private.cc content/browser/hid/hid_service_unittest.cc content/browser/idle/idle_manager_unittest.cc -content/browser/indexed_db/indexed_db_context_impl.h content/browser/indexed_db/indexed_db_context_unittest.cc content/browser/indexed_db/indexed_db_reporting.cc content/browser/indexed_db/instance/leveldb/backing_store.cc @@ -4235,6 +4301,7 @@ content/browser/web_contents/web_contents_impl_browsertest.cc content/browser/web_contents/web_contents_impl_unittest.cc content/browser/web_contents/web_contents_view_android.cc content/browser/web_contents/web_contents_view_aura_unittest.cc +content/browser/web_contents/web_contents_view_mac_unittest.mm content/browser/web_contents/web_drag_dest_mac_unittest.mm content/browser/webauth/authenticator_common_impl.cc content/browser/webauth/authenticator_impl_unittest.cc @@ -4448,11 +4515,13 @@ docs/website/scripts/fetch_lobs.py docs/website/scripts/fetch_node_modules.py docs/website/site/Home/google-ssl.xml docs/website/site/administrators/err_ssl_weak_server_ephemeral_dh_key/redirect-dh.xml -docs/website/site/chromium-os/developer-library/guides/testing/puppeteer-system-apps/test-file-download.js -docs/website/site/chromium-os/developer-library/guides/testing/web-testing/test-chrome-connection.js -docs/website/site/chromium-os/developer-library/guides/testing/web-testing/test-iwa-interaction.js -docs/website/site/chromium-os/developer-library/guides/testing/web-testing/test-iwa-kiosk.js -docs/website/site/chromium-os/developer-library/guides/testing/web-testing/test-pwa-lifecycle.js +docs/website/site/chromium-os/developer-library/guides/testing/web-testing/browser-connection/test-chrome-connection.js +docs/website/site/chromium-os/developer-library/guides/testing/web-testing/iwa/test-iwa-interaction.js +docs/website/site/chromium-os/developer-library/guides/testing/web-testing/kiosk/test-iwa-kiosk.js +docs/website/site/chromium-os/developer-library/guides/testing/web-testing/pwa/test-pwa-lifecycle.js +docs/website/site/chromium-os/developer-library/guides/testing/web-testing/pwa/test-pwa-lifecycle.py +docs/website/site/chromium-os/developer-library/guides/testing/web-testing/pwa/test-pwa-lifecycle.ts +docs/website/site/chromium-os/developer-library/guides/testing/web-testing/swa/test-file-download.js docs/website/site/chromium-os/developer-library/reference/linux-constants/syscalls/syscalls.py docs/website/site/chromium-os/developer-library/reference/upstart-cookbook/index.html docs/website/site/developers/design-documents/accessibility/tracker/CSUN_Accessibility_in_the_Cloud.txt @@ -4502,11 +4571,7 @@ extensions/common/api/_api_features.json extensions/common/api/app_window.idl extensions/common/api/extensions_manifest_types.json extensions/common/api/i18n.json -extensions/common/api/networking_onc.idl -extensions/common/api/networking_private.idl -extensions/common/api/offscreen.idl extensions/common/api/printer_provider.idl -extensions/common/api/serial.idl extensions/common/api/socket.idl extensions/common/api/sockets_tcp.idl extensions/common/api/sockets_tcp_server.idl @@ -4559,6 +4624,7 @@ extensions/renderer/script_context.cc extensions/shell/browser/shell_prefs.cc extensions/strings/extensions_strings.grd extensions/test/extension_background_page_waiter.h +fuchsia_web/av_testing/cast_starter.html fuchsia_web/webengine/browser/frame_impl_browsertest.cc fuchsia_web/webengine/browser/web_engine_content_browser_client_unittest.cc fuchsia_web/webengine/test/data/play_video.html @@ -4687,6 +4753,7 @@ gpu/vulkan/PRESUBMIT.py headless/lib/browser/protocol/headless_handler.cc headless/test/data/dom_tree_test.html headless/test/data/structured_doc.html +headless/test/data/structured_doc/doc.html headless/test/dom_tree_extraction_expected_nodes.txt headless/test/headless_compositor_browsertest.cc infra/config/PRESUBMIT.py @@ -4753,6 +4820,7 @@ media/ffmpeg/ffmpeg_regression_tests.cc media/ffmpeg/scripts/build_ffmpeg.py media/ffmpeg/scripts/credits_updater.py media/ffmpeg/scripts/generate_gn.py +media/ffmpeg/scripts/robo_branch.py media/ffmpeg/scripts/robo_setup.py media/filters/decrypting_audio_decoder.h media/filters/decrypting_video_decoder.h @@ -4792,7 +4860,6 @@ media/gpu/windows/d3d12_video_helpers.h media/gpu/windows/media_foundation_video_encode_accelerator_win.cc media/gpu/windows/mf_audio_encoder.cc media/gpu/windows/mf_audio_encoder.h -media/gpu/windows/supported_profile_helpers.cc media/mojo/clients/mojo_gpu_video_accelerator_factories.cc media/mojo/mojom/stable/native_pixmap_handle_mojom_traits.cc media/mojo/services/media_foundation_service.cc @@ -4816,7 +4883,7 @@ media/renderers/win/media_foundation_stream_wrapper.cc media/renderers/win/media_foundation_stream_wrapper.h media/renderers/win/media_foundation_video_stream.cc media/test/PRESUBMIT.py -media/video/gpu_memory_buffer_video_frame_pool.cc +media/video/mappable_shared_image_video_frame_pool.cc media/video/video_encode_accelerator.h media/video/vpx_video_encoder.cc mojo/PRESUBMIT.py @@ -4954,6 +5021,7 @@ net/http/http_stream_pool_attempt_manager.cc net/http/http_transaction_test_util.cc net/http/http_util.cc net/http/http_util_unittest.cc +net/http/mock_sspi_library_win.cc net/http/no_vary_search_cache.h net/http/transport_security_state.cc net/http/transport_security_state.h @@ -5071,6 +5139,7 @@ pdf/pdfium/accessibility_unittest.cc pdf/pdfium/pdfium_engine.cc pdf/pdfium/pdfium_engine_unittest.cc pdf/pdfium/pdfium_form_filler_unittest.cc +pdf/pdfium/pdfium_mem_buffer_file_write.cc pdf/pdfium/pdfium_page_unittest.cc pdf/pdfium/pdfium_test_base.cc pdf/test/PRESUBMIT.py @@ -5125,6 +5194,7 @@ remoting/host/win/rdp_client_window.cc remoting/host/win/trust_util.cc remoting/protocol/authenticator_test_base.h remoting/protocol/fake_session.cc +remoting/protocol/jingle_messages.h remoting/protocol/jingle_messages_unittest.cc remoting/protocol/jingle_session_unittest.cc remoting/protocol/negotiating_authenticator_unittest.cc @@ -5211,6 +5281,9 @@ services/network/network_context_unittest.cc services/network/orb/orb_impl.cc services/network/orb/orb_impl_unittest.cc services/network/orb/orb_sniffers.cc +services/network/pervasive_resources/shared_resource_checker.cc +services/network/pervasive_resources/shared_resource_checker.h +services/network/pervasive_resources/shared_resource_checker_patterns.h services/network/proxy_resolver_factory_mojo_unittest.cc services/network/public/cpp/content_security_policy/content_security_policy_unittest.cc services/network/public/cpp/cors/cors_error_status.h @@ -5226,8 +5299,6 @@ services/network/public/cpp/proxy_config_mojom_traits_unittest.cc services/network/public/cpp/transferable_socket.cc services/network/public/mojom/permissions_policy/PRESUBMIT.py services/network/sct_auditing/sct_auditing_reporter.cc -services/network/shared_resource_checker.cc -services/network/shared_resource_checker.h services/network/trust_tokens/trust_token_client_data_canonicalization.h services/network/trust_tokens/trust_token_key_commitment_parser.h services/network/trust_tokens/trust_token_key_commitments.h @@ -5685,7 +5756,6 @@ third_party/blink/renderer/core/dom/node_iterator_base.cc third_party/blink/renderer/core/dom/node_iterator_base.h third_party/blink/renderer/core/dom/node_list.idl third_party/blink/renderer/core/dom/node_lists_node_data.h -third_party/blink/renderer/core/dom/node_rare_data.h third_party/blink/renderer/core/dom/observable.cc third_party/blink/renderer/core/dom/observable.h third_party/blink/renderer/core/dom/processing_instruction.idl @@ -5711,7 +5781,6 @@ third_party/blink/renderer/core/editing/serializers/serialization.cc third_party/blink/renderer/core/editing/spellcheck/cold_mode_spell_check_requester.h third_party/blink/renderer/core/editing/spellcheck/hot_mode_spell_check_requester.h third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.h -third_party/blink/renderer/core/editing/spellcheck/spell_checker_test.cc third_party/blink/renderer/core/editing/visible_units.cc third_party/blink/renderer/core/editing/visible_units_line_test.cc third_party/blink/renderer/core/events/before_unload_event.cc @@ -5734,7 +5803,6 @@ third_party/blink/renderer/core/events/wheel_event.cc third_party/blink/renderer/core/events/wheel_event.h third_party/blink/renderer/core/events/wheel_event.idl third_party/blink/renderer/core/execution_context/execution_context.h -third_party/blink/renderer/core/execution_context/navigator_base.cc third_party/blink/renderer/core/execution_context/security_context.cc third_party/blink/renderer/core/exported/web_plugin_container_impl.cc third_party/blink/renderer/core/exported/web_searchable_form_data.cc @@ -5773,6 +5841,7 @@ third_party/blink/renderer/core/html/forms/html_button_element.idl third_party/blink/renderer/core/html/forms/html_form_controls_collection.cc third_party/blink/renderer/core/html/forms/html_form_controls_collection.idl third_party/blink/renderer/core/html/forms/html_form_element.idl +third_party/blink/renderer/core/html/forms/html_form_mcp_tool_test.cc third_party/blink/renderer/core/html/forms/html_input_element.idl third_party/blink/renderer/core/html/forms/html_input_element_test.cc third_party/blink/renderer/core/html/forms/html_label_element.idl @@ -5983,6 +6052,7 @@ third_party/blink/renderer/modules/accessibility/ax_node_object.cc third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h third_party/blink/renderer/modules/accessibility/testing/internals_accessibility.h +third_party/blink/renderer/modules/ai/feedback_helpers.cc third_party/blink/renderer/modules/bluetooth/bluetooth_error.cc third_party/blink/renderer/modules/clipboard/clipboard.idl third_party/blink/renderer/modules/content_extraction/ai_page_content_agent_unittest.cc @@ -6188,7 +6258,6 @@ third_party/boringssl/src/third_party/googletest/googletest/test/gtest_list_outp third_party/boringssl/src/third_party/googletest/googletest/test/gtest_skip_test.cc third_party/boringssl/src/tool/fd.cc third_party/breakpad/BUILD.gn -third_party/breakpad/breakpad/default.xml third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/sender/google_crash_report_sender.cc @@ -6259,7 +6328,6 @@ third_party/breakpad/breakpad/src/processor/static_range_map_unittest.cc third_party/breakpad/breakpad/src/processor/windows_frame_info.h third_party/breakpad/breakpad/src/tools/linux/core_handler/core_handler.cc third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc -third_party/breakpad/breakpad/src/tools/python/deps-to-manifest.py third_party/breakpad/breakpad/src/tools/python/filter_syms.py third_party/breakpad/breakpad/src/tools/windows/converter/ms_symbol_server_converter.cc third_party/breakpad/breakpad/src/tools/windows/converter/ms_symbol_server_converter.h @@ -7500,6 +7568,7 @@ third_party/crossbench/crossbench/action_runner/default_bond_action_runner.py third_party/crossbench/crossbench/benchmarks/loading/config/login/google.py third_party/crossbench/crossbench/benchmarks/loading/loading_benchmark.py third_party/crossbench/crossbench/benchmarks/loading/page/live.py +third_party/crossbench/crossbench/benchmarks/loadline/loadline.py third_party/crossbench/crossbench/benchmarks/powerline/powerline_benchmark.py third_party/crossbench/crossbench/bond/bond.py third_party/crossbench/crossbench/browsers/chrome/downloader.py @@ -7517,6 +7586,7 @@ third_party/crossbench/crossbench/cli/exception_formatter.py third_party/crossbench/crossbench/cli/subcommand/pinpoint.py third_party/crossbench/crossbench/pinpoint/api.py third_party/crossbench/crossbench/pinpoint/auth.py +third_party/crossbench/crossbench/pinpoint/job_results.py third_party/crossbench/crossbench/pinpoint/list_jobs.py third_party/crossbench/crossbench/pinpoint/patch_resolver.py third_party/crossbench/crossbench/plt/android_adb.py @@ -7567,7 +7637,9 @@ third_party/dawn/src/dawn/common/SystemUtils.cpp third_party/dawn/src/dawn/dawn.json third_party/dawn/src/dawn/native/BindGroupLayoutInternal.h third_party/dawn/src/dawn/native/CommandAllocator.cpp +third_party/dawn/src/dawn/native/Commands.h third_party/dawn/src/dawn/native/CopyTextureForBrowserHelper.cpp +third_party/dawn/src/dawn/native/Device.h third_party/dawn/src/dawn/native/Features.cpp third_party/dawn/src/dawn/native/Limits.cpp third_party/dawn/src/dawn/native/ResourceTable.cpp @@ -7576,6 +7648,7 @@ third_party/dawn/src/dawn/native/Sampler.h third_party/dawn/src/dawn/native/ShaderModule.cpp third_party/dawn/src/dawn/native/SubresourceStorage.h third_party/dawn/src/dawn/native/Texture.cpp +third_party/dawn/src/dawn/native/Texture.h third_party/dawn/src/dawn/native/Toggles.cpp third_party/dawn/src/dawn/native/d3d/D3DError.cpp third_party/dawn/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp @@ -7591,7 +7664,6 @@ third_party/dawn/src/dawn/native/d3d11/TextureD3D11.cpp third_party/dawn/src/dawn/native/d3d12/BufferD3D12.cpp third_party/dawn/src/dawn/native/d3d12/CommandBufferD3D12.cpp third_party/dawn/src/dawn/native/d3d12/D3D12Info.cpp -third_party/dawn/src/dawn/native/d3d12/DeviceD3D12.cpp third_party/dawn/src/dawn/native/d3d12/PhysicalDeviceD3D12.cpp third_party/dawn/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.cpp third_party/dawn/src/dawn/native/d3d12/ResourceAllocatorManagerD3D12.h @@ -7625,6 +7697,7 @@ third_party/dawn/src/dawn/tests/end2end/ArchTierLimitsExhaustive.cpp third_party/dawn/src/dawn/tests/end2end/BindingArrayTests.cpp third_party/dawn/src/dawn/tests/end2end/BufferHostMappedPointerTests_win.cpp third_party/dawn/src/dawn/tests/end2end/CompressedTextureFormatTests.cpp +third_party/dawn/src/dawn/tests/end2end/CopyTests.cpp third_party/dawn/src/dawn/tests/end2end/DepthBiasTests.cpp third_party/dawn/src/dawn/tests/end2end/ResourceTableTests.cpp third_party/dawn/src/dawn/tests/end2end/TextureViewTests.cpp @@ -7813,6 +7886,7 @@ third_party/dawn/third_party/webgpu-headers/src/webgpu.json third_party/dawn/tools/src/cmd/cts/config.json third_party/dawn/tools/src/cmd/cts/treemap/treemap.html third_party/depot_tools/PRESUBMIT.py +third_party/depot_tools/agents/skills/luci-test-results/scripts/luci_triage.py third_party/depot_tools/auth.py third_party/depot_tools/autoninja.py third_party/depot_tools/bootstrap/bootstrap.py @@ -7984,6 +8058,7 @@ third_party/depot_tools/recipes/recipe_modules/git/examples/full.expected/count- third_party/depot_tools/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json third_party/depot_tools/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json third_party/depot_tools/recipes/recipe_modules/git/examples/full.expected/git-checkout-with-depth.json +third_party/depot_tools/recipes/recipe_modules/git/examples/full.expected/git-fetch-with-maintenance.json third_party/depot_tools/recipes/recipe_modules/git/examples/full.expected/git-fetch-without-auto-gc.json third_party/depot_tools/recipes/recipe_modules/git/examples/full.expected/new_branch_failed.json third_party/depot_tools/recipes/recipe_modules/git/examples/full.expected/platform_win.json @@ -8040,6 +8115,7 @@ third_party/depot_tools/tests/presubmit_support_test.py third_party/depot_tools/tests/presubmit_unittest.py third_party/depot_tools/tests/reclient_helper_test.py third_party/depot_tools/tests/roll_dep_test.py +third_party/depot_tools/tests/siso_test.py third_party/depot_tools/tests/split_cl_test.py third_party/depot_tools/tests/watchlists_unittest.py third_party/depot_tools/watchlists.py @@ -8314,8 +8390,6 @@ third_party/devtools-frontend/src/front_end/panels/network/network-meta.ts third_party/devtools-frontend/src/front_end/panels/profiler/HeapSnapshotGridNodes.ts third_party/devtools-frontend/src/front_end/panels/recorder/RecorderController.ts third_party/devtools-frontend/src/front_end/panels/recorder/components/CreateRecordingView.ts -third_party/devtools-frontend/src/front_end/panels/security/CookieControlsView.ts -third_party/devtools-frontend/src/front_end/panels/security/CookieReportView.ts third_party/devtools-frontend/src/front_end/panels/settings/AISettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/FrameworkIgnoreListSettingsTab.ts third_party/devtools-frontend/src/front_end/panels/settings/KeybindsSettingsTab.ts @@ -9493,6 +9567,7 @@ third_party/devtools-frontend/src/node_modules/zod/v4/core/regexes.d.ts third_party/devtools-frontend/src/node_modules/zod/v4/core/regexes.js third_party/devtools-frontend/src/package.json third_party/devtools-frontend/src/scripts/ai_assistance/suite/helpers/gemini.ts +third_party/devtools-frontend/src/scripts/ai_assistance/suite/helpers/report_generator.ts third_party/devtools-frontend/src/scripts/build/compress_files.js third_party/devtools-frontend/src/scripts/check_external_links.js third_party/devtools-frontend/src/scripts/component_docs/component_docs.css @@ -12154,7 +12229,6 @@ third_party/litert/src/litert/js/demos/efficientvit_segmentation/src/index.ts third_party/litert/src/litert/js/demos/mobilenetv2/src/index.ts third_party/litert/src/litert/js/packages/core/src/datatypes.ts third_party/litert/src/litert/runtime/ahwb_wrapper.h -third_party/litert/src/litert/vendors/CMakeLists.txt third_party/litert/src/litert/vendors/google_tensor/dispatch/sb_api.h third_party/litert/src/tflite/core/c/common.h third_party/litert/src/tflite/delegates/gpu/android_hardware_buffer.h @@ -12351,6 +12425,7 @@ third_party/mediapipe/src/mediapipe/calculators/util/face_to_rect_calculator.cc third_party/mediapipe/src/mediapipe/calculators/util/resource_provider_calculator.h third_party/mediapipe/src/mediapipe/calculators/video/flow_to_image_calculator.cc third_party/mediapipe/src/mediapipe/calculators/video/opencv_video_encoder_calculator.cc +third_party/mediapipe/src/mediapipe/framework/api3/contract.h third_party/mediapipe/src/mediapipe/framework/formats/unique_fd.h third_party/mediapipe/src/mediapipe/framework/resources.h third_party/mediapipe/src/mediapipe/framework/tool/proto_util_lite.cc @@ -12448,11 +12523,20 @@ third_party/node/node_modules/@bufbuild/protobuf/dist/esm/wkt/gen/google/protobu third_party/node/node_modules/@bufbuild/protobuf/dist/esm/wkt/gen/google/protobuf/api_pb.d.ts third_party/node/node_modules/@bufbuild/protobuf/dist/esm/wkt/gen/google/protobuf/timestamp_pb.d.ts third_party/node/node_modules/@bufbuild/protobuf/dist/esm/wkt/gen/google/protobuf/type_pb.d.ts +third_party/node/node_modules/@csstools/css-parser-algorithms/package.json +third_party/node/node_modules/@csstools/css-syntax-patches-for-csstree/package.json +third_party/node/node_modules/@csstools/css-tokenizer/package.json +third_party/node/node_modules/@csstools/media-query-list-parser/package.json third_party/node/node_modules/@lit/reactive-element/css-tag.d.ts third_party/node/node_modules/@lit/reactive-element/reactive-element.d.ts third_party/node/node_modules/@mediapipe/tasks-vision/vision.d.ts third_party/node/node_modules/@rollup/wasm-node/dist/shared/index.js third_party/node/node_modules/@rollup/wasm-node/dist/shared/rollup.js +third_party/node/node_modules/@sindresorhus/merge-streams/package.json +third_party/node/node_modules/@stylistic/stylelint-plugin/lib/utils/isStandardSyntaxValue/index.js +third_party/node/node_modules/@stylistic/stylelint-plugin/lib/utils/validateTypes/index.js +third_party/node/node_modules/@stylistic/stylelint-plugin/node_modules/postcss-selector-parser/package.json +third_party/node/node_modules/@stylistic/stylelint-plugin/package.json third_party/node/node_modules/@types/dom-speech-recognition/index.d.ts third_party/node/node_modules/@types/dom-webcodecs/index.d.ts third_party/node/node_modules/@types/google.analytics/index.d.ts @@ -12461,12 +12545,16 @@ third_party/node/node_modules/@typescript-eslint/eslint-plugin/dist/rules/prefer third_party/node/node_modules/acorn/dist/acorn.js third_party/node/node_modules/acorn/package.json third_party/node/node_modules/ajv/dist/ajv.bundle.js +third_party/node/node_modules/ansi-regex/package.json third_party/node/node_modules/ansi-styles/package.json +third_party/node/node_modules/astral-regex/package.json third_party/node/node_modules/callsites/package.json third_party/node/node_modules/chai/index.js third_party/node/node_modules/chai/package.json third_party/node/node_modules/color-convert/package.json third_party/node/node_modules/color-name/package.json +third_party/node/node_modules/cosmiconfig/package.json +third_party/node/node_modules/css-functions-list/package.json third_party/node/node_modules/css-tree/data/patch.json third_party/node/node_modules/css-tree/lib/lexer/generic.js third_party/node/node_modules/css-tree/package.json @@ -12489,6 +12577,8 @@ third_party/node/node_modules/debug/package.json third_party/node/node_modules/debug/src/browser.js third_party/node/node_modules/domutils/lib/esm/stringify.js third_party/node/node_modules/domutils/lib/stringify.js +third_party/node/node_modules/env-paths/package.json +third_party/node/node_modules/error-ex/package.json third_party/node/node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp/package.json third_party/node/node_modules/eslint-plugin-jsdoc/src/tagNames.js third_party/node/node_modules/eslint-plugin-lit/lib/rules/no-native-attributes.js @@ -12502,8 +12592,6 @@ third_party/node/node_modules/eslint-scope/lib/scope.js third_party/node/node_modules/eslint-scope/lib/variable.js third_party/node/node_modules/eslint/lib/rules/max-lines-per-function.js third_party/node/node_modules/eslint/node_modules/escape-string-regexp/package.json -third_party/node/node_modules/eslint/node_modules/has-flag/package.json -third_party/node/node_modules/eslint/node_modules/supports-color/package.json third_party/node/node_modules/espree/espree.js third_party/node/node_modules/esquery/dist/esquery.esm.js third_party/node/node_modules/esquery/dist/esquery.js @@ -12521,19 +12609,29 @@ third_party/node/node_modules/esutils/lib/utils.js third_party/node/node_modules/esutils/package.json third_party/node/node_modules/fast-glob/node_modules/glob-parent/package.json third_party/node/node_modules/fast-glob/out/utils/path.js +third_party/node/node_modules/fast-uri/package.json third_party/node/node_modules/find-up/package.json +third_party/node/node_modules/get-east-asian-width/package.json third_party/node/node_modules/glob-parent/package.json third_party/node/node_modules/globals/package.json +third_party/node/node_modules/globby/package.json +third_party/node/node_modules/has-flag/package.json +third_party/node/node_modules/html-tags/package.json third_party/node/node_modules/import-fresh/package.json +third_party/node/node_modules/import-meta-resolve/package.json third_party/node/node_modules/imurmurhash/imurmurhash.js third_party/node/node_modules/imurmurhash/imurmurhash.min.js third_party/node/node_modules/imurmurhash/package.json +third_party/node/node_modules/is-fullwidth-code-point/package.json +third_party/node/node_modules/is-path-inside/package.json third_party/node/node_modules/js-yaml/package.json third_party/node/node_modules/json-buffer/package.json third_party/node/node_modules/lit-html/directives/async-append.d.ts third_party/node/node_modules/lit-html/directives/async-replace.d.ts third_party/node/node_modules/locate-path/package.json third_party/node/node_modules/lodash.merge/package.json +third_party/node/node_modules/lodash.truncate/package.json +third_party/node/node_modules/mathml-tag-names/package.json third_party/node/node_modules/mdn-data/css/at-rules.json third_party/node/node_modules/mdn-data/css/at-rules.schema.json third_party/node/node_modules/mdn-data/css/properties.json @@ -12543,24 +12641,29 @@ third_party/node/node_modules/mdn-data/css/selectors.schema.json third_party/node/node_modules/mdn-data/css/types.json third_party/node/node_modules/mdn-data/css/types.schema.json third_party/node/node_modules/mdn-data/package.json +third_party/node/node_modules/meow/package.json third_party/node/node_modules/messageformat/lib/functions/datetime.d.ts third_party/node/node_modules/messageformat/lib/functions/datetime.js third_party/node/node_modules/messageformat/lib/messageformat.d.ts third_party/node/node_modules/messageformat/package.json third_party/node/node_modules/mocha/mocha.js +third_party/node/node_modules/normalize-path/index.js third_party/node/node_modules/p-limit/package.json third_party/node/node_modules/p-locate/package.json third_party/node/node_modules/parent-module/package.json third_party/node/node_modules/parse-imports/package.json +third_party/node/node_modules/parse-json/package.json third_party/node/node_modules/parse5-htmlparser2-tree-adapter/package.json third_party/node/node_modules/parse5/lib/tokenizer/index.js third_party/node/node_modules/parse5/package.json third_party/node/node_modules/path-exists/package.json third_party/node/node_modules/path-key/package.json third_party/node/node_modules/postcss-selector-parser/package.json +third_party/node/node_modules/require-from-string/package.json third_party/node/node_modules/resolve-from/package.json third_party/node/node_modules/shebang-command/package.json third_party/node/node_modules/shebang-regex/package.json +third_party/node/node_modules/slash/package.json third_party/node/node_modules/source-map-js/lib/base64-vlq.js third_party/node/node_modules/source-map-js/lib/source-map-consumer.js third_party/node/node_modules/source-map-js/package.json @@ -12569,7 +12672,33 @@ third_party/node/node_modules/source-map-support/node_modules/source-map/lib/bas third_party/node/node_modules/source-map-support/node_modules/source-map/lib/source-map-consumer.js third_party/node/node_modules/source-map-support/node_modules/source-map/package.json third_party/node/node_modules/source-map-support/source-map-support.js +third_party/node/node_modules/string-width/package.json +third_party/node/node_modules/strip-ansi/package.json third_party/node/node_modules/strip-json-comments/package.json +third_party/node/node_modules/stylelint/node_modules/@csstools/selector-resolve-nested/package.json +third_party/node/node_modules/stylelint/node_modules/@csstools/selector-specificity/package.json +third_party/node/node_modules/stylelint/node_modules/ansi-regex/package.json +third_party/node/node_modules/stylelint/node_modules/css-tree/data/patch.json +third_party/node/node_modules/stylelint/node_modules/css-tree/lib/lexer/generic.js +third_party/node/node_modules/stylelint/node_modules/css-tree/package.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/at-rules.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/at-rules.schema.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/functions.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/functions.schema.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/properties.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/properties.schema.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/selectors.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/selectors.schema.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/types.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/css/types.schema.json +third_party/node/node_modules/stylelint/node_modules/mdn-data/package.json +third_party/node/node_modules/stylelint/node_modules/postcss-selector-parser/package.json +third_party/node/node_modules/stylelint/node_modules/string-width/package.json +third_party/node/node_modules/stylelint/node_modules/strip-ansi/package.json +third_party/node/node_modules/supports-color/package.json +third_party/node/node_modules/supports-hyperlinks/node_modules/has-flag/package.json +third_party/node/node_modules/supports-hyperlinks/node_modules/supports-color/package.json +third_party/node/node_modules/svg-tags/package.json third_party/node/node_modules/svgo/dist/svgo.browser.js third_party/node/node_modules/svgo/plugins/_collections.js third_party/node/node_modules/svgo/plugins/inlineStyles.js @@ -12617,6 +12746,7 @@ third_party/node/node_modules/typescript/lib/lib.es2024.sharedmemory.d.ts third_party/node/node_modules/typescript/lib/lib.webworker.d.ts third_party/node/node_modules/typescript/lib/lib.webworker.iterable.d.ts third_party/node/node_modules/typescript/lib/typescript.js +third_party/node/node_modules/unicorn-magic/package.json third_party/node/node_modules/uri-js/dist/es5/uri.all.js third_party/node/node_modules/uri-js/dist/esnext/uri.js third_party/node/node_modules/uri-js/package.json @@ -12679,7 +12809,6 @@ third_party/openscreen/src/discovery/common/reporting_client.h third_party/openscreen/src/discovery/dnssd/impl/dns_data_graph.h third_party/openscreen/src/discovery/dnssd/public/dns_sd_instance.h third_party/openscreen/src/discovery/dnssd/public/dns_sd_querier.h -third_party/openscreen/src/discovery/mdns/impl/mdns_probe_unittest.cc third_party/openscreen/src/discovery/mdns/impl/mdns_responder.cc third_party/openscreen/src/discovery/mdns/public/mdns_reader.cc third_party/openscreen/src/discovery/public/dns_sd_service_watcher.h @@ -13885,6 +14014,7 @@ third_party/pdfium/third_party/libopenjpeg/j2k.c third_party/pdfium/third_party/libopenjpeg/opj_includes.h third_party/pdfium/third_party/libopenjpeg/t2.c third_party/pdfium/tools/lsan/lsan_suppressions.txt +third_party/pdfium/tools/roll_pdfium_deps_test.py third_party/pefile_py3/pefile.py third_party/perfetto/CONTRIBUTORS.txt third_party/perfetto/gn/standalone/BUILD.gn @@ -13945,12 +14075,10 @@ third_party/perfetto/src/base/utils.cc third_party/perfetto/src/bigtrace/worker/repository_policies/gcs_trace_processor_loader.cc third_party/perfetto/src/perfetto_cmd/perfetto_cmd_android.cc third_party/perfetto/src/profiling/common/proc_utils.cc -third_party/perfetto/src/profiling/deobfuscator_unittest.cc third_party/perfetto/src/profiling/memory/client.cc third_party/perfetto/src/profiling/memory/sampler.h third_party/perfetto/src/profiling/memory/shared_ring_buffer.cc third_party/perfetto/src/profiling/memory/system_property.h -third_party/perfetto/src/profiling/symbolizer/breakpad_parser.h third_party/perfetto/src/trace_processor/importers/art_method/art_method_parser.cc third_party/perfetto/src/trace_processor/importers/art_method/art_method_tokenizer.cc third_party/perfetto/src/trace_processor/importers/common/args_translation_table.cc @@ -13970,8 +14098,11 @@ third_party/perfetto/src/trace_processor/importers/proto/system_probes_parser.cc third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/android/battery/doze.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/android/startup/time_to_display.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/chrome/page_loads.sql +third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/chrome/scroll_jank_v4.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/export/to_firefox_profile.sql third_party/perfetto/src/trace_processor/perfetto_sql/stdlib/stacks/symbolization_candidates.sql +third_party/perfetto/src/trace_processor/util/deobfuscation/deobfuscator_unittest.cc +third_party/perfetto/src/trace_processor/util/symbolizer/breakpad_parser.h third_party/perfetto/src/trace_processor/util/trace_type.cc third_party/perfetto/src/trace_redaction/redact_process_events.cc third_party/perfetto/src/traceconv/trace_to_firefox.h @@ -14009,7 +14140,6 @@ third_party/perfetto/ui/src/frontend/post_message_handler.ts third_party/perfetto/ui/src/frontend/post_message_handler_unittest.ts third_party/perfetto/ui/src/frontend/sidebar.ts third_party/perfetto/ui/src/frontend/timeline_page/wasd_navigation_handler.ts -third_party/perfetto/ui/src/frontend/trace_url_handler.ts third_party/perfetto/ui/src/open_perfetto_trace/index.html third_party/perfetto/ui/src/plugins/dev.perfetto.ProcessSummary/index.ts third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/adb/adb_msg.ts @@ -14018,7 +14148,9 @@ third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/pages/android.ts third_party/perfetto/ui/src/plugins/dev.perfetto.RecordTraceV2/pages/record_page.ts third_party/perfetto/ui/src/plugins/dev.perfetto.TraceInfoPage/tabs/android.ts third_party/perfetto/ui/src/plugins/dev.perfetto.TraceProcessorTrack/slice_tracks.ts +third_party/perfetto/ui/src/plugins/org.chromium.ChromeScrollJank/scroll_timeline_v4_model.ts third_party/perfetto/ui/src/plugins/org.kernel.Wattson/warning.ts +third_party/perfetto/ui/src/service_worker/service_worker.ts third_party/perfetto/ui/src/trace_processor/engine.ts third_party/perfetto/ui/src/widgets/hotkey_context.ts third_party/polymer/v3_0/BUILD.gn @@ -15407,16 +15539,18 @@ third_party/rust/foldhash/v0_2/BUILD.gn third_party/rust/hashbrown/v0_15/BUILD.gn third_party/rust/hashbrown/v0_16/BUILD.gn third_party/rust/itoa/v1/BUILD.gn -third_party/rust/jxl/v0_2/BUILD.gn -third_party/rust/jxl_macros/v0_2/BUILD.gn -third_party/rust/jxl_simd/v0_2/BUILD.gn -third_party/rust/jxl_transforms/v0_2/BUILD.gn +third_party/rust/jxl/v0_3/BUILD.gn +third_party/rust/jxl_macros/v0_3/BUILD.gn +third_party/rust/jxl_simd/v0_3/BUILD.gn +third_party/rust/jxl_transforms/v0_3/BUILD.gn third_party/rust/lazy_static/v1/BUILD.gn +third_party/rust/libm/v0_2/BUILD.gn third_party/rust/lock_api/v0_4/BUILD.gn third_party/rust/memchr/v2/BUILD.gn third_party/rust/miniz_oxide/v0_8/BUILD.gn third_party/rust/murmur3/v0_4/BUILD.gn third_party/rust/once_cell/v1/BUILD.gn +third_party/rust/ordered_float/v5/BUILD.gn third_party/rust/parking_lot/v0_12/BUILD.gn third_party/rust/parking_lot_core/v0_9/BUILD.gn third_party/rust/proc_macro2/v1/BUILD.gn @@ -15429,6 +15563,7 @@ third_party/rust/quote/v1/BUILD.gn third_party/rust/regex_automata/v0_4/BUILD.gn third_party/rust/regex_syntax/v0_8/BUILD.gn third_party/rust/rustc_demangle_capi/v0_1/BUILD.gn +third_party/rust/rustversion/v1/BUILD.gn third_party/rust/ryu/v1/BUILD.gn third_party/rust/serde/v1/BUILD.gn third_party/rust/serde_core/v1/BUILD.gn @@ -15441,6 +15576,8 @@ third_party/rust/strum/v0_27/BUILD.gn third_party/rust/strum_macros/v0_27/BUILD.gn third_party/rust/symphonia/v0_5/BUILD.gn third_party/rust/symphonia_bundle_flac/v0_5/BUILD.gn +third_party/rust/symphonia_bundle_mp3/v0_5/BUILD.gn +third_party/rust/symphonia_codec_pcm/v0_5/BUILD.gn third_party/rust/symphonia_core/v0_5/BUILD.gn third_party/rust/symphonia_metadata/v0_5/BUILD.gn third_party/rust/symphonia_utils_xiph/v0_5/BUILD.gn @@ -15457,7 +15594,7 @@ third_party/rust/yoke_derive/v0_8/BUILD.gn third_party/rust/zerofrom/v0_1/BUILD.gn third_party/rust/zerofrom_derive/v0_1/BUILD.gn third_party/rust/zerovec_derive/v0_11/BUILD.gn -third_party/rust/zip/v6/BUILD.gn +third_party/rust/zip/v7/BUILD.gn third_party/rust/zmij/v1/BUILD.gn third_party/s2cellid/src/s2/_fpcontractoff.h third_party/s2cellid/src/s2/r1interval.h @@ -15500,7 +15637,6 @@ third_party/skia/gm/gradients.cpp third_party/skia/gm/labyrinth.cpp third_party/skia/gm/mandoline.cpp third_party/skia/gm/pictureshader.cpp -third_party/skia/gm/png_codec.cpp third_party/skia/gm/postercircle.cpp third_party/skia/gm/smallarc.cpp third_party/skia/gm/smallpaths.cpp @@ -15510,13 +15646,15 @@ third_party/skia/gm/strokes.cpp third_party/skia/gm/stroketext.cpp third_party/skia/gn/gn_to_bp.py third_party/skia/gn/skia/BUILD.gn +third_party/skia/include/core/SkColorSpace.h third_party/skia/include/ports/SkImageGeneratorWIC.h third_party/skia/include/ports/SkTypeface_mac.h third_party/skia/include/private/SkGainmapInfo.h third_party/skia/infra/bots/assets/android_ndk_darwin/create.py third_party/skia/infra/bots/assets/android_ndk_linux/create.py third_party/skia/infra/bots/assets/android_ndk_windows/create.py -third_party/skia/infra/bots/assets/clang_mac_universal/create.py +third_party/skia/infra/bots/assets/clang_mac_arm/create.py +third_party/skia/infra/bots/assets/clang_mac_intel/create.py third_party/skia/infra/bots/assets/clang_win/create.py third_party/skia/infra/bots/assets/gcloud_linux/create.py third_party/skia/infra/bots/assets/gsutil/create.py @@ -15599,7 +15737,6 @@ third_party/skia/specs/web-img-decode/proposed/impl/impl.js third_party/skia/src/base/SkLeanWindows.h third_party/skia/src/codec/SkCodec.cpp third_party/skia/src/codec/SkCrabbyAvifCodec.cpp -third_party/skia/src/codec/SkHdrAgtmParse.cpp third_party/skia/src/codec/SkPngRustCodec.cpp third_party/skia/src/codec/SkWebpCodec.cpp third_party/skia/src/codec/SkWuffsCodec.cpp @@ -15630,6 +15767,7 @@ third_party/skia/src/gpu/graphite/dawn/DawnCommandBuffer.cpp third_party/skia/src/gpu/graphite/dawn/DawnResourceProvider.cpp third_party/skia/src/gpu/graphite/render/AnalyticRRectRenderStep.cpp third_party/skia/src/gpu/graphite/render/PerEdgeAAQuadRenderStep.cpp +third_party/skia/src/gpu/graphite/surface/Surface_AndroidFactories.cpp third_party/skia/src/gpu/tessellate/Tessellation.cpp third_party/skia/src/opts/SkRasterPipeline_opts.h third_party/skia/src/pathops/SkOpAngle.cpp @@ -15717,15 +15855,6 @@ third_party/skia/tools/skpbench/_hardware_pixel_c.py third_party/skia/tools/skpbench/sheet.py third_party/skia/tools/skqp/src/skqp.cpp third_party/skia/tools/skqp/src/skqp_GpuTestProcs.cpp -third_party/skia/tools/testrunners/benchmark/BazelBenchmarkTestRunner.cpp -third_party/skia/tools/testrunners/benchmark/target/BenchmarkTarget.h -third_party/skia/tools/testrunners/benchmark/target/GaneshBenchmarkTarget.cpp -third_party/skia/tools/testrunners/benchmark/target/RasterBenchmarkTarget.cpp -third_party/skia/tools/testrunners/common/surface_manager/GaneshGLSurfaceManager.cpp -third_party/skia/tools/testrunners/common/surface_manager/GaneshVulkanSurfaceManager.cpp -third_party/skia/tools/testrunners/common/surface_manager/RasterSurfaceManager.cpp -third_party/skia/tools/testrunners/common/surface_manager/SurfaceManager.cpp -third_party/skia/tools/testrunners/gm/vias/SimpleVias.cpp third_party/skia/tools/viewer/ClockSlide.cpp third_party/skia/tools/viewer/MotionMarkSlide.cpp third_party/skia/tools/viewer/PathSlide.cpp @@ -16345,6 +16474,9 @@ third_party/webrtc/video/full_stack_tests.cc third_party/webrtc/video/pc_full_stack_tests.cc third_party/webrtc/video/render/video_render_frames.cc third_party/webrtc/video/rtp_video_stream_receiver2.h +third_party/webrtc/video/timing/simulator/log_classifiers.h +third_party/webrtc/video/timing/simulator/rtp_packet_simulator.h +third_party/webrtc/video/timing/simulator/test/test_resources_unittest.cc third_party/webrtc/video/video_send_stream_tests.cc third_party/webrtc/webrtc.gni third_party/webxr_test_pages/bucket_latest.html @@ -16482,6 +16614,7 @@ tools/android/checkstyle/chromium-style-5.0.xml tools/android/checkstyle/unused-imports.xml tools/android/checkxmlstyle/PRESUBMIT.py tools/android/checkxmlstyle/checkxmlstyle.py +tools/android/checkxmlstyle/checkxmlstyle_test.py tools/android/colabutils/memory_usage/PRESUBMIT.py tools/android/colabutils/wpr.py tools/android/customtabs_benchmark/res/values/strings.xml @@ -16611,6 +16744,7 @@ tools/flags/list_flags.py tools/fuchsia/3pp/gn-sdk/3pp/fetch.py tools/fuchsia/3pp/test-scripts/3pp/fetch.py tools/generate_stubs/generate_stubs.py +tools/gerrit/send_after_cq_dryrun.py tools/get_asan_chrome/get_asan_chrome.py tools/git/suggest_owners.py tools/grit/PRESUBMIT.py @@ -16644,6 +16778,7 @@ tools/infra/PRESUBMIT.py tools/infra/clobber_cache_utils.py tools/infra/find_bad_builds.py tools/jj/upload.py +tools/jj/util.py tools/json_data_generator/PRESUBMIT.py tools/json_schema_compiler/PRESUBMIT.py tools/json_schema_compiler/js_externs_generator.py @@ -16655,7 +16790,11 @@ tools/json_schema_compiler/test/content_settings.json tools/json_schema_compiler/test/converted_schemas/app_runtime.idl tools/json_schema_compiler/test/converted_schemas/bluetooth_low_energy.idl tools/json_schema_compiler/test/converted_schemas/bluetooth_socket.idl +tools/json_schema_compiler/test/converted_schemas/networking_onc.idl +tools/json_schema_compiler/test/converted_schemas/networking_private.idl +tools/json_schema_compiler/test/converted_schemas/offscreen.idl tools/json_schema_compiler/test/converted_schemas/protocol_handlers.idl +tools/json_schema_compiler/test/converted_schemas/serial.idl tools/json_schema_compiler/test/converted_schemas/web_accessible_resources.idl tools/json_schema_compiler/test/tabs.json tools/json_schema_compiler/test/windows.json @@ -16690,6 +16829,7 @@ tools/metrics/histograms/merge_xml.py tools/metrics/histograms/merge_xml_test.py tools/metrics/histograms/metadata/accessibility/enums.xml tools/metrics/histograms/metadata/accessibility/histograms.xml +tools/metrics/histograms/metadata/accessibility_annotator/histograms.xml tools/metrics/histograms/metadata/account_manager/histograms.xml tools/metrics/histograms/metadata/actor/enums.xml tools/metrics/histograms/metadata/actor/histograms.xml @@ -16952,6 +17092,8 @@ tools/metrics/histograms/metadata/signin/histograms.xml tools/metrics/histograms/metadata/simple/histograms.xml tools/metrics/histograms/metadata/skia/enums.xml tools/metrics/histograms/metadata/skia/histograms.xml +tools/metrics/histograms/metadata/skills/enums.xml +tools/metrics/histograms/metadata/skills/histograms.xml tools/metrics/histograms/metadata/sql/enums.xml tools/metrics/histograms/metadata/sql/histograms.xml tools/metrics/histograms/metadata/stability/enums.xml @@ -17111,23 +17253,8 @@ tools/perf/core/services/buildbucket_service.py tools/perf/core/services/dashboard_service.py tools/perf/core/services/pinpoint_service.py tools/perf/core/services/request.py -tools/perf/core/shard_maps/timing_data/android-pixel-fold-perf_timing.json -tools/perf/core/shard_maps/timing_data/android-pixel-tangor-perf_timing.json -tools/perf/core/shard_maps/timing_data/android-pixel4-perf_timing.json -tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf-pgo_timing.json -tools/perf/core/shard_maps/timing_data/android-pixel4_webview-perf_timing.json -tools/perf/core/shard_maps/timing_data/android-pixel6-perf_timing.json -tools/perf/core/shard_maps/timing_data/android-pixel6-pro-perf_timing.json -tools/perf/core/shard_maps/timing_data/linux-r350-perf_timing.json -tools/perf/core/shard_maps/timing_data/mac-intel-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_high_end-perf_timing.json tools/perf/core/shard_maps/timing_data/mac-laptop_low_end-perf_timing.json -tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json -tools/perf/core/shard_maps/timing_data/mac-m2-pro-perf_timing.json -tools/perf/core/shard_maps/timing_data/mac-m4-mini-perf_timing.json -tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json -tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json -tools/perf/core/shard_maps/timing_data/win-11-perf_timing.json tools/perf/core/test_data/benchmarks_to_shard.json tools/perf/core/test_data/test_timing_data.json tools/perf/core/test_data/test_timing_data_1_build.json @@ -17200,6 +17327,7 @@ tools/resources/find_unused_resources.py tools/roll_webgl_conformance.py tools/run-swarmed.py tools/rust/build_bindgen.py +tools/rust/build_crubit.py tools/rust/build_rust.py tools/sample_clang_tidy_results.py tools/site_compare/commands/measure.py @@ -17275,6 +17403,7 @@ ui/accessibility/platform/browser_accessibility_manager.h ui/accessibility/platform/browser_accessibility_manager_mac.mm ui/accessibility/platform/browser_accessibility_manager_win.cc ui/accessibility/platform/fuchsia/browser_accessibility_fuchsia.h +ui/accessibility/platform/uia_registrar_win.h ui/android/color_utils_android_unittest.cc ui/android/java/res/values/strings.xml ui/base/accelerators/command.cc @@ -17361,7 +17490,6 @@ ui/file_manager/integration_tests/test_util.ts ui/gfx/PRESUBMIT.py ui/gfx/codec/vector_wstream.cc ui/gfx/color_analysis.h -ui/gfx/color_transform.cc ui/gfx/font.h ui/gfx/font_fallback_win.h ui/gfx/font_names_testing.h diff --git a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch index 36201476..31aaa61d 100644 --- a/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -3773,8 +3773,6 @@ static_library("browser") { +@@ -3749,8 +3749,6 @@ static_library("browser") { "download/download_auto_open_policy_handler.cc", "download/download_auto_open_policy_handler.h", "download/download_commands.cc", @@ -11,7 +11,7 @@ "download/download_dir_util.cc", --- a/chrome/browser/chrome_content_browser_client_navigation_throttles.cc +++ b/chrome/browser/chrome_content_browser_client_navigation_throttles.cc -@@ -393,10 +393,6 @@ void CreateAndAddChromeThrottlesForNavig +@@ -418,10 +418,6 @@ void CreateAndAddChromeThrottlesForNavig Profile::FromBrowserContext(context)), SafeSearchFactory::GetForBrowserContext(context))); @@ -57,7 +57,7 @@ // Whether the download is currently being revived. bool is_being_revived_ = false; -@@ -465,13 +465,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -466,13 +466,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -84,7 +84,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #endif -@@ -1365,9 +1364,6 @@ DownloadsAcceptDangerFunction::Downloads +@@ -1367,9 +1366,6 @@ DownloadsAcceptDangerFunction::Downloads DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() = default; @@ -94,7 +94,7 @@ ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { std::optional params = downloads::AcceptDanger::Params::Create(args()); -@@ -1415,50 +1411,13 @@ void DownloadsAcceptDangerFunction::Prom +@@ -1417,50 +1413,13 @@ void DownloadsAcceptDangerFunction::Prom } RecordApiFunctions(DownloadsFunctionName::kDownloadsFunctionAcceptDanger); #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -186,7 +186,7 @@ class DownloadsShowFunction : public ExtensionFunction { --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -717,18 +717,6 @@ void WebstorePrivateBeginInstallWithMani +@@ -728,18 +728,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -223,7 +223,7 @@ if (enable_extensions) { deps += [ "//chrome/browser/ui/web_applications" ] -@@ -624,6 +626,7 @@ static_library("advanced_protection") { +@@ -626,6 +628,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -231,7 +231,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -643,6 +646,7 @@ source_set("metrics_collector") { +@@ -645,6 +648,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] diff --git a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch index c0cf68af..4015a098 100644 --- a/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ --- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc +++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc -@@ -925,94 +925,6 @@ std::tuple AutofillCr +@@ -916,94 +916,6 @@ std::tuple AutofillCr } bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) { diff --git a/patches/core/inox-patchset/0005-disable-default-extensions.patch b/patches/core/inox-patchset/0005-disable-default-extensions.patch index ea5e376b..1473eaae 100644 --- a/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -26,7 +26,7 @@ +++ b/chrome/browser/extensions/external_component_loader.cc @@ -41,9 +41,6 @@ ExternalComponentLoader::~ExternalCompon void ExternalComponentLoader::StartLoading() { - auto prefs = base::Value::Dict(); + auto prefs = base::DictValue(); // Skip in-app payments app on Android. crbug.com/409396604 -#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_ANDROID) - AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs); diff --git a/patches/core/inox-patchset/0021-disable-rlz.patch b/patches/core/inox-patchset/0021-disable-rlz.patch index aae65886..4c1c1af2 100644 --- a/patches/core/inox-patchset/0021-disable-rlz.patch +++ b/patches/core/inox-patchset/0021-disable-rlz.patch @@ -2,7 +2,7 @@ --- a/BUILD.gn +++ b/BUILD.gn -@@ -457,14 +457,6 @@ group("gn_all") { +@@ -456,14 +456,6 @@ group("gn_all") { ] } diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 250f6ed2..ae32a801 100644 --- a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -101,7 +101,7 @@ by default. scoped_refptr task_runner) --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -529,7 +529,7 @@ void WebRtcLogUploader::UploadCompressed +@@ -473,7 +473,7 @@ void WebRtcLogUploader::UploadCompressed } })"); @@ -249,20 +249,29 @@ by default. url::Component query(0, static_cast(str.length())), key, value; --- a/components/history/core/browser/web_history_service.cc +++ b/components/history/core/browser/web_history_service.cc -@@ -44,13 +44,13 @@ namespace history { +@@ -47,19 +47,19 @@ namespace history { namespace { - const char kHistoryQueryHistoryUrl[] = + const char kOldQueryHistoryUrl[] = - "https://history.google.com/history/api/lookup?client=chrome"; -+ "trk:139:https://history.google.com/history/api/lookup?client=chrome"; ++ "trk:134:https://history.google.com/history/api/lookup?client=chrome"; + const char kNewQueryHistoryUrl[] = +- "https://footprints-pa.googleapis.com/v1/read_chrome_history"; ++ "trk:135:https://footprints-pa.googleapis.com/v1/read_chrome_history"; - const char kHistoryDeleteHistoryUrl[] = + const char kOldHistoryDeleteHistoryUrl[] = - "https://history.google.com/history/api/delete?client=chrome"; -+ "trk:140:https://history.google.com/history/api/delete?client=chrome"; ++ "trk:136:https://history.google.com/history/api/delete?client=chrome"; + const char kNewHistoryDeleteHistoryUrl[] = +- "https://footprints-pa.googleapis.com/v1/delete_chrome_history"; ++ "trk:137:https://footprints-pa.googleapis.com/v1/delete_chrome_history"; - const char kQueryWebAndAppActivityUrl[] = + const char kOldQueryWebAndAppActivityUrl[] = - "https://history.google.com/history/api/lookup?client=web_app"; + "trk:138:https://history.google.com/history/api/lookup?client=web_app"; + const char kNewQueryWebAndAppActivityUrl[] = +- "https://footprints-pa.googleapis.com/v1/get_facs"; ++ "trk:139:https://footprints-pa.googleapis.com/v1/get_facs"; const char kQueryOtherFormsOfBrowsingHistoryUrlSuffix[] = "/historystatus"; @@ -298,7 +307,7 @@ by default. + "trk:238:https://safesearch.googleapis.com/v1:classify"; std::string BuildResponse(bool is_porn) { - base::Value::Dict dict; + base::DictValue dict; --- a/components/translate/core/browser/translate_url_fetcher.cc +++ b/components/translate/core/browser/translate_url_fetcher.cc @@ -101,6 +101,7 @@ bool TranslateURLFetcher::Request(const @@ -311,7 +320,7 @@ by default. std::move(resource_request), --- a/components/translate/core/common/translate_util.cc +++ b/components/translate/core/common/translate_util.cc -@@ -13,7 +13,7 @@ +@@ -28,7 +28,7 @@ constexpr int kMaxNumberOfAutoNever = 2; namespace translate { @@ -675,17 +684,17 @@ by default. const int kMaxSecurePort = 65535; std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) { ---- a/remoting/protocol/jingle_messages.cc -+++ b/remoting/protocol/jingle_messages.cc -@@ -28,7 +28,7 @@ const char kJabberNamespace[] = "jabber: - const char kJingleNamespace[] = "urn:xmpp:jingle:1"; +--- a/remoting/protocol/jingle_message_xml_converter.cc ++++ b/remoting/protocol/jingle_message_xml_converter.cc +@@ -37,7 +37,7 @@ const jingle_xmpp::StaticQName kQNameRea + const jingle_xmpp::StaticQName kQNameContent = {kJingleNamespace, "content"}; // Namespace for transport messages when using standard ICE. -const char kIceTransportNamespace[] = "google:remoting:ice"; +const char kIceTransportNamespace[] = "trk:100:google:remoting:ice"; - - const char kWebrtcTransportNamespace[] = "google:remoting:webrtc"; - + const jingle_xmpp::StaticQName kQNameIceTransport = {kIceTransportNamespace, + "transport"}; + const jingle_xmpp::StaticQName kQNameIceCredentials = {kIceTransportNamespace, --- a/rlz/lib/lib_values.cc +++ b/rlz/lib/lib_values.cc @@ -45,7 +45,7 @@ const char kSetDccResponseVariable[] = " diff --git a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index 84eaebff..7e2e00c0 100644 --- a/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -47,7 +47,7 @@ std::u16string real_url(text.substr(after_scheme_and_colon)); --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string& +@@ -597,6 +597,10 @@ GURL FixupURLInternal(const std::string& } } @@ -60,7 +60,7 @@ return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc -@@ -936,6 +936,7 @@ ChildProcessSecurityPolicyImpl::ChildPro +@@ -1032,6 +1032,7 @@ ChildProcessSecurityPolicyImpl::ChildPro RegisterWebSafeScheme(url::kWssScheme); #endif // BUILDFLAG(ENABLE_WEBSOCKETS) RegisterWebSafeScheme(url::kDataScheme); @@ -70,7 +70,7 @@ // other origins, so we should not treat them as web safe. Remove callers of --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1156,6 +1156,8 @@ component("net") { +@@ -1160,6 +1160,8 @@ component("net") { "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", "url_request/storage_access_status_cache.h", @@ -181,7 +181,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory.h" #include "url/url_constants.h" -@@ -632,6 +633,8 @@ std::unique_ptr URLRe +@@ -626,6 +627,8 @@ std::unique_ptr URLRe std::move(scheme_handler.second)); } protocol_handlers_.clear(); diff --git a/patches/core/ungoogled-chromium/disable-google-host-detection.patch b/patches/core/ungoogled-chromium/disable-google-host-detection.patch index 5d09dee8..1e6e2cbd 100644 --- a/patches/core/ungoogled-chromium/disable-google-host-detection.patch +++ b/patches/core/ungoogled-chromium/disable-google-host-detection.patch @@ -570,7 +570,7 @@ bool IsProbablyGoogleSearchUrl(const GURL& url) { --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -625,10 +625,7 @@ std::u16string TemplateURLRef::SearchTer +@@ -624,10 +624,7 @@ std::u16string TemplateURLRef::SearchTer bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); @@ -689,9 +689,9 @@ } // namespace variations --- a/content/browser/preloading/prefetch/prefetch_container.cc +++ b/content/browser/preloading/prefetch/prefetch_container.cc -@@ -860,23 +860,6 @@ void PrefetchContainer::UpdateResourceRe - resource_request_->referrer = GURL(redirect_info.new_referrer); - resource_request_->referrer_policy = redirect_info.new_referrer_policy; +@@ -899,23 +899,6 @@ void PrefetchContainer::UpdateResourceRe + + resource_request_->UpdateOnRedirect(redirect_info); - // Remove `variations::kClientDataHeader` from `resource_request_->headers`, - // to keep the existing behavior. While `AddXClientDataHeader()` adds diff --git a/patches/core/ungoogled-chromium/disable-mei-preload.patch b/patches/core/ungoogled-chromium/disable-mei-preload.patch index a42e3542..c2add5ea 100644 --- a/patches/core/ungoogled-chromium/disable-mei-preload.patch +++ b/patches/core/ungoogled-chromium/disable-mei-preload.patch @@ -7,7 +7,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -369,7 +369,6 @@ if (!is_android && !is_mac) { +@@ -370,7 +370,6 @@ if (!is_android && !is_mac) { } data_deps += [ @@ -15,7 +15,7 @@ "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component", "//third_party/widevine/cdm", ] -@@ -1181,7 +1180,6 @@ if (is_win) { +@@ -1179,7 +1178,6 @@ if (is_win) { ":optimization_guide_library", ":swiftshader_binaries", ":widevine_cdm_library", @@ -25,7 +25,7 @@ --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -112,7 +112,6 @@ group("resources") { +@@ -111,7 +111,6 @@ group("resources") { if (is_mac) { public_deps += [ "unexportable_keys_internals:resources", diff --git a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch index 2365a4fe..cdad25dc 100644 --- a/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch +++ b/patches/core/ungoogled-chromium/disable-privacy-sandbox.patch @@ -43,7 +43,7 @@ storage_partition_->GetCdmStorageDataModel()->GetUsagePerAllStorageKeys( --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc -@@ -132,7 +132,7 @@ std::set GetTopi +@@ -131,7 +131,7 @@ std::set GetTopi // static bool PrivacySandboxSettingsImpl::IsAllowed(Status status) { @@ -52,7 +52,7 @@ } // static -@@ -862,7 +862,7 @@ void PrivacySandboxSettingsImpl::SetTopi +@@ -861,7 +861,7 @@ void PrivacySandboxSettingsImpl::SetTopi } bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const { @@ -61,7 +61,7 @@ } bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const { -@@ -931,11 +931,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa +@@ -930,11 +930,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa return Status::kIncognitoProfile; } @@ -161,7 +161,7 @@ // static --- a/content/browser/interest_group/ad_auction_service_impl.cc +++ b/content/browser/interest_group/ad_auction_service_impl.cc -@@ -191,11 +191,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD +@@ -190,11 +190,6 @@ AdAuctionServiceImpl::BiddingAndAuctionD void AdAuctionServiceImpl::CreateMojoService( RenderFrameHost* render_frame_host, mojo::PendingReceiver receiver) { @@ -175,7 +175,7 @@ void AdAuctionServiceImpl::JoinInterestGroup( --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc -@@ -1511,38 +1511,7 @@ void StoragePartitionImpl::Initialize( +@@ -1512,38 +1512,7 @@ void StoragePartitionImpl::Initialize( bucket_manager_ = std::make_unique(this); @@ -214,7 +214,7 @@ GeneratedCodeCacheSettings settings = GetContentClient()->browser()->GetGeneratedCodeCacheSettings( -@@ -1571,8 +1540,6 @@ void StoragePartitionImpl::Initialize( +@@ -1572,8 +1541,6 @@ void StoragePartitionImpl::Initialize( font_access_manager_ = FontAccessManager::Create(); @@ -223,7 +223,7 @@ #if BUILDFLAG(ENABLE_LIBRARY_CDMS) if (is_in_memory()) { -@@ -1596,11 +1563,6 @@ void StoragePartitionImpl::Initialize( +@@ -1597,11 +1564,6 @@ void StoragePartitionImpl::Initialize( std::make_unique(this); } @@ -237,7 +237,7 @@ void StoragePartitionImpl::ResetSessionStorageConnections() { --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -4224,12 +4224,6 @@ void WebContentsImpl::Init(const WebCont +@@ -4208,12 +4208,6 @@ void WebContentsImpl::Init(const WebCont DateTimeChooser::CreateDateTimeChooser(this); #endif @@ -248,8 +248,8 @@ - AttributionHost::CreateForWebContents(this); - } + SchedulerLoopQuarantineWebContentsObserver::MaybeCreateForWebContents(this); RedirectChainDetector::CreateForWebContents(this); - BtmWebContentsObserver::MaybeCreateForWebContents(this); --- a/content/services/auction_worklet/private_aggregation_bindings.cc +++ b/content/services/auction_worklet/private_aggregation_bindings.cc @@ -407,53 +407,6 @@ PrivateAggregationBindings::~PrivateAggr diff --git a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch index eac3e9ff..0daad8fc 100644 --- a/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch +++ b/patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -179,31 +179,13 @@ void WebRtcLogUploader::OnLoggingStopped +@@ -174,31 +174,13 @@ void WebRtcLogUploader::OnLoggingStopped DCHECK(meta_data.get()); DCHECK(!upload_done_data.paths.directory.empty()); @@ -11,7 +11,7 @@ - std::string local_log_id; - if (base::PathExists(upload_done_data.paths.directory)) { - webrtc_logging::DeleteOldWebRtcLogFiles(upload_done_data.paths.directory); + webrtc_logging::DeleteOldWebRtcLogFiles({upload_done_data.paths.directory}); - - local_log_id = - base::NumberToString(base::Time::Now().InSecondsFSinceUnixEpoch()); @@ -29,18 +29,18 @@ - upload_done_data.local_log_id = local_log_id; if (is_text_log_upload_allowed) { -- PrepareMultipartPostData(compressed_log, std::move(meta_data), +- PrepareMultipartPostData(content_name, compressed_log, std::move(meta_data), - std::move(upload_done_data)); + NotifyUploadDoneAndLogStats(net::HTTP_OK, net::OK, "", std::move(upload_done_data)); } else { main_task_runner_->PostTask( FROM_HERE, -@@ -220,28 +202,7 @@ void WebRtcLogUploader::PrepareMultipart +@@ -216,28 +198,7 @@ void WebRtcLogUploader::PrepareMultipart DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); - std::unique_ptr post_data(new std::string()); -- SetupMultipart(post_data.get(), compressed_log, +- SetupMultipart(post_data.get(), content_name, compressed_log, - upload_done_data.paths.incoming_rtp_dump, - upload_done_data.paths.outgoing_rtp_dump, *meta_data.get()); - @@ -64,12 +64,12 @@ + NotifyUploadDoneAndLogStats(net::HTTP_OK, net::OK, "", std::move(upload_done_data)); } - void WebRtcLogUploader::UploadStoredLog( -@@ -308,48 +269,6 @@ void WebRtcLogUploader::LoggingStoppedDo + void WebRtcLogUploader::LoggingStoppedDoStore( +@@ -251,48 +212,6 @@ void WebRtcLogUploader::LoggingStoppedDo DCHECK(log_buffer.get()); DCHECK(!log_paths.directory.empty()); -- webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.directory); +- webrtc_logging::DeleteOldWebRtcLogFiles({log_paths.directory}); - - base::FilePath log_list_path = - webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory( @@ -122,6 +122,6 @@ registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls); - registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, true); + registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, false); - - // We need to register the type of these preferences in order to query - // them even though they're only typically controlled via policy. + registry->RegisterListPref( + prefs::kWebRTCDiagnosticLogCollectionAllowedForOrigins, + base::ListValue()); diff --git a/patches/core/ungoogled-chromium/disable-webstore-urls.patch b/patches/core/ungoogled-chromium/disable-webstore-urls.patch index 1c61d060..d5158064 100644 --- a/patches/core/ungoogled-chromium/disable-webstore-urls.patch +++ b/patches/core/ungoogled-chromium/disable-webstore-urls.patch @@ -51,7 +51,7 @@ @@ -34,7 +36,7 @@ void ExtensionMigrator::StartLoading() { if (should_have_extension) { - base::Value::Dict entry; + base::DictValue entry; entry.Set(ExternalProviderImpl::kExternalUpdateUrl, - extension_urls::GetWebstoreUpdateUrl().spec()); + chrome_blank_.spec()); @@ -158,7 +158,7 @@ ExtensionIdSet extension_ids_with_errors; for (const auto& failure : failures) extension_ids_with_errors.insert(failure.first.id); -@@ -1418,11 +1386,7 @@ bool ExtensionDownloader::IterateFetchCr +@@ -1422,11 +1390,7 @@ bool ExtensionDownloader::IterateFetchCr // fetch. switch (fetch->credentials) { case ExtensionFetch::CREDENTIALS_NONE: diff --git a/patches/core/ungoogled-chromium/doh-changes.patch b/patches/core/ungoogled-chromium/doh-changes.patch index 1b607b7d..b766c7f4 100644 --- a/patches/core/ungoogled-chromium/doh-changes.patch +++ b/patches/core/ungoogled-chromium/doh-changes.patch @@ -22,7 +22,7 @@ --- a/net/dns/public/doh_provider_entry.cc +++ b/net/dns/public/doh_provider_entry.cc -@@ -181,30 +181,6 @@ const DohProviderEntry::List& DohProvide +@@ -205,30 +205,6 @@ const DohProviderEntry::List& DohProvide /*display_globally=*/false, /*display_countries=*/{"EE", "DE"}, LoggingLevel::kNormal}, diff --git a/patches/core/ungoogled-chromium/extensions-manifestv2.patch b/patches/core/ungoogled-chromium/extensions-manifestv2.patch index 5a8efdaf..a5c9452f 100644 --- a/patches/core/ungoogled-chromium/extensions-manifestv2.patch +++ b/patches/core/ungoogled-chromium/extensions-manifestv2.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -878,19 +878,6 @@ void ExtensionInfoGenerator::FillExtensi +@@ -860,19 +860,6 @@ void ExtensionInfoGenerator::FillExtensi toolbar_actions_model->IsActionPinned(extension.id()); } @@ -22,7 +22,7 @@ // `CanUploadAsAccountExtension` should already check for the feature flag --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -371,31 +371,7 @@ bool ExtensionManagement::IsAllowedManif +@@ -372,31 +372,7 @@ bool ExtensionManagement::IsAllowedManif int manifest_version, const std::string& extension_id, Manifest::Type manifest_type) { @@ -54,7 +54,7 @@ } bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) { -@@ -416,26 +392,8 @@ bool ExtensionManagement::IsExemptFromMV +@@ -417,26 +393,8 @@ bool ExtensionManagement::IsExemptFromMV return false; } @@ -122,15 +122,15 @@ // Returns true if the given `stage` is one in which extension enablement should --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -484,7 +484,7 @@ content::WebUIDataSource* CreateAndAddEx +@@ -488,7 +488,7 @@ content::WebUIDataSource* CreateAndAddEx extensions_features::kExtensionsMenuAccessControlWithPermittedSites)); source->AddBoolean( "safetyHubThreeDotDetails", - base::FeatureList::IsEnabled(features::kSafetyHubThreeDotDetails)); + false); + source->AddBoolean("enableGlobalScopedShortcuts", IsGlobalShortcutEnabled()); // MV2 deprecation. - auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile); --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc @@ -97,13 +97,6 @@ bool IsManifestSupported(int manifest_ve diff --git a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch index 987d97b7..8bfb73ea 100644 --- a/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch +++ b/patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch @@ -3,7 +3,7 @@ --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -371,7 +371,6 @@ if (!is_android && !is_mac) { +@@ -372,7 +372,6 @@ if (!is_android && !is_mac) { data_deps += [ "//chrome/browser/resources/media/mei_preload:component", "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component", @@ -11,7 +11,7 @@ "//third_party/widevine/cdm", ] -@@ -936,8 +935,6 @@ if (is_win) { +@@ -935,8 +934,6 @@ if (is_win) { bundle_data("chrome_framework_resources") { sources = [ @@ -20,7 +20,7 @@ # This image is used to badge the lock icon in the # authentication dialogs, such as those used for installation # from disk image and Keystone promotion (if so enabled). It -@@ -1186,7 +1183,6 @@ if (is_win) { +@@ -1184,7 +1181,6 @@ if (is_win) { ":widevine_cdm_library", "//chrome/browser/resources/media/mei_preload:component_bundle", "//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle", @@ -30,7 +30,7 @@ if (is_chrome_branded) { --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -718,10 +718,6 @@ static_library("browser") { +@@ -698,10 +698,6 @@ static_library("browser") { "navigation_predictor/navigation_predictor_metrics_document_data.h", "navigation_predictor/navigation_predictor_preconnect_client.cc", "navigation_predictor/navigation_predictor_preconnect_client.h", @@ -41,7 +41,7 @@ "navigation_predictor/search_engine_preconnector_keyed_service_factory.cc", "navigation_predictor/search_engine_preconnector_keyed_service_factory.h", "net/cert_verifier_service_time_updater.cc", -@@ -3686,10 +3682,6 @@ static_library("browser") { +@@ -3667,10 +3663,6 @@ static_library("browser") { } else { #!is_android sources += [ @@ -52,16 +52,16 @@ "accessibility/caption_bubble_context_browser.h", "accessibility/embedded_a11y_extension_loader.cc", "accessibility/embedded_a11y_extension_loader.h", -@@ -4260,8 +4252,6 @@ static_library("browser") { +@@ -4236,8 +4228,6 @@ static_library("browser") { "//chrome/app:command_ids", "//chrome/app/theme:chrome_unscaled_resources_grit", "//chrome/app/vector_icons", - "//chrome/browser/accessibility/tree_fixing:prefs", - "//chrome/browser/accessibility/tree_fixing:service", "//chrome/browser/actor/ui", + "//chrome/browser/actor/ui:actor_overlay", "//chrome/browser/actor/ui:window_controller_impl", - "//chrome/browser/actor/ui/task_list_bubble:controller", -@@ -4301,10 +4291,6 @@ static_library("browser") { +@@ -4274,10 +4264,6 @@ static_library("browser") { "//chrome/browser/performance_manager/user_tuning", "//chrome/browser/policy:path_parser", "//chrome/browser/resource_coordinator", @@ -72,15 +72,15 @@ "//chrome/browser/sharing_hub", "//chrome/browser/smart_card", "//chrome/browser/themes", -@@ -4382,7 +4368,6 @@ static_library("browser") { +@@ -4354,7 +4340,6 @@ static_library("browser") { + "//chrome/browser/ui/webui:webui_util", "//chrome/browser/ui/webui/access_code_cast", - "//chrome/browser/ui/webui/actor_internals", "//chrome/browser/ui/webui/app_service_internals", - "//chrome/browser/ui/webui/autofill_ml_internals", "//chrome/browser/ui/webui/color_pipeline_internals", "//chrome/browser/ui/webui/commerce", "//chrome/browser/ui/webui/commerce:impl", -@@ -4482,9 +4467,6 @@ static_library("browser") { +@@ -4453,9 +4438,6 @@ static_library("browser") { "//components/webauthn/core/browser", "//components/webauthn/core/browser:passkey_model", "//services/device/public/cpp/hid", @@ -90,7 +90,7 @@ "//third_party/crashpad/crashpad/client:common", "//third_party/zxcvbn-cpp", "//ui/views", -@@ -4678,8 +4660,6 @@ static_library("browser") { +@@ -4646,8 +4628,6 @@ static_library("browser") { sources += [ "accessibility/soda_installer_impl.cc", "accessibility/soda_installer_impl.h", @@ -99,7 +99,7 @@ "download/bubble/download_bubble_accessible_alerts_map.cc", "download/bubble/download_bubble_accessible_alerts_map.h", "download/bubble/download_bubble_display_info.cc", -@@ -4731,8 +4711,6 @@ static_library("browser") { +@@ -4699,8 +4679,6 @@ static_library("browser") { "profiles/profile_activity_metrics_recorder.h", "profiles/profile_list_desktop.cc", "profiles/profile_list_desktop.h", @@ -107,8 +107,8 @@ - "screen_ai/screen_ai_downloader_non_chromeos.h", "signin/force_signin_verifier.cc", "signin/force_signin_verifier.h", - "signin/signin_manager.cc", -@@ -5567,7 +5545,6 @@ static_library("browser") { + ] +@@ -5536,7 +5514,6 @@ static_library("browser") { "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification", "//chrome/browser/resources:app_icon_resources", @@ -116,7 +116,7 @@ "//chrome/browser/sharesheet", "//chrome/browser/support_tool/ash", "//chrome/browser/ui/ash/accelerator", -@@ -5830,7 +5807,6 @@ static_library("browser") { +@@ -5800,7 +5777,6 @@ static_library("browser") { "//remoting/host/chromeos:browser_interop", "//remoting/host/chromeos:features", "//services/device/public/cpp/geolocation", @@ -138,9 +138,33 @@ - "//services/screen_ai/public/mojom", ] } +--- a/chrome/browser/actor/BUILD.gn ++++ b/chrome/browser/actor/BUILD.gn +@@ -394,8 +394,6 @@ source_set("browser_tests") { + ":tools_test_support", + "ui:event_dispatcher", + "//chrome/browser/affiliations", +- "//chrome/browser/glic", +- "//chrome/browser/glic/test_support", + "//chrome/browser/optimization_guide", + "//chrome/browser/optimization_guide:test_support", + "//chrome/browser/safe_browsing", +--- a/chrome/browser/actor/actor_keyed_service_factory.cc ++++ b/chrome/browser/actor/actor_keyed_service_factory.cc +@@ -15,9 +15,7 @@ namespace actor { + // static + ActorKeyedService* ActorKeyedServiceFactory::GetActorKeyedService( + content::BrowserContext* browser_context) { +- return static_cast( +- GetInstance()->GetServiceForBrowserContext(browser_context, +- /*create=*/true)); ++ return nullptr; + } + + // static --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc -@@ -250,12 +250,10 @@ void OnLocalStatePrefsLoaded(); +@@ -256,12 +256,10 @@ void OnLocalStatePrefsLoaded(); #if BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h" #include "chrome/browser/hid/hid_pinned_notification.h" @@ -153,7 +177,7 @@ #include "chrome/browser/usb/usb_status_icon.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif -@@ -1539,9 +1537,6 @@ void BrowserProcessImpl::PreMainMessageL +@@ -1562,9 +1560,6 @@ void BrowserProcessImpl::PreMainMessageL soda_installer_impl_ = std::make_unique(); #endif // BUILDFLAG(IS_CHROMEOS) @@ -187,16 +211,16 @@ std::unique_ptr platform_part_; --- a/chrome/browser/chrome_browser_interface_binders.cc +++ b/chrome/browser/chrome_browser_interface_binders.cc -@@ -84,8 +84,6 @@ +@@ -85,8 +85,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) -#include "chrome/browser/screen_ai/screen_ai_service_router.h" -#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h" - #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" + #include "chrome/browser/web_applications/sub_apps_service_impl.h" #endif -@@ -371,27 +369,6 @@ void BindMediaFoundationPreferences( +@@ -372,27 +370,6 @@ void BindMediaFoundationPreferences( } #endif // BUILDFLAG(IS_WIN) @@ -224,7 +248,7 @@ void BindModelBroker( content::RenderFrameHost* frame_host, -@@ -551,10 +528,6 @@ void PopulateChromeFrameBinders( +@@ -555,10 +532,6 @@ void PopulateChromeFrameBinders( &web_app::SubAppsServiceImpl::CreateIfAllowed); } @@ -237,7 +261,7 @@ #if BUILDFLAG(IS_WIN) --- a/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc +++ b/chrome/browser/chrome_browser_interface_binders_webui_parts_desktop.cc -@@ -488,8 +488,6 @@ void PopulateChromeWebUIFrameBindersPart +@@ -483,8 +483,6 @@ void PopulateChromeWebUIFrameBindersPart ::mojom::app_service_internals::AppServiceInternalsPageHandler, AppServiceInternalsUI>(map); @@ -248,7 +272,7 @@ access_code_cast::mojom::PageHandlerFactory, --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc -@@ -58,8 +58,6 @@ +@@ -52,8 +52,6 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h" @@ -257,9 +281,9 @@ #endif // BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID) -@@ -219,9 +217,6 @@ void RegisterComponentsForUpdate() { - // TODO(crbug.com/466086121) - Remove this cleanup code in M153+. - DeleteAutofillStatesComponent(path); +@@ -198,9 +196,6 @@ void RegisterComponentsForUpdate() { + RegisterRealTimeUrlChecksAllowlistComponent(cus); + #endif // BUIDLFLAG(IS_ANDROID) -#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) - ManageScreenAIComponentRegistration(cus, g_browser_process->local_state()); @@ -269,7 +293,22 @@ --- a/chrome/browser/contextual_cueing/contextual_cueing_helper.cc +++ b/chrome/browser/contextual_cueing/contextual_cueing_helper.cc -@@ -382,35 +382,6 @@ void ContextualCueingHelper::OnCueingDec +@@ -175,14 +175,6 @@ void ContextualCueingHelper::DidFinishNa + return; + } + +- // Make sure we always clear the nudge label anyway despite operating on +- // pages. +- auto* glic_nudge_controller = GetGlicNudgeController(); +- if (glic_nudge_controller) { +- glic_nudge_controller->UpdateNudgeLabel( +- web_contents(), std::string(), /*prompt_suggestion=*/std::nullopt, +- tabs::GlicNudgeActivity::kNudgeIgnoredNavigation, base::DoNothing()); +- } + + // Do not report page loads for these types of navigations. + if (navigation_handle->IsErrorPage() || +@@ -403,52 +395,6 @@ void ContextualCueingHelper::OnCueingDec return; } @@ -291,20 +330,69 @@ - decision_result->auto_send_params.has_value() && - decision_result->auto_send_params->auto_send_eligible && - !prompt_suggestion.empty(); -- glic_service->ToggleUI( -- browser_window_interface, -- /*prevent_close=*/true, -- glic::mojom::InvocationSource::kAutoOpenedByContextualCue, -- prompt_suggestion.empty() ? std::nullopt -- : std::make_optional(prompt_suggestion), -- auto_send_prompt); +- +- glic::mojom::InvocationSource invocation_source = +- glic::mojom::InvocationSource::kAutoOpenedByContextualCue; +- if (web_contents()->GetContentsMimeType() == pdf::kPDFMimeType && +- base::FeatureList::IsEnabled(features::kAutoOpenGlicForPdf)) { +- invocation_source = glic::mojom::InvocationSource::kAutoOpenedForPdf; +- } +- +- glic_service->ToggleUI(browser_window_interface, +- /*prevent_close=*/true, invocation_source, +- prompt_suggestion.empty() +- ? std::nullopt +- : std::make_optional(prompt_suggestion), +- auto_send_prompt); - return; - } - // Fall through to nudge if side panel open fails. - } +- +- GetGlicNudgeController()->UpdateNudgeLabel( +- web_contents(), cue_label, +- prompt_suggestion.empty() ? std::nullopt +- : std::make_optional(prompt_suggestion), +- /*activity=*/std::nullopt, +- base::BindRepeating(&ContextualCueingService::OnNudgeActivity, +- contextual_cueing_service_->GetWeakPtr(), +- web_contents(), document_available_time, +- decision_result->is_dynamic)); + } - GetGlicNudgeController()->UpdateNudgeLabel( - web_contents(), cue_label, + // static +--- a/chrome/browser/contextual_cueing/contextual_cueing_page_data.cc ++++ b/chrome/browser/contextual_cueing/contextual_cueing_page_data.cc +@@ -116,12 +116,6 @@ void ContextualCueingPageData::FindMatch + : std::nullopt})); + return; + } else if (config.has_cue_label()) { +- std::move(cueing_decision_callback_) +- .Run(base::ok(CueingResult{ +- l10n_util::GetStringUTF8( +- IDS_GLIC_BUTTON_ENTRYPOINT_ASK_ABOUT_THIS_PAGE_LABEL), +- /*prompt_suggestion=*/"", +- /*is_dynamic=*/false, /*auto_open_eligible=*/false})); + return; + } + } else if (decision == kNeedsPdfPageCount) { +--- a/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator.cc ++++ b/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator.cc +@@ -341,14 +341,6 @@ void ContextualTasksSidePanelCoordinator + ObserveWebContentsOnActiveTab(); + NotifyActiveTaskContextProvider(); + +- // Hide the GLIC nudge when the side panel is opened. +- if (auto* glic_nudge_controller = +- browser_window_->GetFeatures().glic_nudge_controller()) { +- glic_nudge_controller->UpdateNudgeLabel( +- active_tab_interface->GetContents(), "", std::nullopt, +- tabs::GlicNudgeActivity::kNudgeIgnoredOpenedContextualTasksSidePanel, +- base::DoNothing()); +- } + } + + void ContextualTasksSidePanelCoordinator::Close() { --- a/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn +++ b/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn @@ -18,7 +18,6 @@ source_set("pdf_viewer_private") { @@ -315,8 +403,8 @@ "//chrome/browser/pdf", "//chrome/browser/pdf:pdf_pref_names", "//chrome/browser/profiles:profile", -@@ -48,8 +47,6 @@ source_set("browser_tests") { - # sources = [ "pdf_viewer_private_browsertest.cc" ] +@@ -46,8 +45,6 @@ source_set("browser_tests") { + sources = [ "pdf_viewer_private_browsertest.cc" ] deps = [ ":pdf_viewer_private", - "//chrome/browser/glic", @@ -336,7 +424,7 @@ #include "chrome/browser/pdf/pdf_pref_names.h" #include "chrome/browser/pdf/pdf_viewer_stream_manager.h" #include "chrome/browser/profiles/profile.h" -@@ -306,24 +303,7 @@ ExtensionFunction::ResponseAction PdfVie +@@ -305,24 +302,7 @@ ExtensionFunction::ResponseAction PdfVie return RespondNow(Error("No tab.")); } @@ -361,6 +449,46 @@ } } // namespace extensions +--- a/chrome/browser/glic/public/glic_enabling.cc ++++ b/chrome/browser/glic/public/glic_enabling.cc +@@ -341,35 +341,11 @@ GlicGlobalEnabling::GlicGlobalEnabling(D + GlicGlobalEnabling::~GlicGlobalEnabling() = default; + + bool GlicGlobalEnabling::IsEnabledByFlags() { +- // It is important that this value not change at runtime in production. Any +- // future updates to this function must maintain that property. +- bool is_enabled = base::FeatureList::IsEnabled(features::kGlic) && +- locale_enablement_.value_or(true) && +- country_enablement_.value_or(true); +-#if BUILDFLAG(IS_CHROMEOS) +- static const bool supported_system_requirements = [] { +- constexpr base::ByteCount kMinimumMemoryThreshold = base::GiB(8); +- +- // TODO(b:468055370): Remove the bypassing once the glic is fully launched. +- const bool bypass_cbx_requirement = +- base::FeatureList::IsEnabled( +- chromeos::features::kGlicEnableFor8GbDevices) && +- base::SysInfo::AmountOfPhysicalMemory() >= kMinimumMemoryThreshold; +- +- return (bypass_cbx_requirement || +- base::FeatureList::IsEnabled( +- chromeos::features::kFeatureManagementGlic)); +- }(); +- +- is_enabled = is_enabled && supported_system_requirements; +-#endif // BUILDFLAG(IS_CHROMEOS) +- return is_enabled; ++ return false; + } + + bool GlicEnabling::IsEnabledByFlags() { +- return g_browser_process->GetFeatures() +- ->glic_global_enabling() +- .IsEnabledByFlags(); ++ return false; + } + + bool GlicEnabling::IsProfileEligible(const Profile* profile) { --- a/chrome/browser/navigation_predictor/navigation_predictor.cc +++ b/chrome/browser/navigation_predictor/navigation_predictor.cc @@ -17,8 +17,6 @@ @@ -466,7 +594,7 @@ void NavigationPredictor::SetModelScoreCallbackForTesting( --- a/chrome/browser/password_manager/password_change_delegate_impl.cc +++ b/chrome/browser/password_manager/password_change_delegate_impl.cc -@@ -350,16 +350,6 @@ void PasswordChangeDelegateImpl::StartPa +@@ -339,16 +339,6 @@ void PasswordChangeDelegateImpl::StartPa base::BindRepeating(&PasswordChangeDelegateImpl::OnLoginStateCheckResult, weak_ptr_factory_.GetWeakPtr())); @@ -495,7 +623,7 @@ "//chrome/browser/resources/pdf:resources", --- a/chrome/browser/pdf/pdf_extension_util.cc +++ b/chrome/browser/pdf/pdf_extension_util.cc -@@ -126,7 +126,6 @@ base::Value::Dict GetPdfViewerStrings() +@@ -128,7 +128,6 @@ base::DictValue GetPdfViewerStrings() { {"rotationStateLabel90", IDS_PDF_ROTATION_STATE_LABEL_90}, {"rotationStateLabel180", IDS_PDF_ROTATION_STATE_LABEL_180}, {"rotationStateLabel270", IDS_PDF_ROTATION_STATE_LABEL_270}, @@ -526,7 +654,7 @@ #include "chrome/browser/permissions/pref_based_quiet_permission_ui_selector.h" #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h" #include "chrome/browser/permissions/system/system_permission_settings.h" -@@ -475,8 +474,6 @@ ChromePermissionsClient::CreatePermissio +@@ -477,8 +476,6 @@ ChromePermissionsClient::CreatePermissio #endif selectors.emplace_back(std::make_unique( Profile::FromBrowserContext(browser_context))); @@ -535,7 +663,7 @@ return selectors; } -@@ -497,8 +494,6 @@ void ChromePermissionsClient::OnPromptRe +@@ -500,8 +497,6 @@ void ChromePermissionsClient::OnPromptRe Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); @@ -578,8 +706,8 @@ model_data.request_metadata.request_type; --- a/chrome/browser/prefs/BUILD.gn +++ b/chrome/browser/prefs/BUILD.gn -@@ -311,7 +311,6 @@ source_set("impl") { - "//chrome/browser/contextual_cueing", +@@ -312,7 +312,6 @@ source_set("impl") { + "//chrome/browser/actor/ui", "//chrome/browser/device_identity", "//chrome/browser/promos:utils", - "//chrome/browser/screen_ai:prefs", @@ -588,7 +716,7 @@ "//chrome/browser/sharing_hub", --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1572,9 +1572,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1622,9 +1622,6 @@ void RegisterLocalState(PrefRegistrySimp DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); #endif @@ -600,15 +728,15 @@ PlatformAuthPolicyObserver::RegisterPrefs(registry); --- a/chrome/browser/profiles/BUILD.gn +++ b/chrome/browser/profiles/BUILD.gn -@@ -380,7 +380,6 @@ source_set("profiles_extra_parts_impl") +@@ -384,7 +384,6 @@ source_set("profiles_extra_parts_impl") ] } else { deps += [ - "//chrome/browser/accessibility/tree_fixing:service", + "//chrome/browser/accessibility_annotator/content_annotator", "//chrome/browser/apps/app_service", "//chrome/browser/autofill", - "//chrome/browser/badging", -@@ -392,7 +391,6 @@ source_set("profiles_extra_parts_impl") +@@ -396,7 +395,6 @@ source_set("profiles_extra_parts_impl") "//chrome/browser/hid", "//chrome/browser/legion", "//chrome/browser/media/router/discovery/access_code:access_code_sink_service", @@ -618,7 +746,7 @@ "//chrome/browser/themes", --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -111,7 +111,6 @@ +@@ -112,7 +112,6 @@ #include "chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service_factory.h" #include "chrome/browser/metrics/variations/google_groups_manager_factory.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -634,7 +762,7 @@ #include "chrome/browser/search/instant_service_factory.h" #include "chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.h" #include "chrome/browser/speech/speech_recognition_client_browser_interface_factory.h" -@@ -1066,7 +1064,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1079,7 +1077,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) net::ServerCertificateDatabaseServiceFactory::GetInstance(); #endif @@ -642,7 +770,7 @@ #if BUILDFLAG(ENABLE_DICE_SUPPORT) HistorySyncOptinServiceFactory::GetInstance(); ProfileManagementDisclaimerServiceFactory::GetInstance(); -@@ -1115,9 +1112,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1128,9 +1125,6 @@ void ChromeBrowserMainExtraPartsProfiles OneGoogleBarServiceFactory::GetInstance(); OneTimePermissionsTrackerFactory::GetInstance(); #endif @@ -652,7 +780,7 @@ OptimizationGuideKeyedServiceFactory::GetInstance(); OriginKeyedPermissionActionServiceFactory::GetInstance(); OriginTrialsFactory::GetInstance(); -@@ -1203,7 +1197,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1216,7 +1210,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif @@ -660,7 +788,7 @@ PredictionServiceFactory::GetInstance(); predictors::AutocompleteActionPredictorFactory::GetInstance(); predictors::LoadingPredictorFactory::GetInstance(); -@@ -1282,10 +1275,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1296,10 +1289,6 @@ void ChromeBrowserMainExtraPartsProfiles SafetyHubMenuNotificationServiceFactory::GetInstance(); #if !BUILDFLAG(IS_ANDROID) SafetyHubHatsServiceFactory::GetInstance(); @@ -671,7 +799,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS) if (ash::features::IsScannerEnabled()) { -@@ -1407,7 +1396,6 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -1418,7 +1407,6 @@ void ChromeBrowserMainExtraPartsProfiles TopSitesFactory::GetInstance(); translate::TranslateRankerFactory::GetInstance(); #if !BUILDFLAG(IS_ANDROID) @@ -695,7 +823,7 @@ // System Profile. --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -842,11 +842,6 @@ void ProfileImpl::DoFinalInit(CreateMode +@@ -847,11 +847,6 @@ void ProfileImpl::DoFinalInit(CreateMode // The password settings service needs to start listening to settings // changes from Google Mobile Services, as early as possible. PasswordManagerSettingsServiceFactory::GetForProfile(this); @@ -709,7 +837,7 @@ // The announcement notification service might not be available for some --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -52,7 +52,6 @@ +@@ -51,7 +51,6 @@ #include "chrome/browser/buildflags.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h" @@ -717,7 +845,7 @@ #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/profiles/delete_profile_helper.h" #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h" -@@ -1582,9 +1581,6 @@ void ProfileManager::DoFinalInitForServi +@@ -1593,9 +1592,6 @@ void ProfileManager::DoFinalInitForServi // Ensure NavigationPredictorKeyedService is started. NavigationPredictorKeyedServiceFactory::GetForProfile(profile); @@ -729,7 +857,7 @@ #if BUILDFLAG(IS_ANDROID) --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn -@@ -113,7 +113,6 @@ group("resources") { +@@ -112,7 +112,6 @@ group("resources") { public_deps += [ "unexportable_keys_internals:resources", "//chrome/browser/resources/media/mei_preload:component", @@ -750,9 +878,32 @@ ${this.showErrorDialog ? html` +--- a/chrome/browser/skills/BUILD.gn ++++ b/chrome/browser/skills/BUILD.gn +@@ -50,11 +50,7 @@ source_set("public") { + source_set("ui") { + sources = [ + "skills_dialog_launcher.cc", +- "skills_ui_tab_controller.cc", +- "skills_ui_tab_controller.h", + "skills_ui_window_controller.cc", +- "skills_update_observer.cc", +- "skills_update_observer.h", + ] + + public_deps = [ --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -1508,8 +1508,6 @@ static_library("ui") { +@@ -1462,8 +1462,6 @@ static_library("ui") { + "//chrome/browser/ui/shared_highlighting", + "//chrome/browser/ui/tab_sharing", + "//chrome/browser/ui/tab_sharing:impl", +- "//chrome/browser/ui/tabs:glic", +- "//chrome/browser/ui/tabs:glic_impl", + "//chrome/browser/ui/tabs/organization", + "//chrome/browser/ui/tabs/organization:impl", + "//chrome/browser/ui/tabs/saved_tab_groups", +@@ -1503,8 +1501,6 @@ static_library("ui") { "//chrome/browser/regional_capabilities", "//chrome/browser/safe_browsing", "//chrome/browser/safe_browsing:advanced_protection", @@ -761,7 +912,17 @@ "//chrome/browser/smart_card", "//chrome/browser/tab_group_sync:utils", "//chrome/browser/themes", -@@ -2286,7 +2284,6 @@ static_library("ui") { +@@ -1824,9 +1820,6 @@ static_library("ui") { + # or get componentized: c/b/ui/browser_dialogs.h, browser_navigation.h, browser.h. + "//chrome/browser/ui/sync:impl", + +- # TODO(crbug.com/364501603): Remove this circular dependency when +- # c/b/ui/views/tabs/tab_strip_action_container.h gets componentized. +- "//chrome/browser/ui/tabs:glic_impl", + + # TODO(crbug.com/438226511): Remove this circular dependency when the following headers + # get componentized: +@@ -2288,7 +2281,6 @@ static_library("ui") { "//chrome/browser/policy:onc", "//chrome/browser/policy:system_features_disable_list", "//chrome/browser/push_notification", @@ -769,7 +930,7 @@ "//chrome/browser/ui/ash/accessibility", "//chrome/browser/ui/ash/app_access", "//chrome/browser/ui/ash/arc", -@@ -4784,7 +4781,6 @@ static_library("ui") { +@@ -4794,7 +4786,6 @@ static_library("ui") { "//chrome/browser/ui/waap:waap_utils", "//chrome/browser/ui/webauthn:impl", "//chrome/browser/ui/webui/app_service_internals", @@ -881,9 +1042,266 @@ "//components/safe_browsing/core/browser:safe_browsing_metrics_collector", "//components/safe_browsing/core/browser/db:database_manager", "//components/safety_check:features", +--- a/chrome/browser/ui/tab_search_feature.cc ++++ b/chrome/browser/ui/tab_search_feature.cc +@@ -12,6 +12,6 @@ namespace features { + bool HasTabSearchToolbarButton() { + // It is important that this value not change at runtime in production. Any + // future updates to this function must maintain that property. +- return glic::GlicEnabling::IsEnabledByFlags(); ++ return true; + } + } // namespace features +--- a/chrome/browser/ui/tabs/alert/tab_alert_controller.cc ++++ b/chrome/browser/ui/tabs/alert/tab_alert_controller.cc +@@ -178,7 +178,6 @@ std::u16string TabAlertController::GetTa + case TabAlert::kActorWaitingOnUser: + return l10n_util::GetStringUTF16( + IDS_TOOLTIP_TAB_ALERT_STATE_ACTOR_ACCESSING); +- case TabAlert::kGlicAccessing: + #if BUILDFLAG(ENABLE_GLIC) + return l10n_util::GetStringUTF16( + IDS_TOOLTIP_TAB_ALERT_STATE_GLIC_ACCESSING); +--- a/chrome/browser/ui/tabs/tab_features.cc ++++ b/chrome/browser/ui/tabs/tab_features.cc +@@ -366,23 +366,6 @@ void TabFeatures::Init(TabInterface& tab + tab, &tab, side_panel_registry_.get()); + } + #endif // BUILDFLAG(ENABLE_GLIC) +- // TODO(crbug.com/433973411): Move this logic to a helper function. +- if (base::FeatureList::IsEnabled(features::kGlicActorUi) && +- profile->IsRegularProfile()) { +- // The associated tab is passed to CreateInstance twice: for dependency +- // injection callbacks and as a direct constructor argument. +- actor_ui_tab_controller_ = +- GetUserDataFactory().CreateInstance( +- tab, tab, actor::ActorKeyedService::Get(profile)); +- } +- actor_tab_data_ = +- GetUserDataFactory().CreateInstance(tab, &tab); +- +- if (base::FeatureList::IsEnabled(features::kSkillsEnabled)) { +- skills_ui_tab_controller_ = +- GetUserDataFactory().CreateInstance( +- tab, tab); +- } + } // IsInNormalWindow() end. + + // This block instantiates the page action controllers that depends on the +--- a/chrome/browser/ui/tabs/tab_strip_api/converters/tab_converters.cc ++++ b/chrome/browser/ui/tabs/tab_strip_api/converters/tab_converters.cc +@@ -203,10 +203,6 @@ tabs::TabAlert FromMojo(mojom::AlertStat + return tabs::TabAlert::kAudioRecording; + case mojom::AlertState::kVideoRecording: + return tabs::TabAlert::kVideoRecording; +- case mojom::AlertState::kGlicAccessing: +- return tabs::TabAlert::kGlicAccessing; +- case mojom::AlertState::kGlicSharing: +- return tabs::TabAlert::kGlicSharing; + case mojom::AlertState::kActorAccessing: + return tabs::TabAlert::kActorAccessing; + case mojom::AlertState::kActorWaitingOnUser: +--- a/chrome/browser/ui/views/glic/glic_button_interface.h ++++ b/chrome/browser/ui/views/glic/glic_button_interface.h +@@ -18,13 +18,7 @@ namespace glic { + class GlicButtonInterface { + public: + static views::LabelButton* FromBrowser(BrowserWindowInterface* browser) { +- if (!browser) { + return nullptr; +- } +- +- BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser); +- CHECK(browser_view); +- return browser_view->GetGlicButton(); + } + }; + } // namespace glic +--- a/chrome/browser/ui/views/tabs/tab_strip_action_container.cc ++++ b/chrome/browser/ui/views/tabs/tab_strip_action_container.cc +@@ -532,41 +532,6 @@ void TabStripActionContainer::OnGlicActo + + #endif // BUILDFLAG(ENABLE_GLIC) + +-void TabStripActionContainer::OnTriggerGlicNudgeUI(std::string label) { +-#if BUILDFLAG(ENABLE_GLIC) +- if (GetIsShowingGlicActorTaskIconNudge()) { +- return; +- } +- +- CHECK(glic_button_); +- if (!label.empty()) { +- glic_button_->SetNudgeLabel(std::move(label)); +- ShowTabStripNudge(glic_button_); +- } +- +-#else +- NOTREACHED(); +-#endif // BUILDFLAG(ENABLE_GLIC) +-} +- +-void TabStripActionContainer::OnHideGlicNudgeUI() { +-#if BUILDFLAG(ENABLE_GLIC) +- +- CHECK(glic_button_); +- HideTabStripNudge(glic_button_); +- +-#else +- NOTREACHED(); +-#endif // BUILDFLAG(ENABLE_GLIC) +-} +- +-bool TabStripActionContainer::GetIsShowingGlicNudge() { +-#if BUILDFLAG(ENABLE_GLIC) +- return glic_button_ && glic_button_->GetIsShowingNudge(); +-#else +- return false; +-#endif // BUILDFLAG(ENABLE_GLIC) +-} + + #if BUILDFLAG(ENABLE_GLIC) + views::FlexLayoutView* TabStripActionContainer::glic_actor_button_container() { +@@ -670,23 +635,6 @@ void TabStripActionContainer::HideGlicAc + } + + void TabStripActionContainer::FinalizeHideGlicActorTaskIcon() { +- // 1. Reset Nudge State +- if (glic_actor_task_icon_->GetIsShowingNudge()) { +- if (animation_session_ && +- animation_session_->button() == glic_actor_task_icon_) { +- animation_session_.reset(); +- } +- glic_actor_task_icon_->SetIsShowingNudge(false); +- } +- glic_actor_task_icon_->SetVisible(false); +- glic_actor_task_icon_->SetTaskIconToDefault(); +- glic_button_ = AddChildView(std::move(glic_button_)); +- glic_actor_button_container_->SetVisible(false); +- glic_button_->Expand(); +- glic_button_->ResetSplitButtonCornerStyling(); +- // Reset the animation mode for the next time the icon is shown. +- glic_actor_task_icon_->SetAnimationMode(TaskIconAnimationMode::kEntry); +- UpdateGlicActorButtonContainerBorders(); + #if !BUILDFLAG(IS_MAC) + // Re-add the separator so it's ordered after the GlicButton. + separator_ = AddChildView(std::move(separator_)); +--- a/chrome/browser/ui/views/tabs/tab_strip_action_container.h ++++ b/chrome/browser/ui/views/tabs/tab_strip_action_container.h +@@ -9,7 +9,6 @@ + #include "chrome/browser/glic/browser_ui/glic_button_controller_delegate.h" + #include "chrome/browser/ui/tabs/glic_nudge_controller.h" + #include "chrome/browser/ui/tabs/glic_nudge_delegate.h" +-#include "chrome/browser/ui/views/glic/glic_button.h" + #include "chrome/browser/ui/views/glic/glic_button_interface.h" + #include "chrome/browser/ui/views/tabs/glic/glic_actor_task_icon.h" + #include "chrome/browser/ui/views/tabs/glic/tab_strip_glic_button.h" +@@ -35,7 +34,6 @@ class GlicAndActorButtonsContainer; + class TabStripActionContainer : public views::View, + public views::AnimationDelegateViews, + public views::MouseWatcherListener, +- public GlicNudgeDelegate, + public glic::GlicButtonControllerDelegate { + METADATA_HEADER(TabStripActionContainer, views::View) + +@@ -109,10 +107,6 @@ class TabStripActionContainer : public v + // views::MouseWatcherListener: + void MouseMovedOutOfHost() override; + +- // GlicNudgeDelegate: +- void OnTriggerGlicNudgeUI(std::string label) override; +- void OnHideGlicNudgeUI() override; +- bool GetIsShowingGlicNudge() override; + + // GlicButtonControllerDelegate: + void SetGlicShowState(bool show) override; +--- a/chrome/browser/ui/views/toolbar/BUILD.gn ++++ b/chrome/browser/ui/views/toolbar/BUILD.gn +@@ -34,7 +34,6 @@ source_set("toolbar") { + "toolbar_button_menu_highlighter.h", + "toolbar_chip_button.h", + "toolbar_controller.h", +- "toolbar_glic_button.h", + "toolbar_icon_container_view.h", + "toolbar_ink_drop_util.h", + "toolbar_view.h", +@@ -46,7 +45,6 @@ source_set("toolbar") { + public_deps = [ + "//base", + "//build:buildflag_header_h", +- "//chrome/browser/glic", + "//chrome/browser/ui:browser_element_identifiers", + "//chrome/browser/ui/browser_window", + "//chrome/browser/ui/color:color_headers", +@@ -58,7 +56,6 @@ source_set("toolbar") { + "//chrome/browser/ui/views", + "//chrome/browser/ui/views/frame", + "//chrome/browser/ui/views/frame:toolbar_button_provider", +- "//chrome/browser/ui/views/glic", + "//chrome/browser/ui/views/location_bar", + "//chrome/browser/ui/webui/webui_toolbar", + "//components/bookmarks/browser", +@@ -114,7 +111,6 @@ source_set("impl") { + "toolbar_button_menu_highlighter.cc", + "toolbar_chip_button.cc", + "toolbar_controller.cc", +- "toolbar_glic_button.cc", + "toolbar_icon_container_view.cc", + "toolbar_ink_drop_util.cc", + "toolbar_view.cc", +@@ -176,12 +172,10 @@ source_set("impl") { + "//chrome/browser/ui/views/contextual_tasks", + "//chrome/browser/ui/views/download", + "//chrome/browser/ui/views/frame:toolbar_button_provider", +- "//chrome/browser/ui/views/glic", + "//chrome/browser/ui/views/interaction", + "//chrome/browser/ui/views/page_action", + "//chrome/browser/ui/views/side_panel", + "//chrome/browser/ui/views/side_panel:side_panel_enums", +- "//chrome/browser/ui/views/tabs/glic", + "//chrome/browser/ui/waap", + "//chrome/browser/ui/waap:window_metrics_manager", + "//chrome/browser/ui/web_applications", +--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc ++++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc +@@ -23,7 +23,6 @@ + #include "chrome/app/chrome_command_ids.h" + #include "chrome/browser/command_updater.h" + #include "chrome/browser/glic/public/glic_enabling.h" +-#include "chrome/browser/glic/public/glic_keyed_service.h" + #include "chrome/browser/glic/public/glic_keyed_service_factory.h" + #include "chrome/browser/media/router/media_router_feature.h" + #include "chrome/browser/performance_manager/public/user_tuning/user_tuning_utils.h" +@@ -88,7 +87,6 @@ + #include "chrome/browser/ui/views/toolbar/split_tabs_button.h" + #include "chrome/browser/ui/views/toolbar/toolbar_button.h" + #include "chrome/browser/ui/views/toolbar/toolbar_controller.h" +-#include "chrome/browser/ui/views/toolbar/toolbar_glic_button.h" + #include "chrome/browser/ui/views/toolbar/webui_toolbar_web_view.h" + #include "chrome/browser/ui/views/zoom/zoom_view_controller.h" + #include "chrome/browser/ui/waap/initial_webui_window_metrics_manager.h" +@@ -517,7 +515,6 @@ void ToolbarView::Init() { + void ToolbarView::OnVerticalTabStripModeChanged( + tabs::VerticalTabStripStateController* controller) { + should_display_vertical_tabs_ = controller->ShouldDisplayVerticalTabs(); +- UpdateGlicButtonVisibility(); + } + + #if BUILDFLAG(ENABLE_GLIC) +@@ -663,6 +660,11 @@ void ToolbarView::SetGlicPanelIsOpen(boo + + glic_button_->SetGlicPanelIsOpen(open); + } ++#else ++void ToolbarView::SetGlicShowState(bool show) { ++} ++void ToolbarView::SetGlicPanelIsOpen(bool open) { ++} + #endif // ENABLE_GLIC + + void ToolbarView::AnimationEnded(const gfx::Animation* animation) { --- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc +++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -856,40 +856,6 @@ void MaybeRegisterChromeFeaturePromos( +@@ -855,40 +855,6 @@ void MaybeRegisterChromeFeaturePromos( "Triggered when the PDF Viewer opens."))); #endif @@ -926,9 +1344,9 @@ registry.RegisterFeature(std::move( --- a/chrome/browser/ui/webui/BUILD.gn +++ b/chrome/browser/ui/webui/BUILD.gn -@@ -69,7 +69,6 @@ source_set("configs") { +@@ -75,7 +75,6 @@ source_set("configs") { + "//chrome/browser/contextual_tasks:ui", "//chrome/browser/ui/webui/access_code_cast", - "//chrome/browser/ui/webui/actor_internals", "//chrome/browser/ui/webui/app_service_internals", - "//chrome/browser/ui/webui/autofill_ml_internals", "//chrome/browser/ui/webui/color_pipeline_internals", @@ -936,9 +1354,9 @@ "//chrome/browser/ui/webui/legion_internals", --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -306,7 +306,6 @@ void RegisterChromeWebUIConfigs() { +@@ -315,7 +315,6 @@ void RegisterChromeWebUIConfigs() { + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); @@ -994,7 +1412,7 @@ -} - -void AccessibilityMainHandler::HandleGetScreenAIInstallState( -- const base::Value::List& args) { +- const base::ListValue& args) { - CHECK_EQ(1U, args.size()); - const base::Value& callback_id = args[0]; - AllowJavascript(); @@ -1027,7 +1445,7 @@ - void StateChanged(screen_ai::ScreenAIInstallState::State state) override; private: - void HandleGetScreenReaderState(const base::Value::List& args); + void HandleGetScreenReaderState(const base::ListValue& args); @@ -51,9 +47,6 @@ class AccessibilityMainHandler base::CallbackListSubscription accessibility_subscription_; #endif // BUILDFLAG(IS_CHROMEOS) @@ -1049,7 +1467,7 @@ #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/browser.h" -@@ -402,14 +400,6 @@ ReadAnythingUntrustedPageHandler::ReadAn +@@ -406,14 +404,6 @@ ReadAnythingUntrustedPageHandler::ReadAn prefs_lang = language::ExtractBaseLanguage(prefs_lang); SetDefaultLanguageCode(prefs_lang); @@ -1064,20 +1482,47 @@ if (features::IsReadAnythingWithReadabilityEnabled()) { // Set the JavaScript world ID. +--- a/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc ++++ b/chrome/browser/ui/webui/tab_search/tab_search_page_handler.cc +@@ -1499,8 +1499,7 @@ tab_search::mojom::TabPtr TabSearchPageH + alert == tabs::TabAlert::kAudioRecording || + alert == tabs::TabAlert::kVideoRecording || + alert == tabs::TabAlert::kAudioPlaying || +- alert == tabs::TabAlert::kAudioMuting || +- alert == tabs::TabAlert::kGlicAccessing; ++ alert == tabs::TabAlert::kAudioMuting; + }); + + return tab_data; +--- a/chrome/browser/ui/webui/tabs/tabs_mojom_traits.cc ++++ b/chrome/browser/ui/webui/tabs/tabs_mojom_traits.cc +@@ -141,12 +141,6 @@ bool EnumTraits forms; std::vector regex_predictions; @@ -1276,7 +1721,7 @@ GeoIpCountryCode country_code; LanguageCode current_page_language; std::unique_ptr log_manager; -@@ -914,12 +912,6 @@ void AutofillManager::UpdateFormCache( +@@ -1046,12 +1044,6 @@ void AutofillManager::UpdateFormCache( auto apply_predictions = [](FormStructure& form_structure, const AsyncContext& context, size_t i) { @@ -1289,7 +1734,7 @@ if (!context.regex_predictions.empty()) { context.regex_predictions[i].ApplyTo(form_structure.fields()); } -@@ -1035,26 +1027,6 @@ void AutofillManager::LogCurrentFieldTyp +@@ -1169,26 +1161,6 @@ void AutofillManager::LogCurrentFieldTyp void AutofillManager::SubscribeToMlModelChanges( FieldClassificationModelHandler& handler) { @@ -1359,7 +1804,7 @@ fuzzer_test("update_client_protocol_serializer_fuzzer") { --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn -@@ -837,10 +837,6 @@ if (is_apple) { +@@ -849,10 +849,6 @@ if (is_apple) { deps = [ "//third_party/icu:icudata" ] } @@ -1459,7 +1904,7 @@ } --- a/third_party/devtools-frontend/src/front_end/BUILD.gn +++ b/third_party/devtools-frontend/src/front_end/BUILD.gn -@@ -211,7 +211,6 @@ group("unittests") { +@@ -213,7 +213,6 @@ group("unittests") { "panels/timeline:unittests", "panels/timeline/components:unittests", "panels/timeline/components/insights:unittests", diff --git a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch index 63734084..525bfa0e 100644 --- a/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch +++ b/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -561,8 +561,6 @@ static_library("browser") { +@@ -552,8 +552,6 @@ static_library("browser") { "idle/idle_detection_permission_context.h", "interstitials/chrome_settings_page_helper.cc", "interstitials/chrome_settings_page_helper.h", @@ -10,8 +10,8 @@ - "interstitials/enterprise_util.h", "invalidation/profile_invalidation_provider_factory.cc", "invalidation/profile_invalidation_provider_factory.h", - "k_anonymity_service/k_anonymity_service_client.cc", -@@ -2332,7 +2330,6 @@ static_library("browser") { + "k_anonymity_service/k_anonymity_service_factory.cc", +@@ -2314,7 +2312,6 @@ static_library("browser") { "//components/resources", "//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser:safe_browsing_service", @@ -19,7 +19,7 @@ "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common/proto:download_file_types_proto", -@@ -3944,10 +3941,6 @@ static_library("browser") { +@@ -3920,10 +3917,6 @@ static_library("browser") { "new_tab_page/modules/modules_switches.h", "new_tab_page/modules/new_tab_page_modules.cc", "new_tab_page/modules/new_tab_page_modules.h", @@ -30,15 +30,15 @@ "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.cc", "new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h", "new_tab_page/modules/v2/calendar/calendar_fake_data_helper.cc", -@@ -8610,7 +8603,6 @@ static_library("browser_generated_files" - "//chrome/browser/new_tab_page/chrome_colors:generate_chrome_colors_info", - "//chrome/browser/new_tab_page/chrome_colors:generate_colors_info", +@@ -8602,7 +8595,6 @@ static_library("browser_generated_files" + public_deps += [ + "//chrome/browser/lens/core/mojom:mojo_bindings", "//chrome/browser/new_tab_page/modules/file_suggestion:mojo_bindings", - "//chrome/browser/new_tab_page/modules/safe_browsing:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/authentication:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/calendar:mojo_bindings", "//chrome/browser/new_tab_page/modules/v2/most_relevant_tab_resumption:mojo_bindings", -@@ -9077,8 +9069,6 @@ static_library("test_support") { +@@ -9075,8 +9067,6 @@ static_library("test_support") { "//components/reporting/util:status", "//components/reporting/util:status_macros", "//components/reporting/util:task_runner_context", @@ -84,7 +84,7 @@ #include "content/public/browser/download_item_utils.h" #include "content/public/browser/download_manager.h" -@@ -278,14 +277,6 @@ void DownloadBubbleUIController::Process +@@ -274,14 +273,6 @@ void DownloadBubbleUIController::Process switch (command) { case DownloadCommands::KEEP: case DownloadCommands::DISCARD: { @@ -109,7 +109,7 @@ using ConnectionType = net::NetworkChangeNotifier::ConnectionType; #if BUILDFLAG(SAFE_BROWSING_DOWNLOAD_PROTECTION) -@@ -1982,7 +1981,6 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -1989,7 +1988,6 @@ void ChromeDownloadManagerDelegate::OnDo DownloadItemModel model(item); model.DetermineAndSetShouldPreferOpeningInBrowser( target_info.target_path, target_info.is_filetype_handled_safely); @@ -117,7 +117,7 @@ } if (ShouldBlockFile(item, target_info.danger_type)) { MaybeReportDangerousDownloadBlocked( -@@ -2063,49 +2061,20 @@ bool ChromeDownloadManagerDelegate::IsOp +@@ -2070,49 +2068,20 @@ bool ChromeDownloadManagerDelegate::IsOp bool ChromeDownloadManagerDelegate::ShouldBlockFile( download::DownloadItem* item, download::DownloadDangerType danger_type) const { @@ -173,7 +173,7 @@ << static_cast(download_restriction); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1264,14 +1264,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1265,14 +1265,7 @@ DownloadFileType::DangerLevel DownloadTa std::optional DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { @@ -332,7 +332,7 @@ std::u16string ContentAnalysisDownloadsDelegate::GetBypassJustificationLabel() --- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc +++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.cc -@@ -171,70 +171,12 @@ void FilesRequestHandler::FileRequestCal +@@ -174,63 +174,12 @@ void FilesRequestHandler::FileRequestCal } bool FilesRequestHandler::UploadDataImpl() { @@ -353,17 +353,10 @@ - base::BindOnce(&FilesRequestHandler::CreateFileOpeningJob, - weak_ptr_factory_.GetWeakPtr(), std::move(tasks))); - -- switch (AccessPointToEnterpriseConnector(access_point_)) { -- case enterprise_connectors::FILE_ATTACHED: -- base::UmaHistogramCustomCounts(kFileAttachCount, paths_.size(), 1, 1000, -- 100); -- break; -- case enterprise_connectors::FILE_TRANSFER: -- base::UmaHistogramCustomCounts(kFileTransferCount, paths_.size(), 1, -- 1000, 100); -- break; -- default: -- break; +- if (auto prefix = AccessPointToUmaHistogramPrefix(access_point_); +- !prefix.empty()) { +- base::UmaHistogramCustomCounts(prefix + ".FileCount", paths_.size(), 1, +- 1000, 100); - } - - return true; @@ -403,7 +396,7 @@ void FilesRequestHandler::OnGotFileInfo( std::unique_ptr request, size_t index, -@@ -281,19 +223,6 @@ void FilesRequestHandler::OnGotFileInfo( +@@ -277,19 +226,6 @@ void FilesRequestHandler::OnGotFileInfo( void FilesRequestHandler::FinishRequestEarly( std::unique_ptr request, ScanRequestUploadResult result) { @@ -438,7 +431,7 @@ void OnGotFileInfo(std::unique_ptr request, --- a/chrome/browser/enterprise/connectors/connectors_manager.cc +++ b/chrome/browser/enterprise/connectors/connectors_manager.cc -@@ -182,26 +182,7 @@ void ConnectorsManager::OnPrefChanged(An +@@ -169,26 +169,7 @@ void ConnectorsManager::OnAnalysisPrefCh } DataRegion ConnectorsManager::GetDataRegion(AnalysisConnector connector) const { @@ -464,7 +457,7 @@ -#endif } - void ConnectorsManager::StartObservingPrefs(PrefService* pref_service) { + } // namespace enterprise_connectors --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc @@ -26,24 +26,6 @@ enum class PasswordProtectionTrigger { @@ -525,7 +518,7 @@ --- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -277,20 +277,7 @@ void RealtimeReportingClient::SetProfile +@@ -278,20 +278,7 @@ void RealtimeReportingClient::SetProfile } std::string RealtimeReportingClient::GetProfileUserName() { @@ -639,7 +632,7 @@ signal_response.profile_id = profile_id_service_->GetProfileId(); --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -403,8 +403,6 @@ source_set("extensions") { +@@ -398,8 +398,6 @@ source_set("extensions") { "mv2_experiment_stage.h", "navigation_extension_enabler.cc", "navigation_extension_enabler.h", @@ -669,7 +662,7 @@ info.enterprise_profile_id = signals.enterprise_profile_id; --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -390,8 +390,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -410,8 +410,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; (*s_allowlist)[::kGeneratedHttpsFirstModePref] = settings_api::PrefType::kNumber; @@ -680,10 +673,10 @@ --- a/chrome/browser/extensions/chrome_extension_system.cc +++ b/chrome/browser/extensions/chrome_extension_system.cc -@@ -466,8 +466,6 @@ void ChromeExtensionSystem::InstallUpdat +@@ -478,8 +478,6 @@ void ChromeExtensionSystem::InstallUpdat void ChromeExtensionSystem::PerformActionBasedOnOmahaAttributes( const std::string& extension_id, - const base::Value::Dict& attributes) { + const base::DictValue& attributes) { - extension_service()->PerformActionBasedOnOmahaAttributes(extension_id, - attributes); } @@ -713,7 +706,7 @@ --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc -@@ -54,7 +54,6 @@ +@@ -53,7 +53,6 @@ #include "chrome/browser/extensions/installed_loader.h" #include "chrome/browser/extensions/manifest_v2_experiment_manager.h" #include "chrome/browser/extensions/mv2_experiment_stage.h" @@ -721,7 +714,7 @@ #include "chrome/browser/extensions/profile_util.h" #include "chrome/browser/extensions/sync/extension_sync_service.h" #include "chrome/browser/extensions/updater/chrome_extension_downloader_factory.h" -@@ -218,9 +217,6 @@ ExtensionService::ExtensionService( +@@ -219,9 +218,6 @@ ExtensionService::ExtensionService( extension_telemetry_service_verdict_handler_(extension_prefs, registry_, extension_registrar_), @@ -731,7 +724,7 @@ force_installed_tracker_(registry_, profile_), force_installed_metrics_(registry_, profile_, &force_installed_tracker_), corrupted_extension_reinstaller_( -@@ -407,11 +403,6 @@ void ExtensionService::LoadExtensionsFro +@@ -416,11 +412,6 @@ void ExtensionService::LoadExtensionsFro << "--load-extension is not allowed in Google Chrome, ignoring."; return; #else // BUILDFLAG(GOOGLE_CHROME_BRANDING) && !BUILDFLAG(IS_CHROMEOS) @@ -743,13 +736,13 @@ if (ShouldBlockCommandLineExtension(*profile_)) { // TODO(crbug.com/401529219): Deprecate this restriction once // --load-extension removal on Chrome builds is fully launched. -@@ -467,17 +458,6 @@ void ExtensionService::LoadSigninProfile +@@ -476,17 +467,6 @@ void ExtensionService::LoadSigninProfile } #endif -void ExtensionService::PerformActionBasedOnOmahaAttributes( - const std::string& extension_id, -- const base::Value::Dict& attributes) { +- const base::DictValue& attributes) { - DCHECK_CURRENTLY_ON(BrowserThread::UI); - omaha_attributes_handler_.PerformActionBasedOnOmahaAttributes(extension_id, - attributes); @@ -769,20 +762,20 @@ #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h" -#include "chrome/browser/extensions/omaha_attributes_handler.h" #include "chrome/browser/extensions/safe_browsing_verdict_handler.h" + #include "chrome/browser/policy/cloud/extension_install_policy_service.h" #include "chrome/browser/profiles/profile_manager_observer.h" - #include "chrome/browser/upgrade_detector/upgrade_observer.h" -@@ -165,10 +164,6 @@ class ExtensionService : public Extensio +@@ -170,10 +169,6 @@ class ExtensionService : public Extensio // KeyedService two-phase shutdown. void Shutdown(); - // Performs action based on Omaha attributes for the extension. - void PerformActionBasedOnOmahaAttributes(const std::string& extension_id, -- const base::Value::Dict& attributes); +- const base::DictValue& attributes); - // Performs action based on verdicts received from the Extension Telemetry // server. Currently, these verdicts are limited to off-store extensions. void PerformActionBasedOnExtensionTelemetryServiceVerdicts( -@@ -383,8 +378,6 @@ class ExtensionService : public Extensio +@@ -388,8 +383,6 @@ class ExtensionService : public Extensio ExtensionTelemetryServiceVerdictHandler extension_telemetry_service_verdict_handler_; @@ -842,9 +835,29 @@ UMA_HISTOGRAM_ENUMERATION("Extensions.Greylist.Disabled", extension->location()); } +--- a/chrome/browser/feedback/report_unsafe_site_dialog.cc ++++ b/chrome/browser/feedback/report_unsafe_site_dialog.cc +@@ -9,16 +9,13 @@ + #include "chrome/browser/profiles/profile.h" + #include "chrome/common/pref_names.h" + #include "components/prefs/pref_service.h" +-#include "components/safe_browsing/core/common/safe_browsing_prefs.h" + + namespace feedback { + + // static + bool ReportUnsafeSiteDialog::IsEnabled(const Profile& profile) { + const PrefService* prefs = profile.GetPrefs(); +- return base::FeatureList::IsEnabled(features::kReportUnsafeSite) && +- prefs->GetBoolean(prefs::kUserFeedbackAllowed) && +- safe_browsing::IsSafeBrowsingEnabled(*prefs); ++ return false; + } + + } // namespace feedback --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -862,13 +862,6 @@ void ChromeMetricsServiceClient::Registe +@@ -861,13 +861,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider(MakeDemographicMetricsProvider( metrics::MetricsLogUploader::MetricServiceType::UMA)); @@ -1096,7 +1109,7 @@ return PredictionSource::kNoCpssModel; --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -2579,8 +2579,6 @@ std::unique_ptrAddHandler( std::make_unique( chrome_schema)); @@ -1107,7 +1120,7 @@ std::make_unique(key::kURLBlocklist)); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -267,7 +267,6 @@ +@@ -269,7 +269,6 @@ #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/new_tab_page/modules/file_suggestion/drive_service.h" #include "chrome/browser/new_tab_page/modules/file_suggestion/microsoft_files_page_handler.h" @@ -1115,7 +1128,7 @@ #include "chrome/browser/new_tab_page/modules/v2/authentication/microsoft_auth_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/google_calendar_page_handler.h" #include "chrome/browser/new_tab_page/modules/v2/calendar/outlook_calendar_page_handler.h" -@@ -1838,7 +1837,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1897,7 +1896,6 @@ void RegisterProfilePrefs(user_prefs::Pr NewTabFooterUI::RegisterProfilePrefs(registry); NewTabPageHandler::RegisterProfilePrefs(registry); NewTabPageUI::RegisterProfilePrefs(registry); @@ -1125,7 +1138,7 @@ promos_utils::RegisterProfilePrefs(registry); --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -885,9 +885,7 @@ void ChromeBrowserMainExtraPartsProfiles +@@ -896,9 +896,7 @@ void ChromeBrowserMainExtraPartsProfiles enterprise_connectors::TelomereEventRouterFactory::GetInstance(); } #endif @@ -1135,35 +1148,6 @@ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ BUILDFLAG(IS_WIN) enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); ---- a/chrome/browser/push_messaging/push_messaging_service_factory.cc -+++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc -@@ -19,7 +19,6 @@ - #include "chrome/browser/push_messaging/push_messaging_service_impl.h" - #include "chrome/browser/safe_browsing/safe_browsing_service.h" - #include "components/gcm_driver/instance_id/instance_id_profile_service.h" --#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - - // static - PushMessagingServiceImpl* PushMessagingServiceFactory::GetForProfile( -@@ -73,17 +72,7 @@ PushMessagingServiceFactory::BuildServic - content::BrowserContext* context) const { - Profile* profile = Profile::FromBrowserContext(context); - CHECK(!profile->IsOffTheRecord()); -- // Reporting service worker network requests should only be done for ESB -- // users. The check below is the first ESB check. A second ESB check is -- // performed before anything about the service worker is sent off device to -- // Safe Browsing. If at the time of the second check the user is found to no -- // longer be an ESB user, no Safe Browsing report will be sent. -- bool includeSafeBrowsingDatabase = -- g_browser_process && g_browser_process->safe_browsing_service() && -- safe_browsing::IsEnhancedProtectionEnabled(*profile->GetPrefs()); - return std::make_unique( - profile, -- includeSafeBrowsingDatabase -- ? g_browser_process->safe_browsing_service()->database_manager() -- : nullptr); -+ nullptr); - } --- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts @@ -143,7 +143,7 @@ export class SettingsPrivacyPageIndexEle @@ -1207,7 +1191,7 @@ # "Safe Browsing Basic" files used for safe browsing in full mode --- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc -@@ -72,10 +72,6 @@ void FileOpeningJob::ProcessNextTask(bas +@@ -73,10 +73,6 @@ void FileOpeningJob::ProcessNextTask(bas if (tasks_[i].taken.exchange(true, std::memory_order_relaxed)) continue; @@ -1413,15 +1397,15 @@ --- a/chrome/browser/safe_browsing/generated_security_settings_bundle_pref.cc +++ b/chrome/browser/safe_browsing/generated_security_settings_bundle_pref.cc -@@ -10,7 +10,6 @@ - #include "chrome/common/extensions/api/settings_private.h" +@@ -11,7 +11,6 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" + #include "components/safe_browsing/core/common/features.h" -#include "components/safe_browsing/core/common/safe_browsing_prefs.h" - namespace settings_api = extensions::api::settings_private; + namespace safe_browsing { -@@ -23,66 +22,20 @@ GeneratedSecuritySettingsBundlePref::Gen +@@ -19,59 +18,20 @@ GeneratedSecuritySettingsBundlePref::Gen Profile* profile) : profile_(profile) { user_prefs_registrar_.Init(profile->GetPrefs()); @@ -1453,24 +1437,17 @@ - PrefService* local_state = g_browser_process->local_state(); - - // This is how the bundle controls each security setting. -- if (selection == static_cast(SecuritySettingsBundleSetting::ENHANCED)) { -- // Keep this section sorted by feature name and label each section with -- // the feature. -- -- // Secure DNS Setting +- if (base::FeatureList::IsEnabled( +- safe_browsing::kBundledSecuritySettingsSecureDnsV2)) { +- // Secure DNS Setting. - // TODO(crbug.com/460180440): migrate to a per-profile setting. +- const bool fallback_to_doh = +- selection == static_cast(SecuritySettingsBundleSetting::ENHANCED); - local_state->SetString(prefs::kDnsOverHttpsMode, - SecureDnsConfig::kModeAutomatic); - local_state->SetString(prefs::kDnsOverHttpsTemplates, ""); - local_state->SetBoolean(prefs::kDnsOverHttpsAutomaticModeFallbackToDoh, -- true); -- } else { -- // Secure DNS Setting -- local_state->SetString(prefs::kDnsOverHttpsMode, -- SecureDnsConfig::kModeAutomatic); -- local_state->SetString(prefs::kDnsOverHttpsTemplates, ""); -- local_state->SetBoolean(prefs::kDnsOverHttpsAutomaticModeFallbackToDoh, -- false); +- fallback_to_doh); - } - return extensions::settings_private::SetPrefResult::SUCCESS; @@ -1619,7 +1596,7 @@ // certificate. So, when users click proceed on an interstitial, move the tab --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -4318,8 +4318,6 @@ static_library("ui") { +@@ -4320,8 +4320,6 @@ static_library("ui") { "views/safe_browsing/password_reuse_modal_warning_dialog.h", "views/safe_browsing/tailored_security_desktop_dialog_manager.cc", "views/safe_browsing/tailored_security_desktop_dialog_manager.h", @@ -1694,7 +1671,7 @@ unused_site_permissions_manager_ = std::make_unique(browser_context, prefs); -@@ -608,5 +581,5 @@ bool RevokedPermissionsService::IsUnused +@@ -607,5 +580,5 @@ bool RevokedPermissionsService::IsUnused } bool RevokedPermissionsService::IsAbusiveNotificationAutoRevocationEnabled() { @@ -1713,7 +1690,7 @@ --- a/chrome/browser/ui/toasts/toast_service.cc +++ b/chrome/browser/ui/toasts/toast_service.cc -@@ -36,7 +36,6 @@ +@@ -38,7 +38,6 @@ #include "components/plus_addresses/core/browser/grit/plus_addresses_strings.h" #include "components/plus_addresses/core/common/features.h" #include "components/safe_browsing/core/common/features.h" @@ -1721,7 +1698,7 @@ #include "components/strings/grit/components_strings.h" #include "components/tabs/public/tab_interface.h" #include "components/vector_icons/vector_icons.h" -@@ -160,57 +159,6 @@ void ToastService::RegisterToasts( +@@ -142,57 +141,6 @@ void ToastService::RegisterToasts( .Build()); } @@ -1844,7 +1821,7 @@ @@ -89,43 +86,6 @@ void HatsHandler::RegisterMessages() { */ - void HatsHandler::HandleSecurityPageHatsRequest(const base::Value::List& args) { + void HatsHandler::HandleSecurityPageHatsRequest(const base::ListValue& args) { AllowJavascript(); - - CHECK_EQ(4U, args.size()); @@ -1888,8 +1865,8 @@ /** @@ -140,10 +100,6 @@ SurveyStringData HatsHandler::GetSecurit Profile* profile, - const base::Value::List& args) { - const base::Value::List& interactions = args[0].GetList(); + const base::ListValue& args) { + const base::ListValue& interactions = args[0].GetList(); - auto safe_browsing_state = static_cast(args[1].GetInt()); - - auto security_settings_bundle_setting = @@ -1897,7 +1874,7 @@ std::string security_page_interactions = ""; std::set interaction_set; -@@ -189,62 +145,14 @@ SurveyStringData HatsHandler::GetSecurit +@@ -242,62 +198,14 @@ SurveyStringData HatsHandler::GetSecurit security_page_interactions = base::JoinString(interaction_strings, ", "); std::string safe_browsing_state_before = ""; @@ -1973,7 +1950,7 @@ } SafetyHubHandler::~SafetyHubHandler() = default; -@@ -834,14 +830,4 @@ void SafetyHubHandler::OnJavascriptAllow +@@ -831,14 +827,4 @@ void SafetyHubHandler::OnJavascriptAllow void SafetyHubHandler::OnJavascriptDisallowed() {} void SafetyHubHandler::OnSafeBrowsingEnhancedChanged() { @@ -1990,7 +1967,7 @@ } --- a/chrome/browser/ui/webui/settings/security_settings_provider.cc +++ b/chrome/browser/ui/webui/settings/security_settings_provider.cc -@@ -8,26 +8,22 @@ +@@ -8,30 +8,25 @@ #include "chrome/browser/safe_browsing/generated_safe_browsing_pref.h" #include "chrome/browser/ssl/https_upgrades_util.h" #include "components/safe_browsing/core/common/features.h" @@ -2005,6 +1982,11 @@ html_source->AddBoolean( "enableBundledSecuritySettings", - base::FeatureList::IsEnabled(safe_browsing::kBundledSecuritySettings)); ++ false); + html_source->AddBoolean( + "enableBundledSecuritySettingsSecureDnsV2", +- base::FeatureList::IsEnabled( +- safe_browsing::kBundledSecuritySettingsSecureDnsV2)); + false); html_source->AddBoolean("enableHttpsFirstModeNewSettings", IsBalancedModeAvailable()); @@ -2022,7 +2004,7 @@ // security-related-settings (not the strings) to this function. --- a/chrome/common/webui_url_constants.cc +++ b/chrome/common/webui_url_constants.cc -@@ -130,7 +130,6 @@ base::span Chr +@@ -131,7 +131,6 @@ base::span Chr kChromeUISuggestInternalsHost, #endif kChromeUINTPTilesInternalsHost, @@ -2032,7 +2014,7 @@ kChromeUITabSearchHost, --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -2859,7 +2859,6 @@ if (!is_android) { +@@ -2900,7 +2900,6 @@ if (!is_android) { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2040,7 +2022,7 @@ "//components/safe_browsing/content/browser:credit_card_form_event", "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", -@@ -7291,7 +7290,6 @@ test("unit_tests") { +@@ -7364,7 +7363,6 @@ test("unit_tests") { "//components/resources", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", @@ -2124,7 +2106,7 @@ --- a/components/enterprise/browser/reporting/chrome_profile_request_generator.cc +++ b/components/enterprise/browser/reporting/chrome_profile_request_generator.cc -@@ -301,18 +301,12 @@ void ChromeProfileRequestGenerator::OnAg +@@ -294,18 +294,12 @@ void ChromeProfileRequestGenerator::OnAg profile_signals.built_in_dns_client_enabled); profile_signals_report->set_chrome_remote_desktop_app_blocked( profile_signals.chrome_remote_desktop_app_blocked); @@ -2216,7 +2198,7 @@ # Indicates support for content analysis against a cloud agent for Enterprise # Connector policies. enterprise_cloud_content_analysis = -- is_win || is_mac || is_linux || is_chromeos +- is_win || is_mac || is_linux || is_chromeos || is_ios + false # Indicates support for content analysis against a cloud agent for Enterprise @@ -2255,7 +2237,7 @@ - } } - const base::Value::List* enabled_opt_in_events_value = + const base::ListValue* enabled_opt_in_events_value = --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc @@ -312,12 +312,7 @@ bool LeakDetectionCheck::IsURLBlockedByP @@ -2274,7 +2256,7 @@ } // namespace password_manager --- a/components/safe_browsing/content/common/safe_browsing.mojom +++ b/components/safe_browsing/content/common/safe_browsing.mojom -@@ -174,7 +174,6 @@ interface PhishingDetector { +@@ -177,7 +177,6 @@ interface PhishingDetector { // Interface for setting a phishing model. This is scoped to an entire // RenderProcess. @@ -2333,7 +2315,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "google_apis/google_api_keys.h" #include "net/base/net_errors.h" -@@ -117,21 +116,7 @@ constexpr net::NetworkTrafficAnnotationT +@@ -126,21 +125,7 @@ constexpr net::NetworkTrafficAnnotationT bool IsEnabled(PrefService* pref_service, std::optional country, bool are_background_lookups_allowed) { @@ -2356,7 +2338,7 @@ } GURL GetKeyFetchingUrl() { -@@ -406,42 +391,9 @@ void OhttpKeyService::MaybeStartServerTr +@@ -443,42 +428,9 @@ void OhttpKeyService::MaybeStartServerTr } void OhttpKeyService::PopulateKeyFromPref() { @@ -2502,7 +2484,7 @@ return; } -@@ -521,25 +519,10 @@ void TailoredSecurityService::Shutdown() +@@ -529,25 +527,10 @@ void TailoredSecurityService::Shutdown() } void TailoredSecurityService::TailoredSecurityTimestampUpdateCallback() { @@ -2746,7 +2728,7 @@ return RespondNow(Error(std::move(error))); --- a/extensions/browser/api/web_request/extension_web_request_event_router.cc +++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc -@@ -1137,14 +1137,6 @@ int WebRequestEventRouter::OnBeforeReque +@@ -1143,14 +1143,6 @@ int WebRequestEventRouter::OnBeforeReque DCHECK(action.redirect_url); OnDNRActionMatched(browser_context, *request, action); *new_url = GetNewUrl(action.redirect_url.value(), browser_context); @@ -2933,12 +2915,12 @@ // static --- a/extensions/browser/updater/update_service.cc +++ b/extensions/browser/updater/update_service.cc -@@ -131,13 +131,6 @@ void UpdateService::OnCrxStateChange(Upd +@@ -132,13 +132,6 @@ void UpdateService::OnCrxStateChange(Upd break; } - if (should_perform_action_on_omaha_attributes) { -- base::Value::Dict attributes = GetExtensionOmahaAttributes(item); +- base::DictValue attributes = GetExtensionOmahaAttributes(item); - // Note that it's important to perform actions even if |attributes| is - // empty, missing values may default to false and have associated logic. - ExtensionSystem::Get(browser_context_) diff --git a/patches/core/ungoogled-chromium/move-js-optimizer-unfamiliar-sites.patch b/patches/core/ungoogled-chromium/move-js-optimizer-unfamiliar-sites.patch index 31c6d5ea..502838a8 100644 --- a/patches/core/ungoogled-chromium/move-js-optimizer-unfamiliar-sites.patch +++ b/patches/core/ungoogled-chromium/move-js-optimizer-unfamiliar-sites.patch @@ -23,7 +23,7 @@ #include "content/public/browser/render_process_host.h" --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc -@@ -96,6 +96,7 @@ void PrefProvider::RegisterProfilePrefs( +@@ -98,6 +98,7 @@ void PrefProvider::RegisterProfilePrefs( ContentSettingsPattern::kContentSettingsPatternVersion); registry->RegisterBooleanPref(prefs::kInContextCookieControlsOpened, false); registry->RegisterBooleanPref(kGeolocationMigrateExceptionsPref, false); @@ -33,7 +33,7 @@ WebsiteSettingsRegistry::GetInstance(); --- a/components/content_settings/core/common/pref_names.h +++ b/components/content_settings/core/common/pref_names.h -@@ -277,6 +277,8 @@ inline constexpr char kDesktopSiteWindow +@@ -281,6 +281,8 @@ inline constexpr char kDesktopSiteWindow "desktop_site.window_setting"; #endif diff --git a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch index 666885f6..edb11a09 100644 --- a/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch +++ b/patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch @@ -95,7 +95,7 @@ } --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -288,7 +288,6 @@ +@@ -296,7 +296,6 @@ #include "components/safe_browsing/core/browser/url_checker_delegate.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" @@ -155,7 +155,7 @@ #include "content/public/browser/web_contents.h" --- a/chrome/browser/enterprise/connectors/connectors_service.cc +++ b/chrome/browser/enterprise/connectors/connectors_service.cc -@@ -272,8 +272,7 @@ std::string ConnectorsService::GetManage +@@ -194,8 +194,7 @@ std::string ConnectorsService::GetManage std::optional scope = std::nullopt; for (const char* scope_pref : @@ -576,7 +576,7 @@ #include "components/spellcheck/browser/pref_names.h" #include "components/supervised_user/core/common/pref_names.h" #include "components/themes/pref_names.h" -@@ -350,8 +348,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -370,8 +368,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kNumber; // Privacy page @@ -585,7 +585,7 @@ (*s_allowlist)[::prefs::kDnsOverHttpsMode] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kDnsOverHttpsTemplates] = settings_api::PrefType::kString; -@@ -376,16 +372,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil +@@ -396,16 +392,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil settings_api::PrefType::kBoolean; // Security page @@ -723,7 +723,7 @@ {"spellingServiceEnabled", spellcheck::prefs::kSpellCheckUseSpellingService, --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -72,7 +72,6 @@ +@@ -73,7 +73,6 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/privacy_sandbox/privacy_sandbox_prefs.h" @@ -731,7 +731,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/first_party_sets_handler.h" -@@ -1456,15 +1455,8 @@ void ProfileNetworkContextService::Confi +@@ -1434,15 +1433,8 @@ void ProfileNetworkContextService::Confi network_context_params->enable_certificate_reporting = true; @@ -916,7 +916,7 @@ { key::kSavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled, base::Value::Type::BOOLEAN }, -@@ -532,9 +517,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -520,9 +505,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdsSettingForIntrusiveAdsSites, prefs::kManagedDefaultAdsSetting, base::Value::Type::INTEGER }, @@ -926,7 +926,7 @@ { key::kAllowCrossOriginAuthPrompt, prefs::kAllowCrossOriginAuthPrompt, base::Value::Type::BOOLEAN }, -@@ -750,15 +732,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -735,15 +717,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kPasswordDismissCompromisedAlertEnabled, password_manager::prefs::kPasswordDismissCompromisedAlertEnabled, base::Value::Type::BOOLEAN }, @@ -942,7 +942,7 @@ #if BUILDFLAG(ENABLE_PDF) { key::kPdfLocalFileAccessAllowedForDomains, prefs::kPdfLocalFileAccessAllowedForDomains, -@@ -922,9 +895,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -907,9 +880,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kAdditionalDnsQueryTypesEnabled, prefs::kAdditionalDnsQueryTypesEnabled, base::Value::Type::BOOLEAN }, @@ -952,7 +952,7 @@ { key::kForceGoogleSafeSearch, policy_prefs::kForceGoogleSafeSearch, base::Value::Type::BOOLEAN }, -@@ -994,9 +964,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -979,9 +949,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, @@ -962,17 +962,17 @@ { key::kPasswordManagerBlocklist, password_manager::prefs::kPasswordManagerBlocklist, base::Value::Type::LIST }, -@@ -1984,9 +1951,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -1967,9 +1934,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, - { key::kProfileSeparationDomainExceptionList, - prefs::kProfileSeparationDomainExceptionList, - base::Value::Type::LIST }, - { key::kLiveCaptionEnabled, - prefs::kLiveCaptionEnabled, - base::Value::Type::BOOLEAN }, -@@ -2060,9 +2024,6 @@ const PolicyToPreferenceMapEntry kSimple + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + { key::kDefaultBrowserSettingEnabled, +@@ -2043,9 +2007,6 @@ const PolicyToPreferenceMapEntry kSimple prefs::kImportDialogAutofillFormData, base::Value::Type::BOOLEAN }, @@ -982,7 +982,7 @@ { key::kHardwareAccelerationModeEnabled, prefs::kHardwareAccelerationModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2333,9 +2294,6 @@ const PolicyToPreferenceMapEntry kSimple +@@ -2319,9 +2280,6 @@ const PolicyToPreferenceMapEntry kSimple { key::kGoogleSearchSidePanelEnabled, prefs::kGoogleSearchSidePanelEnabled, base::Value::Type::BOOLEAN }, @@ -992,7 +992,7 @@ #endif // BUILDFLAG(IS_ANDROID) { key::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, policy_prefs::kAllowBackForwardCacheForCacheControlNoStorePageEnabled, -@@ -2900,28 +2858,6 @@ std::unique_ptrAddHandler(std::make_unique( key::kProfileReauthPrompt, enterprise_signin::prefs::kProfileReauthPrompt, static_cast(enterprise_signin::ProfileReauthPrompt::kDoNotPrompt), -@@ -2991,11 +2927,6 @@ std::unique_ptr> signin_legacy_policies; @@ -1033,7 +1033,7 @@ handlers->AddHandler(std::make_unique( std::make_unique( -@@ -3008,19 +2939,6 @@ std::unique_ptr(chrome_schema))); --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -161,7 +161,6 @@ +@@ -164,7 +164,6 @@ #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "components/regional_capabilities/regional_capabilities_prefs.h" #include "components/safe_browsing/buildflags.h" @@ -1063,7 +1063,7 @@ #include "components/safety_check/safety_check_prefs.h" #include "components/saved_tab_groups/public/pref_names.h" #include "components/search_engines/search_engine_choice/search_engine_choice_service.h" -@@ -173,7 +172,6 @@ +@@ -176,7 +175,6 @@ #include "components/sessions/core/session_id_generator.h" #include "components/sharing_message/sharing_sync_preference.h" #include "components/signin/core/browser/active_primary_accounts_metrics_recorder.h" @@ -1071,7 +1071,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_engagement/content/site_engagement_service.h" -@@ -1383,7 +1381,6 @@ void RegisterLocalState(PrefRegistrySimp +@@ -1424,7 +1422,6 @@ void RegisterLocalState(PrefRegistrySimp PushMessagingServiceImpl::RegisterPrefs(registry); #endif RegisterScreenshotPrefs(registry); @@ -1079,7 +1079,7 @@ search_engines::SearchEngineChoiceService::RegisterLocalStatePrefs(registry); secure_origin_allowlist::RegisterPrefs(registry); segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs( -@@ -1720,7 +1717,6 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -1780,7 +1777,6 @@ void RegisterProfilePrefs(user_prefs::Pr #if BUILDFLAG(SAFE_BROWSING_AVAILABLE) safe_browsing::file_type::RegisterProfilePrefs(registry); #endif @@ -1117,7 +1117,7 @@ #include "components/search_engines/search_engines_pref_names.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" - #include "components/supervised_user/core/browser/supervised_user_content_filters_service.h" + #include "components/supervised_user/core/browser/device_parental_controls.h" #include "components/supervised_user/core/browser/supervised_user_pref_store.h" @@ -133,9 +131,6 @@ const auto kTrackedPrefs = std::to_array {5, extensions::pref_names::kExtensions, EnforcementLevel::NO_ENFORCEMENT, @@ -1189,7 +1189,7 @@ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc -@@ -36,7 +36,6 @@ +@@ -37,7 +37,6 @@ #include "components/prefs/pref_service.h" #include "components/profile_metrics/state.h" #include "components/signin/public/base/consent_level.h" @@ -1255,17 +1255,17 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/site_isolation/site_isolation_policy.h" -@@ -1087,7 +1086,6 @@ void ProfileImpl::OnLocaleReady(CreateMo - CHECK(!ProfilePasswordStoreFactory::HasStore(this)); - CHECK(!AccountPasswordStoreFactory::HasStore(this)); - CHECK(!ReadingListModelFactory::HasModel(this)); +@@ -1095,7 +1094,6 @@ void ProfileImpl::OnLocaleReady(CreateMo + #if !BUILDFLAG(IS_ANDROID) + CHECK(!ThemeServiceFactory::GetForProfileIfExists(this)); + #endif // !BUILDFLAG(IS_ANDROID) - browser_sync::MaybeMigrateSyncingUserToSignedIn(GetPath(), GetPrefs()); #if BUILDFLAG(IS_CHROMEOS) // If this is a kiosk profile, reset some of its prefs which should not --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc -@@ -94,7 +94,6 @@ +@@ -93,7 +93,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -1273,7 +1273,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/primary_account_mutator.h" #include "components/signin/public/identity_manager/tribool.h" -@@ -1989,8 +1988,7 @@ void ProfileManager::AddProfileToStorage +@@ -2000,8 +1999,7 @@ void ProfileManager::AddProfileToStorage entry->SetAuthInfo(account_info.gaia, username, is_consented_primary_account); @@ -1283,7 +1283,7 @@ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) // Sign out if force-sign-in policy is enabled and profile is not signed -@@ -2039,14 +2037,13 @@ void ProfileManager::AddProfileToStorage +@@ -2050,14 +2048,13 @@ void ProfileManager::AddProfileToStorage init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile); init_params.is_signed_in_with_credential_provider = @@ -1301,7 +1301,7 @@ prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName); --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc -@@ -40,7 +40,6 @@ +@@ -41,7 +41,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/prefs/pref_service.h" @@ -1602,7 +1602,7 @@ --- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -75,7 +75,6 @@ +@@ -74,7 +74,6 @@ #include "components/safe_browsing/core/browser/verdict_cache_manager.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -1610,7 +1610,7 @@ #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "components/safe_browsing/core/common/utils.h" #include "components/security_interstitials/core/unsafe_resource.h" -@@ -1392,14 +1391,6 @@ bool ChromePasswordProtectionService::Ha +@@ -1409,14 +1408,6 @@ bool ChromePasswordProtectionService::Ha } void ChromePasswordProtectionService::OnWarningTriggerChanged() { @@ -1625,7 +1625,7 @@ // Clears captured enterprise password hashes or GSuite sync password hashes. password_manager::PasswordReuseManager* reuse_manager = GetPasswordReuseManager(); -@@ -1575,7 +1566,7 @@ PrefService* ChromePasswordProtectionSer +@@ -1592,7 +1583,7 @@ PrefService* ChromePasswordProtectionSer } bool ChromePasswordProtectionService::IsSafeBrowsingEnabled() { @@ -1634,7 +1634,7 @@ } bool ChromePasswordProtectionService::IsExtendedReporting() { -@@ -1595,54 +1586,7 @@ bool ChromePasswordProtectionService::Is +@@ -1612,54 +1603,7 @@ bool ChromePasswordProtectionService::Is bool ChromePasswordProtectionService::IsPingingEnabled( LoginReputationClientRequest::TriggerType trigger_type, ReusedPasswordAccountType password_type) { @@ -1689,7 +1689,7 @@ } RequestOutcome ChromePasswordProtectionService::GetPingNotSentReason( -@@ -1885,23 +1829,6 @@ MaybeCreateCommitDeferringCondition( +@@ -1902,23 +1846,6 @@ MaybeCreateCommitDeferringCondition( : nullptr; } @@ -1774,7 +1774,7 @@ #include "content/public/browser/browser_task_traits.h" --- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc -@@ -95,7 +95,6 @@ +@@ -94,7 +94,6 @@ #include "components/safe_browsing/core/browser/db/v4_protocol_manager_util.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -1905,9 +1905,9 @@ - UMA_HISTOGRAM_BOOLEAN("SafeBrowsing.Pref.Enhanced", - pref_service->GetBoolean(prefs::kSafeBrowsingEnhanced)); - // Record the current enhanced protection pref state for regular profiles only - if (profiles::IsRegularUserProfile(profile)) { -@@ -758,18 +743,6 @@ void SafeBrowsingServiceImpl::RefreshSta + // Record the current enhanced protection pref state and JS Optimizer setting + // for regular profiles only +@@ -762,18 +747,6 @@ void SafeBrowsingServiceImpl::RefreshSta // Check if any profile requires the service to be active. enabled_by_prefs_ = false; @@ -2084,7 +2084,7 @@ #include "testing/gtest/include/gtest/gtest.h" --- a/chrome/browser/signin/accounts_policy_manager.cc +++ b/chrome/browser/signin/accounts_policy_manager.cc -@@ -40,7 +40,6 @@ +@@ -42,7 +42,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2092,7 +2092,7 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/accounts_mutator.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -204,25 +203,11 @@ void AccountsPolicyManager::Initialize() +@@ -211,25 +210,11 @@ void AccountsPolicyManager::Initialize() EnsurePrimaryAccountAllowedForProfile( profile_, signin_metrics::ProfileSignout::kSigninNotAllowedOnProfileInit); @@ -2118,7 +2118,7 @@ if (identity_manager->AreRefreshTokensLoaded()) { OnRefreshTokensLoaded(); } -@@ -231,7 +216,6 @@ void AccountsPolicyManager::Initialize() +@@ -238,7 +223,6 @@ void AccountsPolicyManager::Initialize() void AccountsPolicyManager::Shutdown() { profile_pref_change_registrar_.RemoveAll(); local_state_pref_registrar_.RemoveAll(); @@ -2126,7 +2126,7 @@ } void AccountsPolicyManager::OnGoogleServicesUsernamePatternChanged() { -@@ -303,9 +287,7 @@ void AccountsPolicyManager::EnsurePrimar +@@ -310,9 +294,7 @@ void AccountsPolicyManager::EnsurePrimar << ", ProfileSignoutSource=" << static_cast(clear_primary_account_source) << ", signin.allowed preference=" @@ -2266,7 +2266,7 @@ #include "content/public/browser/storage_partition.h" --- a/chrome/browser/signin/dice_web_signin_interceptor.cc +++ b/chrome/browser/signin/dice_web_signin_interceptor.cc -@@ -78,7 +78,6 @@ +@@ -79,7 +79,6 @@ #include "components/search_engines/template_url_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -2274,7 +2274,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_capabilities.h" -@@ -420,16 +419,8 @@ void DiceWebSigninInterceptor::RegisterP +@@ -417,16 +416,8 @@ void DiceWebSigninInterceptor::RegisterP registry->RegisterBooleanPref(prefs::kSigninInterceptionEnabled, true); registry->RegisterStringPref(prefs::kManagedAccountsSigninRestriction, std::string()); @@ -2291,7 +2291,7 @@ } std::optional -@@ -1563,16 +1554,6 @@ void DiceWebSigninInterceptor:: +@@ -1562,16 +1553,6 @@ void DiceWebSigninInterceptor:: g_browser_process->browser_policy_connector(), g_browser_process->system_network_context_manager() ->GetSharedURLLoaderFactory()); @@ -2310,7 +2310,7 @@ void DiceWebSigninInterceptor:: --- a/chrome/browser/signin/header_modification_delegate_impl.cc +++ b/chrome/browser/signin/header_modification_delegate_impl.cc -@@ -16,7 +16,6 @@ +@@ -17,7 +17,6 @@ #include "chrome/browser/sync/sync_service_factory.h" #include "components/policy/core/common/policy_pref_names.h" #include "components/prefs/pref_service.h" @@ -2337,55 +2337,17 @@ #include "content/public/common/content_client.h" #include "content/public/test/browser_test.h" #include "google_apis/gaia/gaia_urls.h" ---- a/chrome/browser/signin/signin_manager.cc -+++ b/chrome/browser/signin/signin_manager.cc -@@ -16,7 +16,6 @@ - #include "components/prefs/pref_service.h" - #include "components/signin/public/base/signin_client.h" - #include "components/signin/public/base/signin_metrics.h" --#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/base/signin_switches.h" - #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" - #include "components/signin/public/identity_manager/identity_manager.h" -@@ -61,10 +60,6 @@ SigninManager::SigninManager(PrefService - : prefs_(prefs), - signin_client_(client), - identity_manager_(identity_manager) { -- signin_allowed_.Init( -- prefs::kSigninAllowed, &prefs, -- base::BindRepeating(&SigninManager::OnSigninAllowedPrefChanged, -- base::Unretained(this))); - UpdateUnconsentedPrimaryAccount(); - identity_manager_observation_.Observe(&identity_manager_.get()); - } -@@ -148,16 +143,6 @@ CoreAccountInfo SigninManager::ComputeUn - signin::ConsentLevel::kSync); - } - -- // Clearing the primary sync account when sign-in is not allowed is handled -- // by PrimaryAccountPolicyManager. That flow is extremely hard to follow -- // especially for the case when the user is syncing with a managed account -- // as in that case the whole profile needs to be deleted. -- // -- // It was considered simpler to keep the logic to update the unconsented -- // primary account in a single place. -- if (!signin_allowed_.GetValue()) { -- return CoreAccountInfo(); -- } - - bool is_current_primary_account_valid = - IsValidUnconsentedPrimaryAccount(current_primary_account); --- a/chrome/browser/signin/signin_promo.cc +++ b/chrome/browser/signin/signin_promo.cc -@@ -18,7 +18,6 @@ - #include "components/google/core/common/google_util.h" +@@ -19,7 +19,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_service.h" + #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "content/public/browser/browser_context.h" -@@ -197,12 +196,6 @@ void RegisterProfilePrefs( +@@ -194,12 +193,6 @@ void RegisterProfilePrefs( // Signin promo limits experiment prefs. registry->RegisterIntegerPref( @@ -2473,7 +2435,7 @@ } int GetContextualPromoDismissCountPerSignedOutProfile(Profile& profile, -@@ -430,92 +391,14 @@ bool ShouldShowSignInPromoCommon(Profile +@@ -430,94 +391,14 @@ bool ShouldShowSignInPromoCommon(Profile #if !BUILDFLAG(IS_ANDROID) bool ShouldShowSyncPromo(Profile& profile) { @@ -2532,8 +2494,8 @@ #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(ENABLE_EXTENSIONS) - bool ShouldShowExtensionSyncPromo(Profile& profile, - const extensions::Extension& extension) { + bool ShouldShowExtensionSignInPromo(Profile& profile, + const extensions::Extension& extension) { -#if BUILDFLAG(ENABLE_DICE_SUPPORT) - // Don't show the promo if it does not pass the sync base checks. - if (!signin::ShouldShowSyncPromo(profile)) { @@ -2552,21 +2514,23 @@ - return false; - } - -- // The promo is not shown to users that have explicitly signed in through -- // the browser (even if extensions are not syncing). -- if (profile.GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin)) { +- if (const signin::IdentityManager* identity_manager = +- IdentityManagerFactory::GetForProfile(&profile); +- identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSignin)) { +- // The promo is not shown to users that have explicitly signed in through +- // the browser (even if extensions are not syncing). - return false; - } - } - -- return true; +- return ShouldShowSignInPromoCommon(profile, SignInPromoType::kExtension); -#else return false; -#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) } + #endif // BUILDFLAG(ENABLE_EXTENSIONS) - bool ShouldShowExtensionSignInPromo(Profile& profile, -@@ -563,35 +446,7 @@ bool ShouldShowAddressSignInPromo(Profil +@@ -548,35 +429,7 @@ bool ShouldShowAddressSignInPromo(Profil } bool ShouldShowBookmarkSignInPromo(Profile& profile) { @@ -2602,7 +2566,7 @@ } bool IsBubbleSigninPromo(signin_metrics::AccessPoint access_point) { -@@ -641,70 +496,6 @@ SignInPromoType GetSignInPromoTypeFromAc +@@ -626,70 +479,6 @@ SignInPromoType GetSignInPromoTypeFromAc #if BUILDFLAG(ENABLE_DICE_SUPPORT) void RecordSignInPromoShown(signin_metrics::AccessPoint access_point, Profile* profile) { @@ -2746,7 +2710,7 @@ } #endif // !BUILDFLAG(IS_CHROMEOS) -@@ -572,59 +543,7 @@ bool IsValidAccessPointForHistoryOptinSc +@@ -563,59 +534,7 @@ bool IsValidAccessPointForHistoryOptinSc } bool ShouldShowAvatarSyncPromo(Profile* profile) { @@ -3095,47 +3059,6 @@ return SafeBrowsingState::kDisabledByUser; } ---- a/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc -+++ b/chrome/browser/ui/signin/cookie_clear_on_exit_migration_notice.cc -@@ -23,7 +23,6 @@ - #include "components/prefs/pref_service.h" - #include "components/signin/public/base/consent_level.h" - #include "components/signin/public/base/signin_buildflags.h" --#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/identity_manager/identity_manager.h" - #include "components/strings/grit/components_strings.h" - #include "ui/base/l10n/l10n_util.h" -@@ -67,7 +66,6 @@ void OpenCookieSettingsAndCloseDialog(Br - } - - bool SetCookieClearOnExitMigrationComplete(PrefService& prefs, bool can_close) { -- prefs.SetBoolean(prefs::kCookieClearOnExitMigrationNoticeComplete, true); - return can_close; - } - -@@ -78,11 +76,6 @@ bool SetCookieClearOnExitMigrationComple - bool CanShowCookieClearOnExitMigrationNotice(const Browser& browser) { - #if BUILDFLAG(ENABLE_DICE_SUPPORT) - Profile* profile = browser.profile(); -- PrefService* prefs = profile->GetPrefs(); -- -- if (prefs->GetBoolean(prefs::kCookieClearOnExitMigrationNoticeComplete)) { -- return false; -- } - - if (CookieClearOnExitMigrationNoticeShowingUserData::HasForProfile( - *profile)) { -@@ -96,10 +89,6 @@ bool CanShowCookieClearOnExitMigrationNo - // User has to be signed in with UNO (non-syncing). - signin::IdentityManager* identity_manager = - IdentityManagerFactory::GetForProfile(profile); -- if (!prefs->GetBoolean(prefs::kExplicitBrowserSignin)) { -- return false; -- } -- - if (identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)) { - return false; - } --- a/chrome/browser/ui/signin/dice_migration_service.cc +++ b/chrome/browser/ui/signin/dice_migration_service.cc @@ -27,7 +27,6 @@ @@ -3146,7 +3069,24 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_managed_status_finder.h" #include "components/signin/public/identity_manager/account_managed_status_finder_outcome.h" -@@ -130,36 +129,7 @@ void SetBannerImage(ui::DialogModel::Bui +@@ -87,16 +86,8 @@ void OnHelpCenterLinkClicked(Browser* br + } + + bool IsUserEligibleForDiceMigration(Profile* profile) { +- signin::IdentityManager* identity_manager = +- IdentityManagerFactory::GetForProfile(profile); +- if (!identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSignin) || +- identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)) { + // The user is not signed in or has sync enabled. + return false; +- } +- +- // The user is implicitly signed in. +- return !profile->GetPrefs()->GetBoolean(prefs::kExplicitBrowserSignin); + } + + void SetBannerImage(ui::DialogModel::Builder& builder, +@@ -126,36 +117,7 @@ void SetBannerImage(ui::DialogModel::Bui } bool MaybeMigrateUser(Profile* profile) { @@ -3159,7 +3099,7 @@ - // Backup the prefs. - prefs->SetDict( - kDiceMigrationBackup, -- base::Value::Dict() +- base::DictValue() - .SetByDottedPath(prefs::kExplicitBrowserSignin, - prefs->GetBoolean(prefs::kExplicitBrowserSignin)) - .SetByDottedPath( @@ -3183,7 +3123,7 @@ } bool MaybeShowToast(Browser* browser) { -@@ -313,23 +283,7 @@ void DiceMigrationService::RevertDiceMig +@@ -309,23 +271,7 @@ void DiceMigrationService::RevertDiceMig } const bool restored_from_backup = [prefs]() -> bool { @@ -3209,7 +3149,7 @@ prefs->SetBoolean(kDiceMigrationRestoredFromBackup, restored_from_backup); --- a/chrome/browser/ui/signin/signin_view_controller.cc +++ b/chrome/browser/ui/signin/signin_view_controller.cc -@@ -34,7 +34,6 @@ +@@ -35,7 +35,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -3217,7 +3157,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -393,15 +392,6 @@ void SigninViewController::SignoutOrReau +@@ -396,15 +395,6 @@ void SigninViewController::SignoutOrReau &SigninViewController::SignoutOrReauthWithPromptWithUnsyncedDataTypes, weak_ptr_factory_.GetWeakPtr(), reauth_access_point, profile_signout_source, token_signout_source); @@ -3233,7 +3173,7 @@ // Dice users don't see the prompt, pass empty datatypes. std::move(signout_prompt_with_datatypes) .Run(absl::flat_hash_map()); -@@ -788,9 +778,7 @@ void SigninViewController::SignoutOrReau +@@ -791,9 +781,7 @@ void SigninViewController::SignoutOrReau }); // Do not show the dialog to users with implicit signin. @@ -3289,7 +3229,7 @@ void SetFirstRunFinished(FirstRunService::FinishedReason reason) { --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -113,7 +113,6 @@ +@@ -115,7 +115,6 @@ #include "components/profile_metrics/browser_profile_type.h" #include "components/saved_tab_groups/public/features.h" #include "components/signin/public/base/signin_metrics.h" @@ -3297,7 +3237,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "components/sync/base/features.h" -@@ -608,107 +607,7 @@ int ProfileSubMenuModel::GetAndIncrement +@@ -610,106 +609,7 @@ int ProfileSubMenuModel::GetAndIncrement } bool ProfileSubMenuModel::BuildSyncSection() { @@ -3371,12 +3311,11 @@ - icon = &vector_icons::kErrorOutlineIcon; - break; - case syncer::SyncService::UserActionableError::kBookmarksLimitExceeded: -- // TODO(crbug.com/452968646): For kBookmarksLimitExceeded, lead to -- // sync settings instead of a help article. The "Learn more" string is -- // generic, and the sync settings page would show the user the -- // specific error. -- break; +- // For this specific error (as opposed to all others), there is no +- // error UI in the menu. +- return true; - } +- CHECK_NE(command_id, 0); - AddItemWithStringIdAndVectorIcon(this, command_id, button_string_id, - *icon); - return true; @@ -3435,7 +3374,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/tribool.h" -@@ -453,49 +452,6 @@ void AvatarToolbarButton::MaybeShowSuper +@@ -546,49 +545,6 @@ void AvatarToolbarButton::MaybeShowSuper } void AvatarToolbarButton::MaybeShowSignInBenefitsIPH() { @@ -3505,7 +3444,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -1024,9 +1023,7 @@ void ProfileMenuView::MaybeBuildChromeAc +@@ -1017,9 +1016,7 @@ void ProfileMenuView::MaybeBuildChromeAc // Show the settings button when signed in to Chrome or to the web, or if // signin is disallowed. const bool should_show_settings_button = @@ -3516,7 +3455,7 @@ if (!should_show_settings_button) { return; } -@@ -1048,25 +1045,6 @@ void ProfileMenuView::MaybeBuildChromeAc +@@ -1041,25 +1038,6 @@ void ProfileMenuView::MaybeBuildChromeAc } void ProfileMenuView::MaybeBuildGoogleServicesSettingsButton() { @@ -3682,13 +3621,13 @@ - // account for the profile chip. - item->GetViewAccessibility().SetName( - views::MenuItemView::GetAccessibleNameForMenuItem( -- item->title(), GetSigninStatusChipString(profile), false)); +- item->title(), GetSigninStatusChipString(profile), std::nullopt)); } // AppMenuView is a view that can contain label buttons. --- a/chrome/browser/ui/views/user_education/browser_ntp_promos.cc +++ b/chrome/browser/ui/views/user_education/browser_ntp_promos.cc -@@ -24,7 +24,6 @@ +@@ -25,7 +25,6 @@ #include "chrome/grit/branded_strings.h" #include "chrome/grit/generated_resources.h" #include "components/prefs/pref_service.h" @@ -3696,7 +3635,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/user_education/common/ntp_promo/ntp_promo_registry.h" #include "components/user_education/common/ntp_promo/ntp_promo_specification.h" -@@ -49,34 +48,7 @@ Profile* GetProfile(ContextPtr context) +@@ -50,34 +49,7 @@ Profile* GetProfile(ContextPtr context) NtpPromoSpecification::Eligibility CheckSignInPromoEligibility( ContextPtr context) { @@ -3733,7 +3672,7 @@ void SignInPromoShown() { --- a/chrome/browser/ui/webui/browser_command/browser_command_handler.cc +++ b/chrome/browser/ui/webui/browser_command/browser_command_handler.cc -@@ -36,7 +36,6 @@ +@@ -38,7 +38,6 @@ #include "components/performance_manager/public/features.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/common/safe_browsing_policy_handler.h" @@ -3741,7 +3680,7 @@ #include "components/safe_browsing/core/common/safebrowsing_referral_methods.h" #include "components/saved_tab_groups/public/features.h" #include "components/tabs/public/tab_interface.h" -@@ -101,13 +100,6 @@ void BrowserCommandHandler::CanExecuteCo +@@ -103,13 +102,6 @@ void BrowserCommandHandler::CanExecuteCo case Command::kOpenSafetyCheck: can_execute = !enterprise_util::IsBrowserManaged(profile_); break; @@ -3765,7 +3704,7 @@ #include "components/strings/grit/components_strings.h" #include "content/public/browser/web_ui_data_source.h" #include "ui/base/l10n/l10n_util.h" -@@ -82,7 +81,7 @@ content::WebUIDataSource* HistoryUtil::P +@@ -84,7 +83,7 @@ content::WebUIDataSource* HistoryUtil::P source->AddBoolean("isGuestSession", profile->IsGuestSession()); source->AddBoolean("isSignInAllowed", @@ -3786,7 +3725,7 @@ #include "content/public/browser/download_item_utils.h" --- a/chrome/browser/ui/webui/history/browsing_history_handler.cc +++ b/chrome/browser/ui/webui/history/browsing_history_handler.cc -@@ -54,7 +54,6 @@ +@@ -60,7 +60,6 @@ #include "components/keyed_service/core/service_access_type.h" #include "components/prefs/pref_service.h" #include "components/query_parser/snippet.h" @@ -3796,7 +3735,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc -@@ -56,7 +56,6 @@ +@@ -57,7 +57,6 @@ #include "components/page_image_service/image_service.h" #include "components/page_image_service/image_service_handler.h" #include "components/prefs/pref_service.h" @@ -3824,7 +3763,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/browser_task_traits.h" -@@ -374,15 +373,6 @@ void PolicyUIHandler::HandleSetLocalTest +@@ -372,15 +371,6 @@ void PolicyUIHandler::HandleSetLocalTest CHECK(local_test_provider); @@ -3840,7 +3779,7 @@ Profile::FromWebUI(web_ui()) ->GetProfilePolicyConnector() ->UseLocalTestPolicyProvider(); -@@ -396,13 +386,6 @@ void PolicyUIHandler::HandleRevertLocalT +@@ -394,13 +384,6 @@ void PolicyUIHandler::HandleRevertLocalT if (!PolicyUI::ShouldLoadTestPage(Profile::FromWebUI(web_ui()))) { return; } @@ -3866,7 +3805,7 @@ #include "components/user_prefs/user_prefs.h" --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -57,7 +57,6 @@ +@@ -58,7 +58,6 @@ #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -3874,7 +3813,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -444,10 +443,6 @@ void PeopleHandler::OnJavascriptAllowed( +@@ -442,10 +441,6 @@ void PeopleHandler::OnJavascriptAllowed( PrefService* prefs = profile_->GetPrefs(); profile_pref_registrar_ = std::make_unique(); profile_pref_registrar_->Init(prefs); @@ -3905,7 +3844,7 @@ #include "components/saved_tab_groups/public/features.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/strings/grit/components_branded_strings.h" -@@ -3846,11 +3845,6 @@ void AddSiteSettingsStrings(content::Web +@@ -3866,11 +3865,6 @@ void AddSiteSettingsStrings(content::Web html_source->AddLocalizedStrings(kSensorsLocalizedStrings); html_source->AddBoolean( @@ -3919,7 +3858,7 @@ --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc -@@ -118,7 +118,6 @@ +@@ -119,7 +119,6 @@ #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.h" #include "components/search_engines/template_url_service.h" @@ -3927,7 +3866,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/features.h" #include "content/public/browser/isolated_web_apps_policy.h" -@@ -287,9 +286,7 @@ SettingsUI::SettingsUI(content::WebUI* w +@@ -295,9 +294,7 @@ SettingsUI::SettingsUI(content::WebUI* w AddSettingsPageUIHandler(std::make_unique()); #endif @@ -3940,7 +3879,7 @@ ->GetProfileAttributesStorage() --- a/chrome/browser/ui/webui/signin/inline_login_handler.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc -@@ -27,7 +27,6 @@ +@@ -26,7 +26,6 @@ #include "chrome/common/pref_names.h" #include "components/metrics/metrics_pref_names.h" #include "components/prefs/pref_service.h" @@ -3948,28 +3887,18 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -@@ -138,8 +137,6 @@ void InlineLoginHandler::ContinueHandleI +@@ -137,8 +136,6 @@ void InlineLoginHandler::ContinueHandleI + Profile* profile = Profile::FromWebUI(web_ui()); std::string default_email; - if (reason == signin_metrics::Reason::kSigninPrimaryAccount || - reason == signin_metrics::Reason::kForcedSigninPrimaryAccount) { + if (reason == signin_metrics::Reason::kSigninPrimaryAccount) { - default_email = profile->GetPrefs()->GetString( - prefs::kGoogleServicesLastSyncingUsername); } else { if (!net::GetValueForKeyInQuery(current_url, "email", &default_email)) { default_email.clear(); ---- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc -@@ -69,7 +69,6 @@ - #include "components/prefs/pref_service.h" - #include "components/signin/core/browser/about_signin_internals.h" - #include "components/signin/public/base/signin_metrics.h" --#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/identity_manager/account_info.h" - #include "components/signin/public/identity_manager/accounts_mutator.h" - #include "components/signin/public/identity_manager/identity_manager.h" --- a/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc +++ b/chrome/browser/ui/webui/signin/managed_user_profile_notice_handler.cc -@@ -33,7 +33,6 @@ +@@ -34,7 +34,6 @@ #include "chrome/grit/generated_resources.h" #include "components/policy/core/browser/signin/profile_separation_policies.h" #include "components/prefs/pref_service.h" @@ -3977,9 +3906,9 @@ #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/signin_constants.h" #include "components/strings/grit/components_strings.h" -@@ -472,23 +471,6 @@ base::Value::Dict ManagedUserProfileNoti +@@ -478,23 +477,6 @@ base::DictValue ManagedUserProfileNotice dict.Set("email", base::UTF16ToUTF8(email_)); - dict.Set("accountName", account_info.full_name); + dict.Set("accountName", account_info.GetFullName().value_or("")); -#if !BUILDFLAG(IS_CHROMEOS) - // We apply the checkLinkDataCheckboxByDefault to true value only if the @@ -4023,7 +3952,7 @@ prefs::kEnterpriseProfileCreationKeepBrowsingData); --- a/chrome/browser/ui/webui/signin/signin_error_ui.cc +++ b/chrome/browser/ui/webui/signin/signin_error_ui.cc -@@ -28,7 +28,6 @@ +@@ -26,7 +26,6 @@ #include "chrome/grit/generated_resources.h" #include "chrome/grit/signin_resources.h" #include "components/prefs/pref_service.h" @@ -4031,17 +3960,6 @@ #include "components/strings/grit/components_strings.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" -@@ -116,9 +115,7 @@ void SigninErrorUI::Initialize(Browser* - if (is_profile_blocked) { - source->AddLocalizedString("profileBlockedMessage", - IDS_OLD_PROFILES_DISABLED_MESSAGE); -- std::string allowed_domain = signin_ui_util::GetAllowedDomain( -- g_browser_process->local_state()->GetString( -- prefs::kGoogleServicesUsernamePattern)); -+ std::string allowed_domain; - if (allowed_domain.empty()) { - source->AddLocalizedString( - "profileBlockedAddPersonSuggestion", --- a/chrome/browser/ui/webui/signin/signin_utils_desktop.cc +++ b/chrome/browser/ui/webui/signin/signin_utils_desktop.cc @@ -18,7 +18,6 @@ @@ -4234,7 +4152,7 @@ .signin_view_controller() --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc -@@ -56,7 +56,6 @@ +@@ -54,7 +54,6 @@ #include "components/search_engines/template_url_service.h" #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_metrics.h" @@ -4352,7 +4270,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/sync/base/data_type.h" #include "components/sync/base/features.h" -@@ -362,13 +361,7 @@ void AddressDataManager::RemoveLocalProf +@@ -334,13 +333,7 @@ void AddressDataManager::RemoveLocalProf } bool AddressDataManager::IsEligibleForAddressAccountStorage() const { @@ -4366,7 +4284,7 @@ } void AddressDataManager::MigrateProfileToAccount( -@@ -669,40 +662,7 @@ bool AddressDataManager::IsAutofillUserS +@@ -641,40 +634,7 @@ bool AddressDataManager::IsAutofillUserS } bool AddressDataManager::IsAutofillSyncToggleAvailable() const { @@ -4407,40 +4325,6 @@ } void AddressDataManager::SetAutofillSelectableTypeEnabled(bool enabled) { ---- a/components/autofill/core/browser/studies/autofill_experiments.cc -+++ b/components/autofill/core/browser/studies/autofill_experiments.cc -@@ -34,7 +34,6 @@ - #include "components/prefs/pref_service.h" - #include "components/prefs/scoped_user_pref_update.h" - #include "components/signin/public/base/signin_buildflags.h" --#include "components/signin/public/base/signin_pref_names.h" - #include "components/strings/grit/components_strings.h" - #include "components/sync/base/features.h" - #include "components/sync/base/user_selectable_type.h" -@@ -176,12 +175,6 @@ bool IsCreditCardUploadEnabled( - // TODO(crbug.com/40066949): Simplify once IsSyncFeatureActive() is deleted - // from the codebase. - bool addresses_in_transport_mode = true; --#if BUILDFLAG(ENABLE_DICE_SUPPORT) -- // Dice users don't have addresses in transport mode until they went through -- // the explicit signin flow. -- addresses_in_transport_mode = -- pref_service.GetBoolean(::prefs::kExplicitBrowserSignin); --#endif - bool syncing_or_addresses_in_transport_mode = - sync_service->IsSyncFeatureActive() || addresses_in_transport_mode; - if (syncing_or_addresses_in_transport_mode && -@@ -299,10 +292,6 @@ bool IsUserOptedInWalletSyncTransport(co - // On mobile, no specific opt-in is required. - return true; - #else -- if (prefs->GetBoolean(::prefs::kExplicitBrowserSignin)) { -- // Explicit browser signin makes the explicit opt-in unnecessary. -- return true; -- } - - // Get the hash of the account id. - std::string account_hash = --- a/components/browser_sync/BUILD.gn +++ b/components/browser_sync/BUILD.gn @@ -14,8 +14,6 @@ static_library("browser_sync") { @@ -4634,23 +4518,18 @@ #include "components/sync/base/features.h" #include "components/sync/service/sync_service.h" #include "components/unified_consent/url_keyed_data_collection_consent_helper.h" -@@ -165,16 +164,6 @@ class ProductSpecificationsUrlObserver +@@ -165,10 +164,7 @@ class ProductSpecificationsUrlObserver // This function can be deleted once the Sync feature is removed. signin::ConsentLevel GetConsentLevelForEndpointFetchers( PrefService* pref_service) { -- if (base::FeatureList::IsEnabled( -- syncer::kReplaceSyncPromosWithSignInPromos)) { --#if BUILDFLAG(ENABLE_DICE_SUPPORT) -- return pref_service->GetBoolean(prefs::kExplicitBrowserSignin) -- ? signin::ConsentLevel::kSignin -- : signin::ConsentLevel::kSync; --#else -- return signin::ConsentLevel::kSignin; --#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) -- } - return signin::ConsentLevel::kSync; +- return base::FeatureList::IsEnabled( +- syncer::kReplaceSyncPromosWithSignInPromos) +- ? signin::ConsentLevel::kSignin +- : signin::ConsentLevel::kSync; ++ return signin::ConsentLevel::kSync; } + } // namespace --- a/components/commerce/core/subscriptions/subscriptions_server_proxy.cc +++ b/components/commerce/core/subscriptions/subscriptions_server_proxy.cc @@ -22,7 +22,6 @@ @@ -4673,7 +4552,7 @@ class PrefService; --- a/components/feed/core/v2/feed_stream.cc +++ b/components/feed/core/v2/feed_stream.cc -@@ -65,7 +65,6 @@ +@@ -64,7 +64,6 @@ #include "components/feed/feed_feature_list.h" #include "components/offline_pages/task/closure_task.h" #include "components/prefs/pref_service.h" @@ -4681,7 +4560,7 @@ #include "google_apis/gaia/gaia_id.h" namespace feed { -@@ -174,9 +173,6 @@ FeedStream::FeedStream(RefreshTaskSchedu +@@ -173,9 +172,6 @@ FeedStream::FeedStream(RefreshTaskSchedu snippets_enabled_by_dse_.Init(prefs::kEnableSnippetsByDse, profile_prefs, preference_change_callback); has_stored_data_.Init(feed::prefs::kHasStoredData, profile_prefs); @@ -4710,16 +4589,6 @@ } void RegisterExperiments(const Experiments& experiments) override { service_delegate_->RegisterExperiments(experiments); ---- a/components/password_manager/core/browser/features/password_manager_features_util.cc -+++ b/components/password_manager/core/browser/features/password_manager_features_util.cc -@@ -16,7 +16,6 @@ - #include "components/password_manager/core/common/password_manager_pref_names.h" - #include "components/prefs/pref_service.h" - #include "components/prefs/scoped_user_pref_update.h" --#include "components/signin/public/base/signin_pref_names.h" - #include "components/signin/public/base/signin_switches.h" - #include "components/sync/base/features.h" - #include "components/sync/base/pref_names.h" --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc @@ -22,7 +22,6 @@ @@ -4766,7 +4635,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "url/gurl.h" -@@ -210,9 +209,7 @@ PasswordReuseDetectorImpl::CheckNonGaiaE +@@ -216,9 +215,7 @@ PasswordReuseDetectorImpl::CheckNonGaiaE // Skips password reuse check if |domain| matches enterprise login URL or // enterprise change password URL. GURL page_url(domain); @@ -4845,9 +4714,9 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" -@@ -756,7 +755,7 @@ StoreMetricsReporter::StoreMetricsReport - is_account_storage_enabled_ = - features_util::IsAccountStorageEnabled(sync_service); +@@ -758,7 +757,7 @@ StoreMetricsReporter::StoreMetricsReport + is_account_storage_active_ = + features_util::IsAccountStorageActive(sync_service); - is_safe_browsing_enabled_ = safe_browsing::IsSafeBrowsingEnabled(*prefs_); + is_safe_browsing_enabled_ = false; @@ -4992,7 +4861,7 @@ - return; - } - -- const base::Value::Dict& event_dict = +- const base::DictValue& event_dict = - local_state_prefs_->GetDict(prefs::kSafeBrowsingTriggerEventTimestamps); - for (auto trigger_pair : event_dict) { - // Check that the first item in the pair is convertible to a trigger type @@ -5216,7 +5085,7 @@ update_back_off_mult_(1), next_update_interval_( @@ -115,8 +102,7 @@ V4UpdateProtocolManager::V4UpdateProtoco - kV4TimerStartIntervalSecMax))), + kV4TimerStartIntervalSecMax))), config_(config), url_loader_factory_(url_loader_factory), - update_callback_(update_callback), @@ -5291,7 +5160,7 @@ // policy. --- a/components/safe_browsing/core/browser/realtime/policy_engine.cc +++ b/components/safe_browsing/core/browser/realtime/policy_engine.cc -@@ -11,7 +11,6 @@ +@@ -12,7 +12,6 @@ #include "components/enterprise/connectors/core/common.h" #include "components/enterprise/connectors/core/connectors_prefs.h" #include "components/prefs/pref_service.h" @@ -5299,7 +5168,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "components/unified_consent/pref_names.h" #include "components/user_prefs/user_prefs.h" -@@ -56,7 +55,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte +@@ -57,7 +56,7 @@ bool RealTimePolicyEngine::IsUserMbbOpte // static bool RealTimePolicyEngine::IsUserEpOptedIn(PrefService* pref_service) { @@ -5308,7 +5177,7 @@ } // static -@@ -118,15 +117,7 @@ bool RealTimePolicyEngine::CanPerformEnt +@@ -119,15 +118,7 @@ bool RealTimePolicyEngine::CanPerformEnt return false; } @@ -5556,7 +5425,7 @@ void SafeBrowsingMetricsCollector::RemoveOldEventsFromPref() { - ScopedDictPrefUpdate update(pref_service_, - prefs::kSafeBrowsingEventTimestamps); -- base::Value::Dict& mutable_state_dict = update.Get(); +- base::DictValue& mutable_state_dict = update.Get(); - - for (auto state_map : mutable_state_dict) { - for (auto event_map : state_map.second.GetDict()) { @@ -5602,10 +5471,10 @@ EventType event_type) { - ScopedDictPrefUpdate update(pref_service_, - prefs::kSafeBrowsingEventTimestamps); -- base::Value::Dict& mutable_state_dict = update.Get(); -- base::Value::Dict* event_dict = +- base::DictValue& mutable_state_dict = update.Get(); +- base::DictValue* event_dict = - mutable_state_dict.EnsureDict(UserStateToPrefKey(user_state)); -- base::Value::List* timestamps = +- base::ListValue* timestamps = - event_dict->EnsureList(EventTypeToPrefKey(event_type)); - - // Remove the oldest timestamp if the length of the timestamps hits the limit. @@ -5632,10 +5501,10 @@ - } } - const base::Value::Dict* + const base::DictValue* SafeBrowsingMetricsCollector::GetSafeBrowsingEventDictionary( UserState user_state) { -- const base::Value::Dict& state_dict = +- const base::DictValue& state_dict = - pref_service_->GetDict(prefs::kSafeBrowsingEventTimestamps); - - return state_dict.FindDict(UserStateToPrefKey(user_state)); @@ -5692,24 +5561,32 @@ } TailoredSecurityService::~TailoredSecurityService() { -@@ -415,26 +405,6 @@ void TailoredSecurityService::MaybeNotif +@@ -415,34 +405,6 @@ void TailoredSecurityService::MaybeNotif return; } -- if (is_enabled && IsEnhancedProtectionEnabled(*prefs())) { +- // TODO(crbug.com/483786422): Update the preference wiring in relevant each +- // generated.*pref class that acts whenever the settings bundle setting +- // changes. +- bool is_enhanced_protection_enabled = +- base::FeatureList::IsEnabled(safe_browsing::kBundledSecuritySettings) +- ? (GetSecurityBundleSetting(*prefs()) == +- SecuritySettingsBundleSetting::ENHANCED) +- : IsEnhancedProtectionEnabled(*prefs()); +- if (is_enabled && is_enhanced_protection_enabled) { - RecordEnabledNotificationResult( - TailoredSecurityNotificationResult::kEnhancedProtectionAlreadyEnabled); - SaveRetryState(TailoredSecurityRetryState::NO_RETRY_NEEDED); - return; - } - -- if (is_enabled && !IsEnhancedProtectionEnabled(*prefs())) { +- if (is_enabled && !is_enhanced_protection_enabled) { - for (auto& observer : observer_list_) { - observer.OnSyncNotificationMessageRequest(true); - } - } - -- if (!is_enabled && IsEnhancedProtectionEnabled(*prefs()) && +- if (!is_enabled && is_enhanced_protection_enabled && - prefs()->GetBoolean( - prefs::kEnhancedProtectionEnabledViaTailoredSecurity)) { - for (auto& observer : observer_list_) { @@ -5773,30 +5650,30 @@ --- a/components/safe_browsing/core/browser/web_ui/safe_browsing_ui_handler.cc +++ b/components/safe_browsing/core/browser/web_ui/safe_browsing_ui_handler.cc @@ -30,21 +30,19 @@ SafeBrowsingUIHandler::~SafeBrowsingUIHa - void SafeBrowsingUIHandler::GetExperiments(const base::Value::List& args) { + void SafeBrowsingUIHandler::GetExperiments(const base::ListValue& args) { DCHECK(!args.empty()); const std::string& callback_id = args[0].GetString(); - ResolveCallback(callback_id, GetFeatureStatusList()); -+ ResolveCallback(callback_id, base::Value::List()); ++ ResolveCallback(callback_id, base::ListValue()); } - void SafeBrowsingUIHandler::GetPrefs(const base::Value::List& args) { + void SafeBrowsingUIHandler::GetPrefs(const base::ListValue& args) { DCHECK(!args.empty()); const std::string& callback_id = args[0].GetString(); - ResolveCallback(callback_id, - safe_browsing::GetSafeBrowsingPreferencesList(user_prefs())); -+ ResolveCallback(callback_id, base::Value::List()); ++ ResolveCallback(callback_id, base::ListValue()); } - void SafeBrowsingUIHandler::GetPolicies(const base::Value::List& args) { + void SafeBrowsingUIHandler::GetPolicies(const base::ListValue& args) { DCHECK(!args.empty()); const std::string& callback_id = args[0].GetString(); - ResolveCallback(callback_id, - safe_browsing::GetSafeBrowsingPoliciesList(user_prefs())); -+ ResolveCallback(callback_id, base::Value::List()); ++ ResolveCallback(callback_id, base::ListValue()); } - void SafeBrowsingUIHandler::GetCookie(const base::Value::List& args) { + void SafeBrowsingUIHandler::GetCookie(const base::ListValue& args) { --- a/components/safe_browsing/core/common/BUILD.gn +++ b/components/safe_browsing/core/common/BUILD.gn @@ -5,22 +5,8 @@ @@ -5826,7 +5703,7 @@ source_set("safe_browsing_policy_handler") { --- a/components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.cc +++ b/components/safe_browsing/core/common/hashprefix_realtime/hash_realtime_utils.cc -@@ -11,7 +11,6 @@ +@@ -12,7 +12,6 @@ #include "build/branding_buildflags.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/features.h" @@ -5834,7 +5711,7 @@ #include "components/safe_browsing/core/common/utils.h" #include "components/variations/pref_names.h" #include "components/variations/service/variations_service.h" -@@ -99,71 +98,13 @@ HashRealTimeSelection DetermineHashRealT +@@ -102,71 +101,13 @@ HashRealTimeSelection DetermineHashRealT std::optional latest_country, bool log_usage_histograms, bool are_background_lookups_allowed) { @@ -6260,7 +6137,7 @@ #include "components/signin/public/identity_manager/identity_test_environment.h" --- a/components/signin/core/browser/account_reconcilor.cc +++ b/components/signin/core/browser/account_reconcilor.cc -@@ -31,7 +31,6 @@ +@@ -30,7 +30,6 @@ #include "components/signin/public/base/consent_level.h" #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" @@ -6268,46 +6145,9 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" -@@ -96,12 +95,6 @@ bool IsAnyAccountInErrorState( - // consider the migration done. - void MaybeMigrateClearOnExit(SigninClient& client, - signin::IdentityManager& identity_manager) { -- PrefService& prefs = *client.GetPrefs(); -- if (!client.AreSigninCookiesDeletedOnExit() && -- signin::AreGoogleCookiesRebuiltAfterClearingWhenSignedIn(identity_manager, -- prefs)) { -- prefs.SetBoolean(prefs::kCookieClearOnExitMigrationNoticeComplete, true); -- } - } - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - -@@ -177,10 +170,6 @@ AccountReconcilor::~AccountReconcilor() - - // static - void AccountReconcilor::RegisterProfilePrefs(PrefRegistrySimple* registry) { --#if BUILDFLAG(ENABLE_DICE_SUPPORT) -- registry->RegisterBooleanPref( -- prefs::kCookieClearOnExitMigrationNoticeComplete, false); --#endif - } - - void AccountReconcilor::RegisterWithAllDependencies() { -@@ -289,12 +278,6 @@ void AccountReconcilor::RegisterWithIden - } - - identity_manager_observer_.Observe(identity_manager_); --#if BUILDFLAG(ENABLE_DICE_SUPPORT) -- pref_observer_.Add( -- prefs::kExplicitBrowserSignin, -- base::BindRepeating(&MaybeMigrateClearOnExit, std::ref(*client_), -- std::ref(*identity_manager_))); --#endif - registered_with_identity_manager_ = true; - } - --- a/components/signin/core/browser/account_reconcilor_unittest.cc +++ b/components/signin/core/browser/account_reconcilor_unittest.cc -@@ -38,7 +38,6 @@ +@@ -37,7 +37,6 @@ #include "components/signin/public/base/list_accounts_test_utils.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -6317,9 +6157,9 @@ #include "components/signin/public/identity_manager/account_capabilities_test_mutator.h" --- a/components/signin/core/browser/dice_account_reconcilor_delegate.cc +++ b/components/signin/core/browser/dice_account_reconcilor_delegate.cc -@@ -15,7 +15,6 @@ +@@ -13,7 +13,6 @@ + #include "components/prefs/pref_service.h" #include "components/signin/public/base/consent_level.h" - #include "components/signin/public/base/signin_client.h" #include "components/signin/public/base/signin_metrics.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" @@ -6335,7 +6175,7 @@ #include "components/signin/public/base/signin_prefs.h" #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/account_info.h" -@@ -492,23 +491,6 @@ void SigninMetricsService::OnRefreshToke +@@ -482,23 +481,6 @@ void SigninMetricsService::OnRefreshToke #if BUILDFLAG(ENABLE_DICE_SUPPORT) void SigninMetricsService::RecordExplicitSigninMigrationStatus() { @@ -6358,45 +6198,48 @@ - explicit_signin_migration); } - void SigninMetricsService::MaybeRecordMetricsForSigninPromoLimitsExperiment( -@@ -518,34 +500,10 @@ void SigninMetricsService::MaybeRecordMe + void SigninMetricsService::MaybeRecordMetricsForPromoShowCountAtSignin( +@@ -508,37 +490,10 @@ void SigninMetricsService::MaybeRecordMe GetTimeOfWebSignin(account_info.account_id).has_value(); switch (access_point) { case signin_metrics::AccessPoint::kAddressBubble: -- base::UmaHistogramBoolean( +- base::UmaHistogramCustomCounts( - "Signin.ShowCountAtSignin.AddressSigninPromo", - is_from_web_signin - ? SigninPrefs(pref_service_.get()) - .GetAddressSigninPromoImpressionCount(account_info.gaia) - : pref_service_->GetInteger( - prefs:: -- kAddressSignInPromoShownCountPerProfileForLimitsExperiment)); +- kAddressSignInPromoShownCountPerProfileForLimitsExperiment), +- /*min=*/1, /*exclusive_max=*/10, /*buckets=*/10); break; case signin_metrics::AccessPoint::kPasswordBubble: -- base::UmaHistogramBoolean( +- base::UmaHistogramCustomCounts( - "Signin.ShowCountAtSignin.PasswordSigninPromo", - is_from_web_signin - ? SigninPrefs(pref_service_.get()) - .GetPasswordSigninPromoImpressionCount(account_info.gaia) - : pref_service_->GetInteger( - prefs:: -- kPasswordSignInPromoShownCountPerProfileForLimitsExperiment)); +- kPasswordSignInPromoShownCountPerProfileForLimitsExperiment), +- /*min=*/1, /*exclusive_max=*/10, /*buckets=*/10); break; case signin_metrics::AccessPoint::kBookmarkBubble: -- base::UmaHistogramBoolean( +- base::UmaHistogramCustomCounts( - "Signin.ShowCountAtSignin.BookmarkSigninPromo", - is_from_web_signin - ? SigninPrefs(pref_service_.get()) - .GetBookmarkSigninPromoImpressionCount(account_info.gaia) - : pref_service_->GetInteger( - prefs:: -- kBookmarkSignInPromoShownCountPerProfileForLimitsExperiment)); +- kBookmarkSignInPromoShownCountPerProfileForLimitsExperiment), +- /*min=*/1, /*exclusive_max=*/10, /*buckets=*/10); break; case signin_metrics::AccessPoint::kChromeSigninInterceptBubble: { const int uno_bubble_reprompt_count = --- a/components/signin/internal/identity_manager/account_tracker_service.cc +++ b/components/signin/internal/identity_manager/account_tracker_service.cc -@@ -36,7 +36,6 @@ +@@ -35,7 +35,6 @@ #include "components/signin/internal/identity_manager/account_capabilities_constants.h" #include "components/signin/internal/identity_manager/account_info_util.h" #include "components/signin/public/base/signin_metrics.h" @@ -6404,7 +6247,7 @@ #include "components/signin/public/identity_manager/account_capabilities.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/tribool.h" -@@ -129,11 +128,6 @@ AccountTrackerService::~AccountTrackerSe +@@ -128,11 +127,6 @@ AccountTrackerService::~AccountTrackerSe // static void AccountTrackerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -6416,7 +6259,7 @@ } void AccountTrackerService::Initialize(PrefService* pref_service, -@@ -492,14 +486,12 @@ AccountTrackerService::ComputeNewMigrati +@@ -491,14 +485,12 @@ AccountTrackerService::ComputeNewMigrati void AccountTrackerService::SetMigrationState(AccountIdMigrationState state) { DCHECK(state != MIGRATION_DONE || AreAllAccountsMigrated()) << "state: " << state << ", accounts = " << AccountsToString(accounts_); @@ -6432,7 +6275,7 @@ } #endif // BUILDFLAG(IS_CHROMEOS) -@@ -578,28 +570,6 @@ void AccountTrackerService::OnAccountIma +@@ -577,28 +569,6 @@ void AccountTrackerService::OnAccountIma const CoreAccountId& account_id, const std::string& image_url_with_size, bool success) { @@ -6440,10 +6283,10 @@ - return; - } - -- base::Value::Dict* dict = nullptr; +- base::DictValue* dict = nullptr; - ScopedListPrefUpdate update(pref_service_, prefs::kAccountInfo); - for (base::Value& value : *update) { -- base::Value::Dict* maybe_dict = value.GetIfDict(); +- base::DictValue* maybe_dict = value.GetIfDict(); - if (maybe_dict) { - const std::string* account_key = - maybe_dict->FindString(signin::kAccountIdKey); @@ -6461,14 +6304,14 @@ } void AccountTrackerService::RemoveAccountImageFromDisk( -@@ -612,106 +582,17 @@ void AccountTrackerService::RemoveAccoun +@@ -611,106 +581,17 @@ void AccountTrackerService::RemoveAccoun } void AccountTrackerService::LoadFromPrefs() { -- const base::Value::List& list = pref_service_->GetList(prefs::kAccountInfo); +- const base::ListValue& list = pref_service_->GetList(prefs::kAccountInfo); - std::set to_remove; - for (size_t i = 0; i < list.size(); ++i) { -- const base::Value::Dict* dict = list[i].GetIfDict(); +- const base::DictValue* dict = list[i].GetIfDict(); - if (!dict) { - continue; - } @@ -6537,11 +6380,11 @@ - accounts_.size()); } - base::Value::Dict* AccountTrackerService::FindOrCreateDictForAccount( + base::DictValue* AccountTrackerService::FindOrCreateDictForAccount( ScopedListPrefUpdate& update, const CoreAccountId& account_id) { - for (base::Value& value : *update) { -- base::Value::Dict* dict = value.GetIfDict(); +- base::DictValue* dict = value.GetIfDict(); - if (dict) { - const std::string* account_key = dict->FindString(signin::kAccountIdKey); - if (account_key && *account_key == account_id.ToString()) { @@ -6550,8 +6393,8 @@ - } - } - - update->Append(base::Value::Dict()); - base::Value::Dict* new_dict = &update->back().GetDict(); + update->Append(base::DictValue()); + base::DictValue* new_dict = &update->back().GetDict(); - new_dict->Set(signin::kAccountIdKey, account_id.ToString()); return new_dict; } @@ -6562,13 +6405,13 @@ - } - - ScopedListPrefUpdate update(pref_service_, prefs::kAccountInfo); -- base::Value::Dict* dict = +- base::DictValue* dict = - FindOrCreateDictForAccount(update, account_info.account_id); - dict->Merge(signin::SerializeAccountInfo(account_info)); } void AccountTrackerService::RemoveFromPrefs(const AccountInfo& account_info) { -@@ -719,16 +600,7 @@ void AccountTrackerService::RemoveFromPr +@@ -718,16 +599,7 @@ void AccountTrackerService::RemoveFromPr return; } @@ -6597,7 +6440,7 @@ #include "components/signin/public/identity_manager/account_capabilities_test_mutator.h" --- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc +++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.cc -@@ -33,7 +33,6 @@ +@@ -32,7 +32,6 @@ #include "components/signin/internal/identity_manager/oauth_multilogin_helper.h" #include "components/signin/public/base/signin_buildflags.h" #include "components/signin/public/base/signin_metrics.h" @@ -6605,7 +6448,7 @@ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/set_accounts_in_cookie_result.h" #include "google_apis/credentials_mode.h" -@@ -434,20 +433,7 @@ GaiaCookieManagerService::GaiaCookieMana +@@ -433,20 +432,7 @@ GaiaCookieManagerService::GaiaCookieMana listAccountsUnexpectedServerResponseRetried_(false), external_cc_result_fetched_(false), list_accounts_stale_(true) { @@ -6626,7 +6469,7 @@ } GaiaCookieManagerService::~GaiaCookieManagerService() { -@@ -458,8 +444,6 @@ GaiaCookieManagerService::~GaiaCookieMan +@@ -457,8 +443,6 @@ GaiaCookieManagerService::~GaiaCookieMan // static void GaiaCookieManagerService::RegisterPrefs(PrefRegistrySimple* registry) { @@ -6635,7 +6478,7 @@ } void GaiaCookieManagerService::InitCookieListener() { -@@ -684,8 +668,6 @@ void GaiaCookieManagerService::OnListAcc +@@ -683,8 +667,6 @@ void GaiaCookieManagerService::OnListAcc bool parse_success = gaia::ParseBinaryListAccountsData(data, &accounts_); if (!parse_success) { accounts_.clear(); @@ -6644,7 +6487,7 @@ GoogleServiceAuthError error = GoogleServiceAuthError::FromUnexpectedServiceResponse( "Error parsing ListAccounts response"); -@@ -693,8 +675,6 @@ void GaiaCookieManagerService::OnListAcc +@@ -692,8 +674,6 @@ void GaiaCookieManagerService::OnListAcc return; } @@ -6955,7 +6798,7 @@ } void PrimaryAccountManager::UpdatePrimaryAccountInfo() { -@@ -702,114 +498,6 @@ PrimaryAccountChangeEvent::State Primary +@@ -702,124 +498,6 @@ PrimaryAccountChangeEvent::State Primary void PrimaryAccountManager::SetExplicitBrowserSigninPrefs( const PrimaryAccountChangeEvent& event_details, ScopedPrefCommit& scoped_pref_commit) { @@ -7024,20 +6867,30 @@ - scoped_pref_commit.SetBoolean( - prefs::kPrefsThemesSearchEnginesAccountStorageEnabled, true); - } -- if (access_point == -- signin_metrics::AccessPoint::kExtensionInstallBubble && -- switches::IsExtensionsExplicitBrowserSigninEnabled()) { +- if (switches::IsExtensionsExplicitBrowserSigninEnabled()) { - // Record an opt in for the extensions explicit signin feature and use - // the existing pref to determine if it's a new or existing opt in. - bool is_new_opt_in = - !SigninPrefs(*client_->GetPrefs()) - .GetExtensionsExplicitBrowserSignin(current_gaia_id); -- base::UmaHistogramBoolean( -- "Signin.Extensions.ExplicitSigninFromExtensionInstallBubble", -- is_new_opt_in); - -- SigninPrefs(*client_->GetPrefs()) -- .SetExtensionsExplicitBrowserSignin(current_gaia_id, true); +- if (access_point == +- signin_metrics::AccessPoint::kExtensionInstallBubble) { +- base::UmaHistogramBoolean( +- "Signin.Extensions.ExplicitSigninFromExtensionInstallBubble", +- is_new_opt_in); +- +- SigninPrefs(*client_->GetPrefs()) +- .SetExtensionsExplicitBrowserSignin(current_gaia_id, true); +- } +- if (syncer::kExplicitSigninForExtensions.Get()) { +- base::UmaHistogramBoolean( +- "Signin.Extensions.ExplicitSigninFromAnyAccessPoint", +- is_new_opt_in); +- +- SigninPrefs(*client_->GetPrefs()) +- .SetExtensionsExplicitBrowserSignin(current_gaia_id, true); +- } - } - if (access_point == signin_metrics::AccessPoint::kBookmarkBubble && - base::FeatureList::IsEnabled( @@ -7130,7 +6983,7 @@ #include "components/signin/public/identity_manager/account_info.h" --- a/components/signin/public/base/BUILD.gn +++ b/components/signin/public/base/BUILD.gn -@@ -161,8 +161,6 @@ component("signin_switches") { +@@ -167,8 +167,6 @@ component("signin_switches") { defines = [ "IS_SIGNIN_SWITCHES_IMPL" ] sources = [ @@ -7241,7 +7094,7 @@ } void SigninPrefs::MigrateObsoleteSigninPrefs() { -@@ -460,40 +457,31 @@ int SigninPrefs::GetSyncPromoIdentityPil +@@ -459,40 +456,31 @@ int SigninPrefs::GetSyncPromoIdentityPil int SigninPrefs::GetHistoryPageHistorySyncPromoShownCount( const GaiaId& gaia_id) const { @@ -7295,7 +7148,7 @@ #if BUILDFLAG(IS_WIN) #include "base/win/windows_version.h" -@@ -163,10 +162,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti +@@ -242,10 +241,6 @@ BASE_FEATURE(kEnableBoundSessionCredenti #endif ); bool IsBoundSessionCredentialsEnabled(const PrefService* profile_prefs) { @@ -7306,7 +7159,7 @@ return base::FeatureList::IsEnabled(kEnableBoundSessionCredentials); } // Restricts the DBSC registration URL path to a single allowed string. -@@ -187,10 +182,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi +@@ -266,10 +261,6 @@ BASE_FEATURE(kEnableChromeRefreshTokenBi #endif ); bool IsChromeRefreshTokenBindingEnabled(const PrefService* profile_prefs) { @@ -7327,7 +7180,7 @@ #include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/signin/public/identity_manager/identity_manager.h" -@@ -62,21 +61,13 @@ bool IsUsernameAllowedByPattern(std::str +@@ -62,8 +61,7 @@ bool IsUsernameAllowedByPattern(std::str bool IsUsernameAllowedByPatternFromPrefs(const PrefService* prefs, const std::string& username) { @@ -7336,21 +7189,7 @@ + return true; } - bool IsImplicitBrowserSigninOrExplicitDisabled( - const IdentityManager* identity_manager, - const PrefService* prefs) { --#if BUILDFLAG(ENABLE_DICE_SUPPORT) -- // Check if the user is implicitly signed in. -- // Signed out users or signed in explicitly should return false. -- return identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSignin) && -- !prefs->GetBoolean(prefs::kExplicitBrowserSignin); --#else -- return true; --#endif -+ return false; - } - - bool AreGoogleCookiesRebuiltAfterClearingWhenSignedIn( + base::flat_set GetAllGaiaIdsForKeyedPreferences( --- a/components/signin/public/identity_manager/identity_utils_unittest.cc +++ b/components/signin/public/identity_manager/identity_utils_unittest.cc @@ -12,7 +12,6 @@ @@ -7373,17 +7212,17 @@ #include "components/signin/public/identity_manager/identity_test_environment.h" --- a/components/supervised_user/core/browser/supervised_user_pref_store.cc +++ b/components/supervised_user/core/browser/supervised_user_pref_store.cc -@@ -20,7 +20,6 @@ +@@ -21,7 +21,6 @@ #include "components/policy/core/common/policy_pref_names.h" #include "components/prefs/pref_value_map.h" #include "components/safe_search_api/safe_search_util.h" -#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/base/signin_switches.h" - #include "components/supervised_user/core/browser/supervised_user_content_filters_service.h" - #include "components/supervised_user/core/browser/supervised_user_settings_service.h" -@@ -59,14 +58,6 @@ SupervisedUserSettingsPrefMappingEntry k - prefs::kSupervisedUserSafeSites, - }, + #include "components/supervised_user/core/browser/device_parental_controls.h" + #include "components/supervised_user/core/browser/family_link_settings_service.h" +@@ -51,14 +50,6 @@ struct FamilyLinkSettingsPrefMappingEntr + + FamilyLinkSettingsPrefMappingEntry kFamilyLinkSettingsPrefMapping[] = { { - supervised_user::kSigninAllowed, - prefs::kSigninAllowed, @@ -7426,16 +7265,7 @@ } SyncPrefs::~SyncPrefs() { -@@ -244,7 +230,7 @@ bool SyncPrefs::IsExplicitBrowserSignin( - #else - // On desktop `prefs::kExplicitBrowserSignin` determines whether the sign-in - // is explicit or implicit. -- return pref_service_->GetBoolean(::prefs::kExplicitBrowserSignin); -+ return false; - #endif - } - -@@ -1059,30 +1045,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe +@@ -1080,30 +1066,6 @@ void SyncPrefs::MaybeMigrateAutofillToPe return; } pref_service->SetBoolean(kAutofillPerAccountPrefMigrationDone, true); @@ -7466,7 +7296,7 @@ } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) -@@ -1123,21 +1085,15 @@ bool SyncPrefs::IsTypeSelectedByDefaultI +@@ -1138,25 +1100,17 @@ bool SyncPrefs::IsTypeSelectedByDefaultI // Before kReplaceSyncPromosWithSignInPromos, Bookmarks and Reading List // require a specific explicit sign in (relevant for desktop only). return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) || @@ -7481,9 +7311,13 @@ - ::prefs::kPrefsThemesSearchEnginesAccountStorageEnabled); + return false; case UserSelectableType::kExtensions: - // Before kReplaceSyncPromosWithSignInPromos, Extensions require a - // specific explicit sign in. -- return base::FeatureList::IsEnabled(kReplaceSyncPromosWithSignInPromos) || + // Extensions require a specific explicit sign in if + // `kExplicitSigninForExtensions` is enabled (relevant for desktop only). + // If it is not, but `kReplaceSyncPromosWithSignInPromos` is, then + // extensions are on by default. +- return (base::FeatureList::IsEnabled( +- kReplaceSyncPromosWithSignInPromos) && +- !syncer::kExplicitSigninForExtensions.Get()) || - SigninPrefs(*pref_service_) - .GetExtensionsExplicitBrowserSignin(gaia_id); + return false; diff --git a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch index 2138dae2..3f39de6a 100644 --- a/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch +++ b/patches/core/ungoogled-chromium/toggle-translation-via-switch.patch @@ -1,15 +1,15 @@ # Disables translation and removes the "Translate to" context menu when --translate-script-url flag is not set --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -181,6 +181,7 @@ +@@ -180,6 +180,7 @@ + #include "components/strings/grit/components_strings.h" #include "components/supervised_user/core/browser/supervised_user_preferences.h" - #include "components/supervised_user/core/browser/supervised_user_service.h" - #include "components/supervised_user/core/browser/supervised_user_url_filter.h" + #include "components/supervised_user/core/browser/supervised_user_url_filtering_service.h" +#include "components/translate/core/common/translate_switches.h" #include "components/translate/core/browser/translate_download_manager.h" #include "components/translate/core/browser/translate_manager.h" #include "components/translate/core/browser/translate_prefs.h" -@@ -2312,6 +2313,7 @@ void RenderViewContextMenu::AppendPageIt +@@ -2336,6 +2337,7 @@ void RenderViewContextMenu::AppendPageIt } if (CanTranslate(/*menu_logging=*/true)) { diff --git a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch index 9b1d4e45..ab76d2f5 100644 --- a/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch +++ b/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch @@ -9,7 +9,7 @@ --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2548,6 +2548,7 @@ static_library("browser") { +@@ -2528,6 +2528,7 @@ static_library("browser") { "//third_party/libyuv", "//third_party/metrics_proto", "//third_party/re2", @@ -19,7 +19,7 @@ "//third_party/widevine/cdm:headers", --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -187,6 +187,7 @@ +@@ -188,6 +188,7 @@ #include "components/translate/core/common/translate_util.h" #include "components/trusted_vault/features.h" #include "components/ui_devtools/switches.h" @@ -44,7 +44,7 @@ #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -298,6 +298,7 @@ source_set("browser") { +@@ -299,6 +299,7 @@ source_set("browser") { "//third_party/re2", "//third_party/snappy", "//third_party/sqlite", @@ -54,7 +54,7 @@ "//tools/v8_context_snapshot:buildflags", --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -84,6 +84,7 @@ +@@ -83,6 +83,7 @@ #include "components/services/storage/public/cpp/quota_error_or.h" #include "components/services/storage/public/mojom/cache_storage_control.mojom.h" #include "components/tracing/common/tracing_switches.h" @@ -62,7 +62,7 @@ #include "components/viz/common/switches.h" #include "components/viz/host/gpu_client.h" #include "components/viz/host/host_frame_sink_manager.h" -@@ -3730,6 +3731,8 @@ void RenderProcessHostImpl::PropagateBro +@@ -3709,6 +3710,8 @@ void RenderProcessHostImpl::PropagateBro switches::kEnableWebGLImageChromium, switches::kEnableWebGPUDeveloperFeatures, switches::kFileUrlPathAlias, @@ -73,7 +73,7 @@ switches::kForceHighContrast, --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn -@@ -109,6 +109,7 @@ target(link_target_type, "child") { +@@ -113,6 +113,7 @@ target(link_target_type, "child") { "//third_party/blink/public/common:buildflags", "//third_party/blink/public/strings", "//third_party/ced", @@ -91,7 +91,7 @@ #include "ui/accessibility/accessibility_features.h" #include "ui/base/ui_base_features.h" #include "ui/events/blink/blink_features.h" -@@ -488,6 +489,10 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -489,6 +490,10 @@ void SetRuntimeFeaturesFromCommandLine(c true}, {wrf::EnableWebAudioBypassOutputBufferingOptOut, blink::switches::kWebAudioBypassOutputBufferingOptOut, true}, @@ -104,7 +104,7 @@ for (const auto& mapping : switchToFeatureMapping) { --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -71,6 +71,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe +@@ -70,6 +70,9 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe static void EnableLocalNetworkAccessWebRTC(bool); @@ -124,9 +124,9 @@ #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" -@@ -1089,6 +1090,11 @@ Document::Document(const DocumentInit& i - TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this), - TRACE_EVENT_FLAG_FLOW_OUT); +@@ -1043,6 +1044,11 @@ Document::Document(const DocumentInit& i + data_(MakeGarbageCollected(GetExecutionContext())) { + TRACE_EVENT("blink", "Document::Document", perfetto::Flow::FromPointer(this)); DCHECK(agent_); + if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) { + // Precompute -0.0003% to 0.0003% noise factor for get*ClientRect*() fingerprinting @@ -136,7 +136,7 @@ if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) && features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) { script_runner_delayer_->Activate(); -@@ -1222,6 +1228,14 @@ const Position Document::PositionAdjuste +@@ -1176,6 +1182,14 @@ const Position Document::PositionAdjuste return Position::BeforeNode(*shadow_host); } @@ -153,7 +153,7 @@ selector_query_cache_ = MakeGarbageCollected(); --- a/third_party/blink/renderer/core/dom/document.h +++ b/third_party/blink/renderer/core/dom/document.h -@@ -570,6 +570,10 @@ class CORE_EXPORT Document : public Cont +@@ -571,6 +571,10 @@ class CORE_EXPORT Document : public Cont has_xml_declaration_ = has_xml_declaration ? 1 : 0; } @@ -164,7 +164,7 @@ V8VisibilityState visibilityState() const; String visibilityStateAsString() const; bool IsPageVisible() const; -@@ -2821,6 +2825,9 @@ class CORE_EXPORT Document : public Cont +@@ -2842,6 +2846,9 @@ class CORE_EXPORT Document : public Cont base::ElapsedTimer start_time_; @@ -176,7 +176,7 @@ // - ScriptSchedulingType::kInOrder --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc -@@ -3440,6 +3440,9 @@ Vector Element::GetClientRec +@@ -3444,6 +3444,9 @@ Vector Element::GetClientRec } Vector result; for (auto& quad : quads) { @@ -186,7 +186,7 @@ result.emplace_back(quad.BoundingBox()); } return result; -@@ -3469,6 +3472,9 @@ gfx::RectF Element::GetBoundingClientRec +@@ -3473,6 +3476,9 @@ gfx::RectF Element::GetBoundingClientRec DCHECK(element_layout_object); GetDocument().AdjustRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -264,7 +264,7 @@ const TextDirection& direction, --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -103,6 +103,9 @@ +@@ -102,6 +102,9 @@ // https://github.com/include-what-you-use/include-what-you-use/issues/1122 // IWYU pragma: no_include "base/numerics/clamped_math.h" @@ -274,7 +274,7 @@ namespace blink { class MemoryManagedPaintCanvas; -@@ -1171,9 +1174,22 @@ TextMetrics* BaseRenderingContext2D::mea +@@ -1165,9 +1168,22 @@ TextMetrics* BaseRenderingContext2D::mea TextDirection direction = ToTextDirection(state.GetDirection(), host, computed_style); @@ -300,7 +300,7 @@ String BaseRenderingContext2D::lang() const { --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1809,6 +1809,7 @@ component("platform") { +@@ -1812,6 +1812,7 @@ component("platform") { "//components/paint_preview/common", "//components/search_engines:search_engine_utils", "//components/translate/core/language_detection", @@ -310,7 +310,7 @@ "//components/webrtc:net_address_utils", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -72,4 +72,12 @@ void WebRuntimeFeatures::EnableLocalNetw +@@ -68,4 +68,12 @@ void WebRuntimeFeatures::EnableLocalNetw RuntimeEnabledFeatures::SetLocalNetworkAccessWebRTCEnabled(enable); } @@ -335,7 +335,7 @@ #include "third_party/skia/include/core/SkImage.h" --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2541,6 +2541,12 @@ +@@ -2626,6 +2626,12 @@ status: "stable", }, { diff --git a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch index 79141526..6e7a1772 100644 --- a/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch +++ b/patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch @@ -34,7 +34,7 @@ approach to change color components. #endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_ --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -3733,6 +3733,7 @@ void RenderProcessHostImpl::PropagateBro +@@ -3712,6 +3712,7 @@ void RenderProcessHostImpl::PropagateBro switches::kFileUrlPathAlias, switches::kFingerprintingClientRectsNoise, switches::kFingerprintingCanvasMeasureTextNoise, @@ -44,7 +44,7 @@ approach to change color components. switches::kForceHighContrast, --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc -@@ -493,6 +493,8 @@ void SetRuntimeFeaturesFromCommandLine(c +@@ -494,6 +494,8 @@ void SetRuntimeFeaturesFromCommandLine(c switches::kFingerprintingClientRectsNoise, true}, {wrf::EnableFingerprintingCanvasMeasureTextNoise, switches::kFingerprintingCanvasMeasureTextNoise, true}, @@ -55,7 +55,7 @@ approach to change color components. for (const auto& mapping : switchToFeatureMapping) { --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -73,6 +73,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe +@@ -72,6 +72,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFe static void EnableFingerprintingClientRectsNoise(bool); static void EnableFingerprintingCanvasMeasureTextNoise(bool); @@ -65,7 +65,7 @@ approach to change color components. }; --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -527,6 +527,9 @@ ImageData* BaseRenderingContext2D::getIm +@@ -526,6 +526,9 @@ ImageData* BaseRenderingContext2D::getIm snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds(); DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } @@ -77,7 +77,7 @@ approach to change color components. return image_data; --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1751,7 +1751,9 @@ component("platform") { +@@ -1754,7 +1754,9 @@ component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -90,7 +90,7 @@ approach to change color components. "//third_party/blink/renderer/platform/blob", --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc -@@ -80,4 +80,8 @@ void WebRuntimeFeatures::EnableFingerpri +@@ -76,4 +76,8 @@ void WebRuntimeFeatures::EnableFingerpri RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable); } @@ -281,7 +281,7 @@ approach to change color components. } // namespace blink --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h -@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage +@@ -37,6 +37,8 @@ class PLATFORM_EXPORT StaticBitmapImage StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {} @@ -314,7 +314,7 @@ approach to change color components. SkJpegEncoder::Options options; --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2547,6 +2547,9 @@ +@@ -2632,6 +2632,9 @@ name: "FingerprintingCanvasMeasureTextNoise", }, { diff --git a/patches/extra/bromite/flag-max-connections-per-host.patch b/patches/extra/bromite/flag-max-connections-per-host.patch index c0afe549..16bed236 100644 --- a/patches/extra/bromite/flag-max-connections-per-host.patch +++ b/patches/extra/bromite/flag-max-connections-per-host.patch @@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2226,6 +2226,7 @@ static_library("browser") { +@@ -2213,6 +2213,7 @@ static_library("browser") { "//components/net_log", "//components/network_hints/common:mojo_bindings", "//components/network_session_configurator/browser", @@ -65,7 +65,7 @@ with limited CPU/memory resources and it is disabled by default. #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" -@@ -116,6 +118,7 @@ +@@ -119,6 +121,7 @@ #include "components/metrics/metrics_service.h" #include "components/metrics_services_manager/metrics_services_manager.h" #include "components/metrics_services_manager/metrics_services_manager_client.h" @@ -73,7 +73,7 @@ with limited CPU/memory resources and it is disabled by default. #include "components/network_time/network_time_tracker.h" #include "components/os_crypt/async/browser/os_crypt_async.h" #include "components/permissions/permissions_client.h" -@@ -152,6 +155,7 @@ +@@ -156,6 +159,7 @@ #include "extensions/common/constants.h" #include "media/media_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" @@ -81,7 +81,7 @@ with limited CPU/memory resources and it is disabled by default. #include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" -@@ -464,6 +468,18 @@ void BrowserProcessImpl::Init() { +@@ -470,6 +474,18 @@ void BrowserProcessImpl::Init() { pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled, base::BindRepeating(&ApplyMetricsReportingPolicy)); @@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default. --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2718,6 +2718,10 @@ inline constexpr char kLogJsConsoleMessa +@@ -2765,6 +2765,10 @@ inline constexpr char kLogJsConsoleMessa "Enable logging JS console messages in system logs, please note that they " "may contain PII."; diff --git a/patches/extra/debian/disable/google-api-warning.patch b/patches/extra/debian/disable/google-api-warning.patch index 3838a8ac..13bd448f 100644 --- a/patches/extra/debian/disable/google-api-warning.patch +++ b/patches/extra/debian/disable/google-api-warning.patch @@ -3,7 +3,7 @@ author: Michael Gilbert --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -180,10 +180,6 @@ void AddInfoBarsIfNecessary(BrowserWindo +@@ -186,10 +186,6 @@ void AddInfoBarsIfNecessary(BrowserWindo infobars::ContentInfoBarManager* infobar_manager = infobars::ContentInfoBarManager::FromWebContents(web_contents); diff --git a/patches/extra/inox-patchset/0006-modify-default-prefs.patch b/patches/extra/inox-patchset/0006-modify-default-prefs.patch index c3d4c599..1a0b6bfd 100644 --- a/patches/extra/inox-patchset/0006-modify-default-prefs.patch +++ b/patches/extra/inox-patchset/0006-modify-default-prefs.patch @@ -12,7 +12,7 @@ void BackgroundModeManager::RegisterProfile(Profile* profile) { --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -1421,7 +1421,7 @@ void ChromeContentBrowserClient::Registe +@@ -1449,7 +1449,7 @@ void ChromeContentBrowserClient::Registe void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -23,7 +23,7 @@ // used for mapping the command-line flags). --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -607,7 +607,7 @@ void ProfileNetworkContextService::Confi +@@ -593,7 +593,7 @@ void ProfileNetworkContextService::Confi void ProfileNetworkContextService::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled, @@ -78,7 +78,7 @@ registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup); --- a/components/autofill/core/common/autofill_prefs.cc +++ b/components/autofill/core/common/autofill_prefs.cc -@@ -31,7 +31,7 @@ constexpr char kAutofillRanQuasiDuplicat +@@ -35,7 +35,7 @@ constexpr char kAutofillRanExtraDeduplic void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Synced prefs. Used for cross-device choices, e.g., credit card Autofill. registry->RegisterBooleanPref( @@ -87,7 +87,7 @@ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterIntegerPref( kAutofillLastVersionDeduped, 0, -@@ -59,7 +59,7 @@ void RegisterProfilePrefs(user_prefs::Pr +@@ -63,7 +63,7 @@ void RegisterProfilePrefs(user_prefs::Pr kAutofillHasSeenIban, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterBooleanPref( @@ -98,7 +98,7 @@ kAutofillPaymentCvcStorage, true, --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -449,7 +449,7 @@ bool DoesBookmarkContainWords(const std: +@@ -450,7 +450,7 @@ bool DoesBookmarkContainWords(const std: void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( @@ -120,7 +120,7 @@ --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -548,10 +548,10 @@ PasswordForm CreateFormForLeakCheck(cons +@@ -547,10 +547,10 @@ PasswordForm CreateFormForLeakCheck(cons void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/extra/inox-patchset/0008-restore-classic-ntp.patch b/patches/extra/inox-patchset/0008-restore-classic-ntp.patch index db8d1d3d..6eede54e 100644 --- a/patches/extra/inox-patchset/0008-restore-classic-ntp.patch +++ b/patches/extra/inox-patchset/0008-restore-classic-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc -@@ -178,33 +178,8 @@ struct NewTabURLDetails { +@@ -177,33 +177,8 @@ struct NewTabURLDetails { const GURL local_url(default_is_google ? chrome::kChromeUINewTabPageURL : chrome::kChromeUINewTabPageThirdPartyURL); diff --git a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch index 51eaddb6..242d46ff 100644 --- a/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1829,30 +1829,6 @@ int ChromeBrowserMainParts::PreMainMessa +@@ -1858,30 +1858,6 @@ int ChromeBrowserMainParts::PreMainMessa // and preferences have been registered since some of the import code depends // on preferences. if (first_run::IsChromeFirstRun()) { diff --git a/patches/extra/iridium-browser/updater-disable-auto-update.patch b/patches/extra/iridium-browser/updater-disable-auto-update.patch index f3860031..07ce743a 100644 --- a/patches/extra/iridium-browser/updater-disable-auto-update.patch +++ b/patches/extra/iridium-browser/updater-disable-auto-update.patch @@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome. --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -1107,7 +1107,7 @@ class AppControllerNativeThemeObserver : +@@ -1170,7 +1170,7 @@ class AppControllerNativeThemeObserver : CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { diff --git a/patches/extra/ungoogled-chromium/add-credits.patch b/patches/extra/ungoogled-chromium/add-credits.patch index b3326e82..a4a206ed 100644 --- a/patches/extra/ungoogled-chromium/add-credits.patch +++ b/patches/extra/ungoogled-chromium/add-credits.patch @@ -56,7 +56,7 @@ # Paths from the root of the tree to directories to skip. PRUNE_PATHS = set([ # Placeholder directory only, not third-party code. -@@ -1006,7 +1014,7 @@ def _DiscoverMetadatas(args): +@@ -1010,7 +1018,7 @@ def _DiscoverMetadatas(args): LogParseDirErrors(errors) metadatas.sort(key=lambda m: (m['Name'].lower(), m['dir'])) @@ -65,7 +65,7 @@ return metadatas, had_errors -@@ -1083,8 +1091,8 @@ def GenerateCredits(args, metadatas): +@@ -1087,8 +1095,8 @@ def GenerateCredits(args, metadatas): entries_contents = '\n'.join([entry['content'] for entry in entries]) reciprocal_contents = EvaluateTemplate(reciprocal_template, { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch index 47bb5697..abf39cb6 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch @@ -1,14 +1,14 @@ --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -141,6 +141,7 @@ +@@ -140,6 +140,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/contents_web_view.h" #include "chrome/browser/ui/views/frame/multi_contents_view.h" +#include "chrome/browser/ui/views/message_box_dialog.h" + #include "chrome/browser/ui/views/side_panel/side_panel_ui.h" #include "chrome/browser/ui/views/status_bubble_views.h" #include "chrome/browser/ui/web_applications/app_browser_controller.h" - #include "chrome/browser/ui/webui/signin/login_ui_service.h" -@@ -598,6 +599,7 @@ Browser::Browser(const CreateParams& par +@@ -587,6 +588,7 @@ Browser::Browser(const CreateParams& par should_trigger_session_restore_(params.should_trigger_session_restore), cancel_download_confirmation_state_( CancelDownloadConfirmationState::kNotPrompted), @@ -16,43 +16,24 @@ override_bounds_(params.initial_bounds), initial_show_state_(params.initial_show_state), initial_workspace_(params.initial_workspace), -@@ -985,20 +987,22 @@ Browser::WarnBeforeClosingResult Browser +@@ -974,10 +976,12 @@ Browser::WarnBeforeClosingResult Browser return WarnBeforeClosingResult::kOkToClose; } - // `CanCloseWithInProgressDownloads()` may trigger a modal dialog. - bool can_close_with_downloads = CanCloseWithInProgressDownloads(); -- if (can_close_with_downloads && -- !ShouldShowCookieMigrationNoticeForBrowser(*this)) { +- if (can_close_with_downloads) { - return WarnBeforeClosingResult::kOkToClose; -- } + if (CanCloseWithMultipleTabs()) { + // `CanCloseWithInProgressDownloads()` may trigger a modal dialog. + bool can_close_with_downloads = CanCloseWithInProgressDownloads(); -+ if (can_close_with_downloads && -+ !ShouldShowCookieMigrationNoticeForBrowser(*this)) { -+ return WarnBeforeClosingResult::kOkToClose; -+ } - -- // If there is no download warning, show the cookie migration notice now. -- // Otherwise, the download warning is being shown. Cookie migration notice -- // will be shown after, if needed. -- if (can_close_with_downloads) { -- ShowCookieClearOnExitMigrationNotice( -- *this, base::BindOnce(&Browser::CookieMigrationNoticeResponse, -- weak_factory_.GetWeakPtr())); -+ // If there is no download warning, show the cookie migration notice now. -+ // Otherwise, the download warning is being shown. Cookie migration notice -+ // will be shown after, if needed. + if (can_close_with_downloads) { -+ ShowCookieClearOnExitMigrationNotice( -+ *this, base::BindOnce(&Browser::CookieMigrationNoticeResponse, -+ weak_factory_.GetWeakPtr())); ++ return WarnBeforeClosingResult::kOkToClose; + } } DCHECK(!warn_before_closing_callback_) -@@ -1052,6 +1056,7 @@ bool Browser::TryToCloseWindow( +@@ -1031,6 +1035,7 @@ bool Browser::TryToCloseWindow( void Browser::ResetTryToCloseWindow() { cancel_download_confirmation_state_ = CancelDownloadConfirmationState::kNotPrompted; @@ -60,7 +41,7 @@ unload_controller_.ResetTryToCloseWindow(); } -@@ -3556,6 +3561,58 @@ bool Browser::CanCloseWithInProgressDown +@@ -3538,6 +3543,59 @@ bool Browser::CanCloseWithInProgressDown return false; } @@ -80,14 +61,15 @@ + + // Figure out how many windows are open total + int total_window_count = 0; -+ for (Browser* browser : *BrowserList::GetInstance()) { ++ GlobalBrowserCollection::GetInstance()->ForEach([&total_window_count, this](BrowserWindowInterface* browser) { + // Don't count this browser window or any other in the process of closing. + // Window closing may be delayed, and windows that are in the process of + // closing don't count against our totals. -+ if (browser == this || browser->IsAttemptingToCloseBrowser()) -+ continue; -+ total_window_count++; -+ } ++ if (browser != this && !browser->capabilities()->IsAttemptingToCloseBrowser()) { ++ total_window_count++; ++ } ++ return true; ++ }); + + const auto flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("close-confirmation"); + bool show_confirmation_last_window = flag_value == "last"; @@ -119,7 +101,7 @@ void Browser::InProgressDownloadResponse(bool cancel_downloads) { if (cancel_downloads) { cancel_download_confirmation_state_ = -@@ -3584,6 +3641,22 @@ void Browser::InProgressDownloadResponse +@@ -3559,6 +3617,22 @@ void Browser::InProgressDownloadResponse std::move(warn_before_closing_callback_) .Run(WarnBeforeClosingResult::kDoNotClose); @@ -141,7 +123,7 @@ + .Run(WarnBeforeClosingResult::kDoNotClose); } - void Browser::CookieMigrationNoticeResponse(bool proceed_closing) { + void Browser::FinishWarnBeforeClosing(WarnBeforeClosingResult result) { --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -33,6 +33,7 @@ @@ -152,7 +134,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/unload_controller.h" -@@ -1146,12 +1147,17 @@ class Browser : public TabStripModelObse +@@ -1135,12 +1136,17 @@ class Browser : public TabStripModelObse // Returns true if the window can close, false otherwise. bool CanCloseWithInProgressDownloads(); @@ -170,7 +152,7 @@ // Called when the user has decided whether to proceed or not with the browser // closure, in case the cookie migration notice was shown. |proceed_closing| // is true if the browser can be closed. -@@ -1327,6 +1333,8 @@ class Browser : public TabStripModelObse +@@ -1311,6 +1317,8 @@ class Browser : public TabStripModelObse // when the browser is closed with in-progress downloads. CancelDownloadConfirmationState cancel_download_confirmation_state_; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch index 01a77281..98718346 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -800,11 +800,15 @@ bool HandleNewTabPageLocationOverride( +@@ -815,11 +815,15 @@ bool HandleNewTabPageLocationOverride( // Don't change the URL when incognito mode. if (profile->IsOffTheRecord()) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch index 2e563d11..322ca41f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch @@ -41,7 +41,7 @@ #include "third_party/blink/public/common/input/web_menu_source_type.h" #include "third_party/blink/public/platform/web_input_event_result.h" #include "third_party/blink/renderer/core/annotation/annotation_agent_impl.h" -@@ -1448,10 +1449,14 @@ FrameSelection& SelectionController::Sel +@@ -1461,10 +1462,14 @@ FrameSelection& SelectionController::Sel } bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) { diff --git a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch index 905f657f..a872ea53 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-grab-handle.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc -@@ -82,6 +82,7 @@ class FrameGrabHandle : public views::Vi +@@ -90,6 +90,7 @@ class FrameGrabHandle : public views::Vi // Reserve some space for the frame to be grabbed by, even if the tabstrip // is full. // TODO(tbergquist): Define this relative to the NTB insets again. diff --git a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch index 891c8a66..a9338881 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_widget.cc +++ b/chrome/browser/ui/views/frame/browser_widget.cc -@@ -615,5 +615,7 @@ bool BrowserWidget::RegenerateFrameOnThe +@@ -609,6 +609,8 @@ bool BrowserWidget::RegenerateFrameOnThe } bool BrowserWidget::IsIncognitoBrowser() const { @@ -8,6 +8,7 @@ + return false; return browser_view_->browser()->profile()->IsIncognitoProfile(); } + --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -49,6 +49,7 @@ diff --git a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch index 7ac4203f..4d264b6c 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch @@ -41,7 +41,7 @@ #include "base/feature_list.h" #include "base/format_macros.h" #include "base/functional/bind.h" -@@ -553,6 +554,15 @@ AutocompleteController::AutocompleteCont +@@ -554,6 +555,15 @@ AutocompleteController::AutocompleteCont metrics::OmniboxEventProto::UNKNOWN_POSITION), config_(config) { config_.provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes(); @@ -49,9 +49,9 @@ + const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"); + config_.provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH | + AutocompleteProvider::TYPE_HISTORY_URL | AutocompleteProvider::TYPE_BOOKMARK | AutocompleteProvider::TYPE_BUILTIN; -+ if (!base::Contains(flag_value, "bookmarks")) ++ if (!flag_value.contains("bookmarks")) + config_.provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK; -+ if (!base::Contains(flag_value, "chrome")) ++ if (!flag_value.contains("chrome")) + config_.provider_types &= ~AutocompleteProvider::TYPE_BUILTIN; + } @@ -91,21 +91,20 @@ if (minimal_changes) --- a/components/url_formatter/url_fixer.cc +++ b/components/url_formatter/url_fixer.cc -@@ -10,6 +10,8 @@ +@@ -10,6 +10,7 @@ #include #include "base/check_op.h" -+#include "base/containers/contains.h" +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -@@ -644,6 +646,8 @@ GURL FixupURLInternal(const std::string& +@@ -643,6 +644,8 @@ GURL FixupURLInternal(const std::string& FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url); if (chrome_url && !parts.host.is_valid()) { + if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") || -+ base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome")) ++ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering").contains("chrome")) url.append(kChromeUIDefaultHost); } FixupPort(trimmed, parts.port, &url); diff --git a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch index b9a9ef2a..9035670b 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -564,7 +564,9 @@ void TabHelpers::AttachTabHelpers(WebCon +@@ -562,7 +562,9 @@ void TabHelpers::AttachTabHelpers(WebCon profile, web_contents); #endif // BUILDFLAG(SAFE_BROWSING_AVAILABLE) SafetyTipWebContentsObserver::CreateForWebContents(web_contents); @@ -25,7 +25,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc -@@ -269,14 +269,16 @@ void ChromeRenderFrameObserver::DidFinis +@@ -271,14 +271,16 @@ void ChromeRenderFrameObserver::DidFinis if (frame->Parent() || frame->IsInFencedFrameTree()) return; @@ -92,7 +92,7 @@ } bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy( -@@ -2491,6 +2499,8 @@ SyncDataMap TemplateURLService::CreateGU +@@ -2497,6 +2505,8 @@ SyncDataMap TemplateURLService::CreateGU } void TemplateURLService::Init() { @@ -101,7 +101,7 @@ if (client_) { client_->SetOwner(this); } -@@ -2656,6 +2666,9 @@ void TemplateURLService::ChangeToLoadedS +@@ -2662,6 +2672,9 @@ void TemplateURLService::ChangeToLoadedS bool TemplateURLService::CanAddAutogeneratedKeywordForHost( const std::string& host) const { @@ -113,7 +113,7 @@ return true; --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -912,6 +912,8 @@ class TemplateURLService final : public +@@ -914,6 +914,8 @@ class TemplateURLService final : public raw_ref prepopulate_data_resolver_; diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch index 049e9489..e81a8ef5 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch @@ -8,7 +8,7 @@ #include "base/debug/alias.h" #include "base/functional/bind.h" #include "base/i18n/rtl.h" -@@ -768,6 +769,13 @@ void Tab::HideHover(TabStyle::HideHoverS +@@ -780,6 +781,13 @@ void Tab::HideHover(TabStyle::HideHoverS DeprecatedLayoutImmediately(); } @@ -24,7 +24,7 @@ // BrowserView::GetAccessibleTabLabel to get the updated accessible name. --- a/chrome/browser/ui/views/tabs/tab.h +++ b/chrome/browser/ui/views/tabs/tab.h -@@ -102,6 +102,7 @@ class Tab : public gfx::AnimationDelegat +@@ -104,6 +104,7 @@ class Tab : public gfx::AnimationDelegat void OnMouseEntered(const ui::MouseEvent& event) override; void OnMouseExited(const ui::MouseEvent& event) override; void OnGestureEvent(ui::GestureEvent* event) override; @@ -42,15 +42,15 @@ #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" -@@ -1990,6 +1991,8 @@ void TabStrip::OnMouseEventInTab(views:: +@@ -2000,6 +2001,8 @@ void TabStrip::OnMouseEventInTab(views:: } void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) { + if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("tab-hover-cards") == "tooltip" || + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("tab-hover-cards") == "none") return; - tab_container_->UpdateHoverCard(tab, update_type); - } - + if (tab_container_) { + tab_container_->UpdateHoverCard(tab, update_type); + } --- a/chrome/browser/ungoogled_flag_choices.h +++ b/chrome/browser/ungoogled_flag_choices.h @@ -70,4 +70,13 @@ const FeatureEntry::Choice kCloseConfirm diff --git a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch index f35b13a7..4aa162dc 100644 --- a/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -1699,7 +1699,8 @@ void BrowserCommandController::InitComma +@@ -1723,7 +1723,8 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS, normal_window); @@ -10,30 +10,28 @@ command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH, enable_tab_search_commands); command_updater_.UpdateCommandEnabled(IDC_TAB_SEARCH_CLOSE, ---- a/chrome/browser/ui/ui_features.cc -+++ b/chrome/browser/ui/ui_features.cc -@@ -4,6 +4,7 @@ +--- a/chrome/browser/ui/tab_search_feature.cc ++++ b/chrome/browser/ui/tab_search_feature.cc +@@ -6,12 +6,16 @@ - #include "chrome/browser/ui/ui_features.h" + #include +#include "base/command_line.h" - #include "base/feature_list.h" - #include "base/metrics/field_trial_params.h" - #include "base/time/time.h" -@@ -516,6 +517,10 @@ static std::string GetCountryCode() { - } + #include "chrome/browser/glic/public/glic_enabling.h" + namespace features { bool HasTabSearchToolbarButton() { + // It is important that this value not change at runtime in production. Any + // future updates to this function must maintain that property. + if (base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) { + return false; + } -+ - static const bool is_tab_search_moving = [] { - if (GetCountryCode() == "us" && - base::FeatureList::IsEnabled( + return true; + } + } // namespace features --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -4517,6 +4517,9 @@ BookmarkBar::State BrowserView::bookmark +@@ -4385,6 +4385,9 @@ BookmarkBar::State BrowserView::bookmark } void BrowserView::UpdateTabSearchBubbleHost() { @@ -50,12 +48,12 @@ #include "chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h" +#include "base/command_line.h" + #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" - #include "base/task/single_thread_task_runner.h" -@@ -219,6 +220,7 @@ HorizontalTabStripRegionView::Horizontal +@@ -241,6 +242,7 @@ HorizontalTabStripRegionView::Horizontal + std::unique_ptr tab_search_container; std::unique_ptr tab_strip_action_container; - std::unique_ptr product_specifications_button; if (browser && + !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button") && (browser->GetType() == BrowserWindowInterface::Type::TYPE_NORMAL)) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch index 6f1b2958..6d0c1dce 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/browser_features.cc +++ b/chrome/browser/browser_features.cc -@@ -262,4 +262,5 @@ BASE_FEATURE(kReportPakFileIntegrity, +@@ -265,4 +265,5 @@ BASE_FEATURE(kReportPakFileIntegrity, // show both in Chrome Tabs and Windows. BASE_FEATURE(kRemovalOfIWAsFromTabCapture, base::FEATURE_ENABLED_BY_DEFAULT); @@ -8,7 +8,7 @@ } // namespace features --- a/chrome/browser/browser_features.h +++ b/chrome/browser/browser_features.h -@@ -113,6 +113,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT +@@ -115,6 +115,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT // module, e.g. // //chrome/browser//features.h // @@ -45,11 +45,11 @@ + chrome_browsing_data_remover::DATA_TYPE_SITE_DATA; +} + - uint64_t GetOriginTypeMask(const base::Value::List& data_types) { + uint64_t GetOriginTypeMask(const base::ListValue& data_types) { uint64_t result = 0; for (const auto& data_type : data_types) { @@ -329,9 +345,10 @@ void ChromeBrowsingDataLifetimeManager:: - const base::Value::List& data_types = profile_->GetPrefs()->GetList( + const base::ListValue& data_types = profile_->GetPrefs()->GetList( browsing_data::prefs::kClearBrowsingDataOnExitList); - if (!data_types.empty() && diff --git a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch index 5480a7d4..69dedba6 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ #include "base/check.h" #include "base/check_op.h" @@ -8,7 +8,7 @@ #include "base/containers/adapters.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" -@@ -1304,6 +1305,10 @@ void TabStripModel::CloseAllTabsInGroupI +@@ -1309,6 +1310,10 @@ void TabStripModel::CloseAllTabsInGroupI void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) { CHECK(ContainsIndex(index)); @@ -19,7 +19,7 @@ CloseTabs({GetWebContentsAt(index)}, close_types); } -@@ -3242,9 +3247,13 @@ void TabStripModel::ExecuteCloseTabs( +@@ -3205,9 +3210,13 @@ void TabStripModel::ExecuteCloseTabs( base::RepeatingCallback()> get_tabs_to_close, uint32_t close_types) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch index 7418d441..bd11f194 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch @@ -50,7 +50,7 @@ bool IsExtensionDownload(const download::DownloadItem& download_item); --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1129,10 +1129,12 @@ DownloadConfirmationReason DownloadTarge +@@ -1130,10 +1130,12 @@ DownloadConfirmationReason DownloadTarge return DownloadConfirmationReason::SAVE_AS; #if BUILDFLAG(ENABLE_EXTENSIONS_CORE) @@ -69,7 +69,7 @@ // Don't prompt for file types that are marked for opening automatically. --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -335,6 +335,13 @@ bool ExtensionManagement::IsInstallation +@@ -336,6 +336,13 @@ bool ExtensionManagement::IsInstallation bool ExtensionManagement::IsOffstoreInstallAllowed( const GURL& url, const GURL& referrer_url) const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch index 41394d99..47934965 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch @@ -13,7 +13,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -1192,6 +1192,8 @@ WindowOpenDisposition NavigationPolicyTo +@@ -1211,6 +1211,8 @@ WindowOpenDisposition NavigationPolicyTo case blink::kWebNavigationPolicyNewWindow: return WindowOpenDisposition::NEW_WINDOW; case blink::kWebNavigationPolicyNewPopup: diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch index 30f14ddc..1bd4fa5f 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch @@ -3,7 +3,7 @@ --- a/chrome/browser/ui/startup/infobar_utils.cc +++ b/chrome/browser/ui/startup/infobar_utils.cc -@@ -142,6 +142,7 @@ void AddInfoBarsIfNecessary(BrowserWindo +@@ -148,6 +148,7 @@ void AddInfoBarsIfNecessary(BrowserWindo // Web apps should not display the session restore bubble (crbug.com/1264121) const bool should_display_bubble = diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch index c829ca68..d513a098 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch @@ -1,5 +1,5 @@ ---- a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc -+++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc +--- a/chrome/browser/ui/views/extensions/extensions_toolbar_desktop.cc ++++ b/chrome/browser/ui/views/extensions/extensions_toolbar_desktop.cc @@ -7,6 +7,7 @@ #include #include @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/functional/callback_helpers.h" -@@ -36,6 +37,7 @@ +@@ -37,6 +38,7 @@ #include "chrome/browser/ui/views/side_panel/extensions/extension_side_panel_coordinator.h" #include "chrome/browser/ui/views/side_panel/side_panel_ui.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h" @@ -16,7 +16,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/feature_engagement/public/event_constants.h" -@@ -467,6 +469,17 @@ void ExtensionsToolbarContainer::AnchorA +@@ -439,6 +441,17 @@ void ExtensionsToolbarDesktop::AnchorAnd widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView( anchor_view && anchor_view->GetVisible() ? anchor_view : GetExtensionsButton()); @@ -34,10 +34,10 @@ widget->Show(); } -@@ -927,6 +940,9 @@ void ExtensionsToolbarContainer::UpdateC +@@ -918,6 +931,9 @@ void ExtensionsToolbarDesktop::UpdateCon } - bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const { + bool ExtensionsToolbarDesktop::ShouldContainerBeVisible() const { + if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-extensions-menu")) + return false; + diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch index 15446343..57fb89be 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -728,6 +728,9 @@ class BrowserView::ExclusiveAccessContex +@@ -745,6 +745,9 @@ class BrowserView::ExclusiveAccessContex void UpdateExclusiveAccessBubble( const ExclusiveAccessBubbleParams& params, ExclusiveAccessBubbleHideCallback first_hide_callback) override { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch index 44b045ca..0c6d5a85 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -1200,7 +1200,11 @@ void Tab::UpdateIconVisibility() { +@@ -1192,7 +1192,11 @@ void Tab::UpdateIconVisibility() { // Close button is shown on active tabs regardless of the size. showing_close_button_ = true; #endif // BUILDFLAG(IS_CHROMEOS) @@ -12,8 +12,8 @@ showing_alert_indicator_ = has_alert_icon && alert_icon_width <= available_width; -@@ -1229,6 +1233,8 @@ void Tab::UpdateIconVisibility() { - !controller_->IsLockedForOnTask() && +@@ -1221,6 +1225,8 @@ void Tab::UpdateIconVisibility() { + should_show_close_button && #endif large_enough_for_close_button; + if (base::CommandLine::ForCurrentProcess()->HasSwitch("hide-tab-close-buttons")) diff --git a/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch index 4a8383ad..369507bf 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch @@ -11,16 +11,16 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -166,6 +166,8 @@ const std::string& GetWindowsPlatformVer +@@ -195,6 +195,8 @@ const blink::UserAgentBrandList GetUserA // It helps us avoid introducing individual enterprise policy controls for // sending unified platform for the user agent string. bool ShouldSendUserAgentUnifiedPlatform() { + if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo)) + return true; - bool reduce_minor_version = base::FeatureList::IsEnabled( + return base::FeatureList::IsEnabled( blink::features::kReduceUserAgentMinorVersion); - #if BUILDFLAG(IS_ANDROID) -@@ -650,6 +652,8 @@ std::string GetPlatformForUAMetadata() { + } +@@ -636,6 +638,8 @@ std::string GetPlatformForUAMetadata() { } blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) { @@ -51,7 +51,7 @@ // Feature declarations and associated constants (feature params, et cetera) --- a/third_party/blink/renderer/core/execution_context/navigator_base.cc +++ b/third_party/blink/renderer/core/execution_context/navigator_base.cc -@@ -74,6 +74,8 @@ void NavigatorBase::Trace(Visitor* visit +@@ -70,6 +70,8 @@ void NavigatorBase::Trace(Visitor* visit } unsigned int NavigatorBase::hardwareConcurrency() const { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch index 148230a4..e5744c49 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch @@ -78,7 +78,7 @@ #include "third_party/blink/public/common/permissions_policy/document_policy_features.h" #include "third_party/blink/public/common/switches.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" -@@ -624,6 +625,8 @@ void FrameFetchContext::ModifyRequestFor +@@ -630,6 +631,8 @@ void FrameFetchContext::ModifyRequestFor void FrameFetchContext::AddClientHintsIfNecessary( const std::optional resource_width, ResourceRequest& request) { diff --git a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch index 7d39f306..1c55efea 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch @@ -40,13 +40,13 @@ // It's possible to destroy the browser while a drop is active. In this case, @@ -331,7 +346,7 @@ bool BrowserRootView::OnMouseWheel(const - // Scroll-event-changes-tab is incompatible with scrolling tabstrip, so + // Scroll-event-changes-tab is incompatible with vertical tabstrip, so // disable it if the latter feature is enabled. -- if (browser_defaults::kScrollEventChangesTab) { -+ if (scroll_event_changes_tab_) { +- if (browser_defaults::kScrollEventChangesTab && ++ if (scroll_event_changes_tab_ && + !browser_view_->ShouldDrawVerticalTabStrip()) { // Switch to the left/right tab if the wheel-scroll happens over the // tabstrip, or the empty space beside the tabstrip. - views::View* hit_view = GetEventHandlerForPoint(event.location()); --- a/chrome/browser/ui/views/frame/browser_root_view.h +++ b/chrome/browser/ui/views/frame/browser_root_view.h @@ -158,6 +158,8 @@ class BrowserRootView : public views::in diff --git a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch index 96359661..13a36132 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -468,6 +468,17 @@ void ToolbarView::Init() { +@@ -446,6 +446,17 @@ void ToolbarView::Init() { browser_->profile()->IsGuestSession() || browser_->profile()->IsRegularProfile(); #endif diff --git a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch index da3b7d47..4d25739d 100644 --- a/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch +++ b/patches/extra/ungoogled-chromium/add-flag-to-spoof-webgl-renderer-info.patch @@ -36,13 +36,13 @@ + {blink::features::kSpoofWebGLVendor, "Qualcomm"}, +}; +const FeatureEntry::FeatureVariation kSpoofWebGLChoices[] = { -+ {"Blank", kSpoofWebGL_Blank, std::size(kSpoofWebGL_Blank), nullptr}, -+ {"AMD Radeon R9 200", kSpoofWebGL_Amd, std::size(kSpoofWebGL_Amd), nullptr}, -+ {"Apple", kSpoofWebGL_Apple, std::size(kSpoofWebGL_Apple), nullptr}, -+ {"Intel", kSpoofWebGL_Intel, std::size(kSpoofWebGL_Intel), nullptr}, -+ {"Mesa LLVMpipe", kSpoofWebGL_Mesa, std::size(kSpoofWebGL_Mesa), nullptr}, -+ {"NVIDIA GeForce GTX 980", kSpoofWebGL_Nvidia, std::size(kSpoofWebGL_Nvidia), nullptr}, -+ {"Qualcomm Adreno 610", kSpoofWebGL_Qualcomm, std::size(kSpoofWebGL_Qualcomm), nullptr}, ++ {"Blank", kSpoofWebGL_Blank, nullptr}, ++ {"AMD Radeon R9 200", kSpoofWebGL_Amd, nullptr}, ++ {"Apple", kSpoofWebGL_Apple, nullptr}, ++ {"Intel", kSpoofWebGL_Intel, nullptr}, ++ {"Mesa LLVMpipe", kSpoofWebGL_Mesa, nullptr}, ++ {"NVIDIA GeForce GTX 980", kSpoofWebGL_Nvidia, nullptr}, ++ {"Qualcomm Adreno 610", kSpoofWebGL_Qualcomm, nullptr}, +}; #endif // CHROME_BROWSER_UNGOOGLED_FLAG_CHOICES_H_ --- a/chrome/browser/ungoogled_flag_entries.h @@ -86,7 +86,7 @@ // Feature declarations and associated constants (feature params, et cetera) --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3976,6 +3976,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3977,6 +3977,8 @@ ScriptValue WebGLRenderingContextBase::g return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { @@ -95,7 +95,7 @@ return WebGLAny(script_state, String(ContextGL()->GetString(GL_RENDERER))); } -@@ -3985,6 +3987,8 @@ ScriptValue WebGLRenderingContextBase::g +@@ -3986,6 +3988,8 @@ ScriptValue WebGLRenderingContextBase::g return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { diff --git a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch index 0cecb905..000fd775 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5162,10 +5162,12 @@ const FeatureEntry::Choice kOmniboxAutof +@@ -4672,10 +4672,12 @@ const FeatureEntry::FeatureVariation #include "chrome/browser/ungoogled_flag_choices.h" #include "chrome/browser/bromite_flag_choices.h" #include "chrome/browser/ungoogled_platform_flag_choices.h" diff --git a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch index 98ce6b56..4ec9ab9f 100644 --- a/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch +++ b/patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch @@ -19,7 +19,7 @@ #endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_ --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -173,6 +173,7 @@ +@@ -175,6 +175,7 @@ #include "services/network/public/cpp/permissions_policy/fenced_frame_permissions_policies.h" #include "services/network/public/cpp/permissions_policy/permissions_policy_declaration.h" #include "services/network/public/cpp/permissions_policy/permissions_policy_features.h" @@ -27,7 +27,7 @@ #include "services/network/public/cpp/resource_request_body.h" #include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h" #include "services/network/public/cpp/url_loader_completion_status.h" -@@ -392,10 +393,10 @@ void AddAdditionalRequestHeaders( +@@ -394,10 +395,10 @@ void AddAdditionalRequestHeaders( net::HttpRequestHeaders::kUserAgent, ComputeUserAgentValue(user_agent_override)); @@ -44,7 +44,7 @@ if (NeedsHTTPOrigin(headers, method)) { --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -137,6 +137,7 @@ +@@ -136,6 +136,7 @@ #include "services/network/public/cpp/content_decoding_interceptor.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/not_implemented_url_loader_factory.h" @@ -52,7 +52,7 @@ #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" #include "services/network/public/mojom/fetch_api.mojom.h" #include "services/network/public/mojom/restricted_cookie_manager.mojom.h" -@@ -4519,10 +4520,13 @@ void RenderFrameImpl::FinalizeRequestInt +@@ -4541,10 +4542,13 @@ void RenderFrameImpl::FinalizeRequestInt request.SetHasUserGesture(frame_->HasTransientUserActivation()); @@ -100,9 +100,9 @@ --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -124,6 +124,8 @@ component("cpp") { - "private_network_access_check_result.cc", - "private_network_access_check_result.h", +@@ -126,6 +126,8 @@ component("cpp") { + "parsed_headers.cc", + "parsed_headers.h", "record_ontransfersizeupdate_utils.h", + "referrer_sanitizer.cc", + "referrer_sanitizer.h", diff --git a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch index f12b52c8..e8a42243 100644 --- a/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch @@ -35,7 +35,7 @@ // https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html. --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc -@@ -152,11 +152,6 @@ const size_t kMaxHostLength = 4096; +@@ -151,11 +151,6 @@ const size_t kMaxHostLength = 4096; // cached. const int kIPv6ProbePeriodMs = 1000; diff --git a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch index d958a824..d31c5e2d 100644 --- a/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch +++ b/patches/extra/ungoogled-chromium/add-suggestions-url-field.patch @@ -271,7 +271,7 @@ bool CanEdit(const TemplateURL* url) const; --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc -@@ -211,21 +211,25 @@ void TemplateURLTableModel::Remove(size_ +@@ -210,21 +210,25 @@ void TemplateURLTableModel::Remove(size_ void TemplateURLTableModel::Add(size_t index, const std::u16string& short_name, const std::u16string& keyword, @@ -302,7 +302,7 @@ DCHECK(index <= RowCount()); DCHECK(!url.empty()); TemplateURL* template_url = GetTemplateURL(index); -@@ -234,7 +238,8 @@ void TemplateURLTableModel::ModifyTempla +@@ -233,7 +237,8 @@ void TemplateURLTableModel::ModifyTempla DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url || template_url->SupportsReplacement( template_url_service_->search_terms_data())); @@ -334,7 +334,7 @@ void ReloadIcon(size_t index); --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc -@@ -51,6 +51,7 @@ namespace { +@@ -52,6 +52,7 @@ namespace { const char kSearchEngineField[] = "searchEngine"; const char kKeywordField[] = "keyword"; const char kQueryUrlField[] = "queryUrl"; @@ -342,16 +342,16 @@ // Dummy number used for indicating that a new search engine is added. const int kNewSearchEngineIndex = -1; -@@ -257,6 +258,8 @@ base::Value::Dict SearchEnginesHandler:: +@@ -258,6 +259,8 @@ base::DictValue SearchEnginesHandler::Cr Profile* profile = Profile::FromWebUI(web_ui()); dict.Set("url", template_url->url_ref().DisplayURL(UIThreadSearchTermsData())); + dict.Set("suggestionsUrl", template_url->suggestions_url_ref().DisplayURL( + UIThreadSearchTermsData())); - dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) || - (template_url->starter_pack_id() > 0))); - GURL icon_url = template_url->favicon_url(); -@@ -423,12 +426,14 @@ void SearchEnginesHandler::HandleSearchE + dict.Set("urlLocked", + ((template_url->prepopulate_id() > 0) || + (template_url->starter_pack_id() != +@@ -427,12 +430,14 @@ void SearchEnginesHandler::HandleSearchE void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url, const std::u16string& title, const std::u16string& keyword, @@ -369,7 +369,7 @@ } edit_controller_.reset(); -@@ -458,6 +463,8 @@ bool SearchEnginesHandler::CheckFieldVal +@@ -462,6 +467,8 @@ bool SearchEnginesHandler::CheckFieldVal is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value)); } else if (field_name.compare(kQueryUrlField) == 0) { is_valid = edit_controller_->IsURLValid(field_value); @@ -378,7 +378,7 @@ } else { NOTREACHED(); } -@@ -480,18 +487,21 @@ void SearchEnginesHandler::HandleSearchE +@@ -484,18 +491,21 @@ void SearchEnginesHandler::HandleSearchE return; } @@ -417,7 +417,7 @@ void RegisterMessages() override; @@ -80,8 +81,8 @@ class SearchEnginesHandler : public Sett // to WebUI. Called from WebUI. - void HandleValidateSearchEngineInput(const base::Value::List& args); + void HandleValidateSearchEngineInput(const base::ListValue& args); - // Checks whether the given user input field (searchEngine, keyword, queryUrl) - // is populated with a valid value. @@ -428,7 +428,7 @@ --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc -@@ -1036,7 +1036,8 @@ void TemplateURLService::IncrementUsageC +@@ -1038,7 +1038,8 @@ void TemplateURLService::IncrementUsageC void TemplateURLService::ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, @@ -438,7 +438,7 @@ DCHECK(!IsCreatedByExtension(*url)); DCHECK(!keyword.empty()); DCHECK(!search_url.empty()); -@@ -1060,6 +1061,7 @@ void TemplateURLService::ResetTemplateUR +@@ -1062,6 +1063,7 @@ void TemplateURLService::ResetTemplateUR data.last_modified = clock_->Now(); data.is_active = TemplateURLData::ActiveStatus::kTrue; data.policy_origin = TemplateURLData::PolicyOrigin::kNoPolicy; @@ -448,7 +448,7 @@ syncer::kSeparateLocalAndAccountSearchEngines) --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h -@@ -345,7 +345,8 @@ class TemplateURLService final : public +@@ -347,7 +347,8 @@ class TemplateURLService final : public void ResetTemplateURL(TemplateURL* url, const std::u16string& title, const std::u16string& keyword, diff --git a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch index f78b304d..d2ac1b7d 100644 --- a/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch +++ b/patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5158,7 +5158,13 @@ const FeatureEntry::Choice kOmniboxAutof +@@ -4668,7 +4668,13 @@ const FeatureEntry::FeatureVariation // calculate and verify checksum. // // When adding a new choice, add it to the end of the list. diff --git a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch index 0972cdd9..094a679a 100644 --- a/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch +++ b/patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch @@ -6,6 +6,6 @@ registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy, - blink::kWebRTCIPHandlingDefault); + blink::kWebRTCIPHandlingDisableNonProxiedUdp); - registry->RegisterListPref(prefs::kWebRTCIPHandlingUrl, base::Value::List()); + registry->RegisterListPref(prefs::kWebRTCIPHandlingUrl, base::ListValue()); registry->RegisterBooleanPref(prefs::kWebRTCPostQuantumKeyAgreement, false); registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string()); diff --git a/patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch b/patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch index 5c41a417..d6de1d2a 100644 --- a/patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch +++ b/patches/extra/ungoogled-chromium/disable-ai-search-shortcuts.patch @@ -1,56 +1,59 @@ --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc -@@ -117,22 +117,10 @@ void TemplateURLTableModel::Reload() { +@@ -116,22 +116,10 @@ void TemplateURLTableModel::Reload() { extension_entries; // Keywords that can be made the default first. for (TemplateURL* template_url : urls) { - // Skip @gemini if feature disabled. - if (template_url->starter_pack_id() == -- template_url_starter_pack_data::kGemini && +- template_url_starter_pack_data::StarterPackId::kGemini && - !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) { - continue; - } - // Skip @page if feature disabled. - if (template_url->starter_pack_id() == -- template_url_starter_pack_data::kPage && +- template_url_starter_pack_data::StarterPackId::kPage && - !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page) { - continue; - } - // Skip @aimode if feature disabled. - if (template_url->starter_pack_id() == -- template_url_starter_pack_data::kAiMode && +- template_url_starter_pack_data::StarterPackId::kAiMode && - !ai_mode_enabled_) { + // Disable all Google AI starter pack options -+ if (template_url->starter_pack_id() == template_url_starter_pack_data::kGemini || -+ template_url->starter_pack_id() == template_url_starter_pack_data::kAiMode || -+ template_url->starter_pack_id() == template_url_starter_pack_data::kPage) { ++ if (template_url->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kGemini || ++ template_url->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kAiMode || ++ template_url->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kPage) { continue; } --- a/components/omnibox/browser/featured_search_provider.cc +++ b/components/omnibox/browser/featured_search_provider.cc -@@ -295,20 +295,10 @@ void FeaturedSearchProvider::AddFeatured - for (TemplateURL* turl : turls) { - if (turl->starter_pack_id() > 0 && +@@ -300,23 +300,10 @@ void FeaturedSearchProvider::AddFeatured + if (turl->starter_pack_id() != + template_url_starter_pack_data::StarterPackId::kNone && turl->is_active() == TemplateURLData::ActiveStatus::kTrue) { - // Skip @gemini if feature disabled. -- if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini && +- if (turl->starter_pack_id() == +- template_url_starter_pack_data::StarterPackId::kGemini && - !OmniboxFieldTrial::IsStarterPackExpansionEnabled()) { - continue; - } - // Skip @page if feature disabled. -- if (turl->starter_pack_id() == template_url_starter_pack_data::kPage && +- if (turl->starter_pack_id() == +- template_url_starter_pack_data::StarterPackId::kPage && - !omnibox_feature_configs::ContextualSearch::Get().starter_pack_page) { - continue; - } - // Skip @aimode if feature disabled. -- if (turl->starter_pack_id() == template_url_starter_pack_data::kAiMode && +- if (turl->starter_pack_id() == +- template_url_starter_pack_data::StarterPackId::kAiMode && - !OmniboxFieldTrial::IsAimStarterPackEnabled( - client_->GetAimEligibilityService())) { + // Disable all Google AI starter pack options -+ if (turl->starter_pack_id() == template_url_starter_pack_data::kGemini || -+ turl->starter_pack_id() == template_url_starter_pack_data::kAiMode || -+ turl->starter_pack_id() == template_url_starter_pack_data::kPage) { ++ if (turl->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kGemini || ++ turl->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kAiMode || ++ turl->starter_pack_id() == template_url_starter_pack_data::StarterPackId::kPage) { continue; } // The history starter pack engine is disabled in incognito mode. diff --git a/patches/extra/ungoogled-chromium/disable-chromelabs.patch b/patches/extra/ungoogled-chromium/disable-chromelabs.patch index 9e3c229d..d34afd1e 100644 --- a/patches/extra/ungoogled-chromium/disable-chromelabs.patch +++ b/patches/extra/ungoogled-chromium/disable-chromelabs.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc +++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc -@@ -140,35 +140,6 @@ bool AreNewChromeLabsExperimentsAvailabl +@@ -139,35 +139,6 @@ bool AreNewChromeLabsExperimentsAvailabl } bool IsChromeLabsEnabled() { @@ -21,7 +21,7 @@ - chrome_labs_prefs::kChromeLabsActivationThresholdDefaultValue) { - g_browser_process->local_state()->SetInteger( - chrome_labs_prefs::kChromeLabsActivationThreshold, -- base::RandInt(1, 100)); +- base::RandIntInclusive(1, 100)); - } - - // The percentage of users that should see the feature. diff --git a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch index bf0d6cc7..5e6b76e3 100644 --- a/patches/extra/ungoogled-chromium/disable-download-quarantine.patch +++ b/patches/extra/ungoogled-chromium/disable-download-quarantine.patch @@ -142,9 +142,9 @@ } // namespace download --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -137,7 +137,6 @@ source_set("browser") { - "//components/persistent_cache", +@@ -138,7 +138,6 @@ source_set("browser") { "//components/power_monitor", + "//components/schema_org/common:mojom", "//components/services/filesystem:lib", - "//components/services/quarantine", "//components/services/storage", diff --git a/patches/extra/ungoogled-chromium/disable-fedcm-by-default.patch b/patches/extra/ungoogled-chromium/disable-fedcm-by-default.patch index 095ff3cc..98a6bb8b 100644 --- a/patches/extra/ungoogled-chromium/disable-fedcm-by-default.patch +++ b/patches/extra/ungoogled-chromium/disable-fedcm-by-default.patch @@ -2,7 +2,7 @@ --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -388,7 +388,7 @@ BASE_FEATURE(kEnsureExistingRendererAliv +@@ -385,7 +385,7 @@ BASE_FEATURE(kEnsureExistingRendererAliv // by the flag in RuntimeEnabledFeatures on the blink side. See also // the use of kSetOnlyIfOverridden in content/child/runtime_features.cc. // We enable it here by default to support use in origin trials. diff --git a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch index 7463c312..45ce0a06 100644 --- a/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch +++ b/patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch @@ -13,7 +13,7 @@ --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc -@@ -276,5 +276,5 @@ TemplateURLService* ChromeLocationBarMod +@@ -303,5 +303,5 @@ TemplateURLService* ChromeLocationBarMod // static void ChromeLocationBarModelDelegate::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { diff --git a/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch b/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch index 15b78669..a8d24d99 100644 --- a/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch +++ b/patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch @@ -2,12 +2,12 @@ --- a/chrome/browser/ui/views/toolbar/reload_button.cc +++ b/chrome/browser/ui/views/toolbar/reload_button.cc -@@ -141,7 +141,7 @@ bool ReloadButton::GetMenuEnabled() cons +@@ -141,7 +141,7 @@ bool ReloadButton::GetDevToolsStatusForT } - void ReloadButton::SetMenuEnabled(bool is_menu_enabled) { -- is_menu_enabled_ = is_menu_enabled; -+ is_menu_enabled_ = true; + void ReloadButton::SetDevToolsStatus(bool is_dev_tools_connected) { +- is_dev_tools_connected_ = is_dev_tools_connected; ++ is_dev_tools_connected_ = true; UpdateAccessibleHasPopup(); UpdateCachedTooltipText(); } diff --git a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch index 15524611..2f8c3e57 100644 --- a/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch +++ b/patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch @@ -2,7 +2,7 @@ --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -716,11 +716,6 @@ int GetContentRestrictions(const Browser +@@ -674,11 +674,6 @@ int GetContentRestrictions(const Browser CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(current_tab); content_restrictions = core_tab_helper->content_restrictions(); @@ -14,7 +14,7 @@ } return content_restrictions; } -@@ -2082,8 +2077,7 @@ bool CanSavePage(const Browser* browser) +@@ -2060,8 +2055,7 @@ bool CanSavePage(const Browser* browser) policy::DownloadRestriction::ALL_FILES) { return false; } diff --git a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch index c4383a3e..cb502d28 100644 --- a/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch +++ b/patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.cc -@@ -293,6 +293,9 @@ HorizontalTabStripRegionView::Horizontal +@@ -288,6 +288,9 @@ HorizontalTabStripRegionView::Horizontal l10n_util::GetStringUTF16(IDS_TOOLTIP_NEW_TAB)); new_tab_button_->GetViewAccessibility().SetName( l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB)); @@ -20,7 +20,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/resource_coordinator/tab_lifecycle_unit_external.h" -@@ -62,6 +63,8 @@ +@@ -66,6 +67,8 @@ #include "chrome/grit/generated_resources.h" #include "components/feature_engagement/public/feature_constants.h" #include "components/feature_engagement/public/tracker.h" @@ -29,7 +29,7 @@ #include "components/performance_manager/public/user_tuning/prefs.h" #include "components/prefs/pref_service.h" #include "components/saved_tab_groups/public/features.h" -@@ -530,6 +533,18 @@ void BrowserTabStripController::CreateNe +@@ -547,6 +550,18 @@ void BrowserTabStripController::CreateNe chrome::NewTab(browser_view_->browser(), context); } @@ -50,26 +50,26 @@ // The top-of-window views should be revealed while the user is dragging --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h -@@ -91,6 +91,7 @@ class BrowserTabStripController : public +@@ -90,6 +90,7 @@ class BrowserTabStripController : public int HasAvailableDragActions() const override; void OnDropIndexUpdate(std::optional index, bool drop_before) override; void CreateNewTab(NewTabTypes context) override; + void CreateNewTabWithLocation(const std::u16string& loc) override; void OnStartedDragging() override; void OnStoppedDragging() override; - void OnKeyboardFocusedTabChanged(std::optional index) override; + void TabKeyboardFocusChangedTo(const tabs::TabInterface* tab) override; --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -86,6 +86,8 @@ +@@ -87,6 +87,8 @@ + #include "components/tab_groups/tab_group_id.h" #include "components/tab_groups/tab_group_visual_data.h" - #include "components/tabs/public/split_tab_id.h" #include "content/public/browser/web_contents.h" +#include "ui/base/clipboard/clipboard.h" +#include "ui/base/clipboard/clipboard_constants.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/mojom/drag_drop_types.mojom.h" #include "ui/base/interaction/element_identifier.h" -@@ -2222,6 +2224,20 @@ void TabStrip::NewTabButtonPressed(const +@@ -2212,6 +2214,20 @@ void TabStrip::NewTabButtonPressed(const if (hover_card_controller_) { hover_card_controller_->PreventImmediateReshow(); } @@ -92,7 +92,7 @@ } --- a/chrome/browser/ui/views/tabs/tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/tab_strip_controller.h -@@ -156,6 +156,11 @@ class TabStripController { +@@ -151,6 +151,11 @@ class TabStripController { // Creates the new tab. virtual void CreateNewTab(NewTabTypes context) = 0; diff --git a/patches/extra/ungoogled-chromium/first-run-page.patch b/patches/extra/ungoogled-chromium/first-run-page.patch index d7a47f6a..b1648ec1 100644 --- a/patches/extra/ungoogled-chromium/first-run-page.patch +++ b/patches/extra/ungoogled-chromium/first-run-page.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1233,6 +1233,7 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1234,6 +1234,7 @@ int ChromeBrowserMainParts::PreCreateThr if (first_run::IsChromeFirstRun()) { if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) && !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) { @@ -10,21 +10,21 @@ } --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -48,6 +48,7 @@ +@@ -49,6 +49,7 @@ #include "chrome/browser/ui/webui/signin_internals_ui.h" #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h" #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h" +#include "chrome/browser/ui/webui/ungoogled_first_run.h" #include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h" - #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h" #include "chrome/browser/ui/webui/version/version_ui.h" -@@ -275,6 +276,7 @@ void RegisterChromeWebUIConfigs() { + #include "components/enterprise/buildflags/buildflags.h" +@@ -285,6 +286,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); + map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); - map.AddWebUIConfig(std::make_unique()); + map.AddWebUIConfig(std::make_unique()); map.AddWebUIConfig(std::make_unique()); --- /dev/null +++ b/chrome/browser/ui/webui/ungoogled_first_run.h diff --git a/patches/extra/ungoogled-chromium/keep-expired-flags.patch b/patches/extra/ungoogled-chromium/keep-expired-flags.patch index 02afff00..d7abb15c 100644 --- a/patches/extra/ungoogled-chromium/keep-expired-flags.patch +++ b/patches/extra/ungoogled-chromium/keep-expired-flags.patch @@ -1,6 +1,6 @@ --- a/components/webui/flags/flags_state.cc +++ b/components/webui/flags/flags_state.cc -@@ -27,6 +27,7 @@ +@@ -26,6 +26,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" @@ -8,7 +8,7 @@ #include "components/variations/field_trial_config/field_trial_util.h" #include "components/variations/variations_associated_data.h" #include "components/variations/variations_switches.h" -@@ -682,14 +683,19 @@ void FlagsState::GetFlagFeatureEntries( +@@ -680,14 +681,19 @@ void FlagsState::GetFlagFeatureEntries( int current_platform = GetCurrentPlatform(); for (const FeatureEntry& entry : feature_entries_) { @@ -21,15 +21,15 @@ + } } - base::Value::Dict data; + base::DictValue data; data.Set("internal_name", entry.internal_name); data.Set("name", entry.visible_name); - data.Set("description", entry.visible_description); + data.Set("description", desc); - base::Value::List supported_platforms; + base::ListValue supported_platforms; AddOsStrings(entry.supported_platforms, &supported_platforms); -@@ -1113,7 +1119,9 @@ bool FlagsState::IsSupportedFeature(cons +@@ -1111,7 +1117,9 @@ bool FlagsState::IsSupportedFeature(cons continue; } if (delegate_ && delegate_->ShouldExcludeFlag(storage, entry)) { diff --git a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch index 49c42bff..8fc7e2f4 100644 --- a/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch +++ b/patches/extra/ungoogled-chromium/prepopulated-search-engines.patch @@ -2,7 +2,7 @@ # --- a/components/omnibox/common/omnibox_features.cc +++ b/components/omnibox/common/omnibox_features.cc -@@ -247,7 +247,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor +@@ -249,7 +249,7 @@ BASE_FEATURE(kOmniboxTouchDownTriggerFor BASE_FEATURE(kOmniboxSiteSearch, DISABLED); // Enables additional site search providers for the Site search Starter Pack. diff --git a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch index 0d516fcf..5819d4a2 100644 --- a/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch +++ b/patches/extra/ungoogled-chromium/remove-uneeded-ui.patch @@ -33,7 +33,7 @@ --- a/chrome/app/settings_chromium_strings.grdp +++ b/chrome/app/settings_chromium_strings.grdp -@@ -365,13 +365,13 @@ Chromium understands forms better and ca +@@ -355,13 +355,13 @@ @@ -52,7 +52,7 @@ --- a/chrome/app/settings_strings.grdp +++ b/chrome/app/settings_strings.grdp -@@ -1135,7 +1135,7 @@ +@@ -1101,7 +1101,7 @@ Active site @@ -61,7 +61,7 @@ Power -@@ -1159,7 +1159,7 @@ +@@ -1125,7 +1125,7 @@ Inactive tabs appearance @@ -70,7 +70,7 @@ Tab hover preview card appearance -@@ -1171,7 +1171,7 @@ +@@ -1137,7 +1137,7 @@ Performance issue alerts @@ -259,7 +259,7 @@