aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <rnagy@FreeBSD.org>2024-02-24 06:11:52 +0000
committerRobert Nagy <rnagy@FreeBSD.org>2024-02-24 20:23:13 +0000
commita71d4d63985a0b63188f9695455b77bb3c0a8ab2 (patch)
treea0921dec9e51a627859620db90ad267b9c16472a
parent1096137631105d04729c323489656de56a3fa52d (diff)
downloadports-a71d4d63985a0b63188f9695455b77bb3c0a8ab2.tar.gz
ports-a71d4d63985a0b63188f9695455b77bb3c0a8ab2.zip
www/chromium: udpate to 122.0.6261.69
-rw-r--r--www/chromium/Makefile2
-rw-r--r--www/chromium/distinfo14
-rw-r--r--www/chromium/files/patch-BUILD.gn20
-rw-r--r--www/chromium/files/patch-base_BUILD.gn41
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni14
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h22
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc8
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_compiler__specific.h32
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc16
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h11
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h6
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h8
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h6
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc16
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc12
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc11
-rw-r--r--www/chromium/files/patch-base_base__switches.cc4
-rw-r--r--www/chromium/files/patch-base_base__switches.h4
-rw-r--r--www/chromium/files/patch-base_compiler__specific.h42
-rw-r--r--www/chromium/files/patch-base_files_file__path__watcher__unittest.cc8
-rw-r--r--www/chromium/files/patch-base_files_file__util__posix.cc4
-rw-r--r--www/chromium/files/patch-base_files_file__util__unittest.cc6
-rw-r--r--www/chromium/files/patch-base_functional_unretained__traits.h18
-rw-r--r--www/chromium/files/patch-base_process_kill.h4
-rw-r--r--www/chromium/files/patch-base_process_launch__posix.cc4
-rw-r--r--www/chromium/files/patch-base_process_process__metrics__openbsd.cc18
-rw-r--r--www/chromium/files/patch-base_process_process__metrics__unittest.cc14
-rw-r--r--www/chromium/files/patch-base_rand__util.h4
-rw-r--r--www/chromium/files/patch-base_rand__util__posix.cc24
-rw-r--r--www/chromium/files/patch-base_synchronization_lock__impl.h6
-rw-r--r--www/chromium/files/patch-base_system_sys__info__openbsd.cc23
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__posix.cc10
-rw-r--r--www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc6
-rw-r--r--www/chromium/files/patch-base_trace__event_trace__log.cc16
-rw-r--r--www/chromium/files/patch-build_config_compiler_BUILD.gn50
-rw-r--r--www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn19
-rw-r--r--www/chromium/files/patch-build_toolchain_gcc__toolchain.gni4
-rw-r--r--www/chromium/files/patch-cc_BUILD.gn6
-rw-r--r--www/chromium/files/patch-cc_paint_paint__op__writer.h41
-rw-r--r--www/chromium/files/patch-chrome_app_app__management__strings.grdp11
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main__delegate.cc20
-rw-r--r--www/chromium/files/patch-chrome_app_chromium__strings.grd38
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd92
-rw-r--r--www/chromium/files/patch-chrome_app_google__chrome__strings.grd38
-rw-r--r--www/chromium/files/patch-chrome_app_profiles__strings.grdp11
-rw-r--r--www/chromium/files/patch-chrome_app_settings__strings.grdp35
-rw-r--r--www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd20
-rw-r--r--www/chromium/files/patch-chrome_app_theme_theme__resources.grd46
-rw-r--r--www/chromium/files/patch-chrome_browser_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc90
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__features.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc38
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_compose_chrome__compose__client.cc19
-rw-r--r--www/chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc30
-rw-r--r--www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc32
-rw-r--r--www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__file__picker.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__item__model.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.cc58
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h56
-rw-r--r--www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc50
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc36
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h12
-rw-r--r--www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc13
-rw-r--r--www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_permissions_chrome__permissions__client.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_platform__util__linux.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc54
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc24
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc36
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts29
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts20
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html29
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts65
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_route.ts11
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html20
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc29
-rw-r--r--www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__client__side__trial.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__service__factory.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc21
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tabs_organization_trigger__observer.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_ui__features.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_ui__features.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h31
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc26
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h28
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc22
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc17
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc15
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h13
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc44
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc20
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.h16
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.cc14
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.h8
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.h4
-rw-r--r--www/chromium/files/patch-chrome_common_crash__keys.cc23
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h18
-rw-r--r--www/chromium/files/patch-chrome_common_url__constants.h4
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.cc14
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.h9
-rw-r--r--www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc12
-rw-r--r--www/chromium/files/patch-chrome_test_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc26
-rw-r--r--www/chromium/files/patch-chrome_updater_configurator.cc6
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc4
-rw-r--r--www/chromium/files/patch-components_autofill__payments__strings.grdp11
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc4
-rw-r--r--www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc4
-rw-r--r--www/chromium/files/patch-components_autofill_core_common_autofill__util.cc4
-rw-r--r--www/chromium/files/patch-components_commerce__strings.grdp11
-rw-r--r--www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc6
-rw-r--r--www/chromium/files/patch-components_components__chromium__strings.grd11
-rw-r--r--www/chromium/files/patch-components_components__google__chrome__strings.grd11
-rw-r--r--www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc4
-rw-r--r--www/chromium/files/patch-components_cookie__config_cookie__store__util.cc4
-rw-r--r--www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc4
-rw-r--r--www/chromium/files/patch-components_eye__dropper_eye__dropper__view__aura.cc11
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc4
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc6
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.h6
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.cc10
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.h18
-rw-r--r--www/chromium/files/patch-components_management__strings.grdp11
-rw-r--r--www/chromium/files/patch-components_media__router_common_media__source.cc11
-rw-r--r--www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc4
-rw-r--r--www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc4
-rw-r--r--www/chromium/files/patch-components_new__or__sad__tab__strings.grdp20
-rw-r--r--www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h62
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc15
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h11
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc29
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc11
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc11
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h11
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc4
-rw-r--r--www/chromium/files/patch-components_qr__code__generator_BUILD.gn4
-rw-r--r--www/chromium/files/patch-components_qr__code__generator_features.cc16
-rw-r--r--www/chromium/files/patch-components_qr__code__generator_qr__code__generator.cc14
-rw-r--r--www/chromium/files/patch-components_safe__browsing_core_common_features.cc11
-rw-r--r--www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc11
-rw-r--r--www/chromium/files/patch-components_search__engines_template__url__service.cc4
-rw-r--r--www/chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc20
-rw-r--r--www/chromium/files/patch-components_signin_public_base_signin__switches.cc11
-rw-r--r--www/chromium/files/patch-components_signin_public_base_signin__switches.h11
-rw-r--r--www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc4
-rw-r--r--www/chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.cc39
-rw-r--r--www/chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.h21
-rw-r--r--www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc4
-rw-r--r--www/chromium/files/patch-components_supervised__user_core_common_features.cc40
-rw-r--r--www/chromium/files/patch-components_sync_base_features.cc4
-rw-r--r--www/chromium/files/patch-components_system__cpu_cpu__probe.cc (renamed from www/chromium/files/patch-chrome_browser_performance__manager_metrics_cpu__probe_cpu__probe.cc)4
-rw-r--r--www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc4
-rw-r--r--www/chromium/files/patch-components_variations_service_variations__service.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc15
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_display_skia__renderer.cc4
-rw-r--r--www/chromium/files/patch-content_app_content__main.cc4
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner__impl.cc10
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_browser_audio_audio__service.cc6
-rw-r--r--www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc6
-rw-r--r--www/chromium/files/patch-content_browser_browser__child__process__host__impl.h6
-rw-r--r--www/chromium/files/patch-content_browser_browser__main__loop.cc8
-rw-r--r--www/chromium/files/patch-content_browser_child__process__launcher__helper.h6
-rw-r--r--www/chromium/files/patch-content_browser_download_save__package.cc16
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc8
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc8
-rw-r--r--www/chromium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc14
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc25
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc12
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h4
-rw-r--r--www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc15
-rw-r--r--www/chromium/files/patch-content_browser_utility__process__host.cc37
-rw-r--r--www/chromium/files/patch-content_browser_utility__process__host.h10
-rw-r--r--www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc10
-rw-r--r--www/chromium/files/patch-content_child_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_common_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_common_features.cc8
-rw-r--r--www/chromium/files/patch-content_common_features.h8
-rw-r--r--www/chromium/files/patch-content_common_mojo__core__library__support.cc4
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc8
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h4
-rw-r--r--www/chromium/files/patch-content_public_browser_content__browser__client.cc4
-rw-r--r--www/chromium/files/patch-content_public_browser_web__ui__browser__interface__broker__registry.h16
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.cc15
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.cc6
-rw-r--r--www/chromium/files/patch-content_renderer_render__thread__impl.cc10
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc10
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h4
-rw-r--r--www/chromium/files/patch-content_test_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_utility_services.cc32
-rw-r--r--www/chromium/files/patch-content_utility_utility__main.cc22
-rw-r--r--www/chromium/files/patch-content_utility_utility__thread__impl.cc4
-rw-r--r--www/chromium/files/patch-content_zygote_zygote__linux.cc4
-rw-r--r--www/chromium/files/patch-extensions_browser_api_management_management__api.cc4
-rw-r--r--www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc4
-rw-r--r--www/chromium/files/patch-extensions_common_command.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc10
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_ozone__image__gl__textures__holder.h10
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc6
-rw-r--r--www/chromium/files/patch-gpu_config_gpu__info__collector.cc4
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__init.cc18
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_x__util.h17
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc4
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h4
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc8
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__util.cc4
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc4
-rw-r--r--www/chromium/files/patch-ipc_ipc__message__utils.cc4
-rw-r--r--www/chromium/files/patch-media_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_audio_BUILD.gn6
-rw-r--r--www/chromium/files/patch-media_base_cdm__promise__adapter.cc16
-rw-r--r--www/chromium/files/patch-media_base_libvpx__thread__wrapper.cc24
-rw-r--r--www/chromium/files/patch-media_base_media__switches.cc40
-rw-r--r--www/chromium/files/patch-media_base_media__switches.h17
-rw-r--r--www/chromium/files/patch-media_base_scopedfd__helper.h11
-rw-r--r--www/chromium/files/patch-media_base_video__frame.cc10
-rw-r--r--www/chromium/files/patch-media_base_video__frame.h6
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc4
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc26
-rw-r--r--www/chromium/files/patch-media_gpu_buffer__validation.cc33
-rw-r--r--www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc23
-rw-r--r--www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc6
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc4
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc13
-rw-r--r--www/chromium/files/patch-media_media__options.gni6
-rw-r--r--www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc4
-rw-r--r--www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc8
-rw-r--r--www/chromium/files/patch-mojo_public_c_system_thunks.cc8
-rw-r--r--www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni4
-rw-r--r--www/chromium/files/patch-net_BUILD.gn14
-rw-r--r--www/chromium/files/patch-net_base_features.cc4
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier.cc4
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc.h4
-rw-r--r--www/chromium/files/patch-net_dns_BUILD.gn8
-rw-r--r--www/chromium/files/patch-net_dns_address__info.cc4
-rw-r--r--www/chromium/files/patch-net_dns_public_scoped__res__state.h4
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc8
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__posix.cc8
-rw-r--r--www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc8
-rw-r--r--www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc8
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context.cc4
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context.h4
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context__builder.cc4
-rw-r--r--www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_chromoting__host.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_client__session.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_remoting__me2me__host.cc14
-rw-r--r--www/chromium/files/patch-remoting_host_setup_start__host__main.cc6
-rw-r--r--www/chromium/files/patch-remoting_resources_remoting__strings.grd20
-rw-r--r--www/chromium/files/patch-sandbox_policy_BUILD.gn8
-rw-r--r--www/chromium/files/patch-sandbox_policy_sandbox.cc4
-rw-r--r--www/chromium/files/patch-services_network_network__context.cc6
-rw-r--r--www/chromium/files/patch-services_network_network__context.h4
-rw-r--r--www/chromium/files/patch-services_network_network__service.cc8
-rw-r--r--www/chromium/files/patch-services_network_network__service.h8
-rw-r--r--www/chromium/files/patch-services_network_public_cpp_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_network_public_mojom_BUILD.gn6
-rw-r--r--www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc30
-rw-r--r--www/chromium/files/patch-services_video__capture_video__capture__service__impl.h26
-rw-r--r--www/chromium/files/patch-skia_ext_font__utils.cc20
-rw-r--r--www/chromium/files/patch-third__party_angle_BUILD.gn8
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp4
-rw-r--r--www/chromium/files/patch-third__party_blink_public_platform_platform.h4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc8
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_html_parser_html__document__parser__fastpath.cc14
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc33
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc16
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__palette.h26
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_palette__interpolation.cc15
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json510
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc4
-rw-r--r--www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py6
-rw-r--r--www/chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp4
-rw-r--r--www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc4
-rw-r--r--www/chromium/files/patch-third__party_libc++_src_src_chrono.cpp10
-rw-r--r--www/chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp10
-rw-r--r--www/chromium/files/patch-third__party_pdfium_pdfium.gni4
-rw-r--r--www/chromium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h11
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_column_numeric__storage.cc (renamed from www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc)10
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc4
-rw-r--r--www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c6
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h4
-rw-r--r--www/chromium/files/patch-third__party_zlib_BUILD.gn8
-rw-r--r--www/chromium/files/patch-tools_grit_grit_node_base.py12
-rw-r--r--www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py4
-rw-r--r--www/chromium/files/patch-tools_memory_partition__allocator_inspect__utils.h4
-rw-r--r--www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_base_clipboard_clipboard__non__backed.cc4
-rw-r--r--www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc29
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.cc4
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__types.h11
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__display__util.cc364
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__util.cc23
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__util.h13
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.cc10
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.h21
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor__observer.h19
-rw-r--r--www/chromium/files/patch-ui_events_event.cc10
-rw-r--r--www/chromium/files/patch-ui_events_gesture__detection_motion__event__generic.h10
-rw-r--r--www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc8
-rw-r--r--www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h4
-rw-r--r--www/chromium/files/patch-ui_gfx_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_gfx_canvas__skia.cc4
-rw-r--r--www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc4
-rw-r--r--www/chromium/files/patch-ui_gfx_native__widget__types.h6
-rw-r--r--www/chromium/files/patch-ui_gfx_x_xlib__support.cc12
-rw-r--r--www/chromium/files/patch-ui_gl_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__context.cc4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__switches.cc21
-rw-r--r--www/chromium/files/patch-ui_gtk_gtk__ui.cc22
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc8
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h8
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc14
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h12
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc12
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc8
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc11
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc11
-rw-r--r--www/chromium/files/patch-ui_ozone_public_ozone__platform.h11
-rw-r--r--www/chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h8
-rw-r--r--www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc8
-rw-r--r--www/chromium/files/patch-ui_platform__window_platform__window__delegate.h8
-rw-r--r--www/chromium/files/patch-ui_strings_app__locale__settings.grd11
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.cc10
-rw-r--r--www/chromium/files/patch-ui_views_views__delegate.cc4
-rw-r--r--www/chromium/files/patch-ui_views_views__delegate.h4
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc4
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h6
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc10
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc4
-rw-r--r--www/chromium/files/patch-ui_views_widget_root__view.cc11
-rw-r--r--www/chromium/files/patch-ui_views_widget_widget.cc4
-rw-r--r--www/chromium/files/patch-ui_views_widget_widget.h4
-rw-r--r--www/chromium/files/patch-v8_BUILD.gn10
-rw-r--r--www/chromium/files/patch-v8_include_v8-internal.h6
-rw-r--r--www/chromium/files/patch-v8_include_v8config.h8
-rw-r--r--www/chromium/files/patch-v8_src_api_api.cc4
-rw-r--r--www/chromium/files/patch-v8_src_execution_isolate.cc4
-rw-r--r--www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h32
451 files changed, 2783 insertions, 2874 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index e5f6cc1cd8b7..fc38e8f59427 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 121.0.6167.184
+PORTVERSION= 122.0.6261.69
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index a20ff6a2b5f9..655328357dda 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1707897003
-SHA256 (chromium-121.0.6167.184.tar.xz) = 9fd6b82e7077ac26ec264bfcfc8ac8e0c2a0240378f035c9c0f34ad467aef09d
-SIZE (chromium-121.0.6167.184.tar.xz) = 3351296496
-SHA256 (chrome-linux-121.0.6167.184-llvm17.profdata.tar.xz) = 5c2d5524a892e6b0d2e86c676cef3c4eae5cdb476068b0fe13d9f662b6dc0d3f
-SIZE (chrome-linux-121.0.6167.184-llvm17.profdata.tar.xz) = 29927052
-SHA256 (chromium-121.0.6167.184-testdata.tar.xz) = 5d7a2db98f2dc8b3f405276e2c47c0caf60b469a8f31aac804ccd4779356fa61
-SIZE (chromium-121.0.6167.184-testdata.tar.xz) = 271163348
+TIMESTAMP = 1708722414
+SHA256 (chromium-122.0.6261.69.tar.xz) = f5bf4085ad3173883b45ea72b483d07f50ec3aa0f7546ac3837a9d26d0b4f9c0
+SIZE (chromium-122.0.6261.69.tar.xz) = 3416746640
+SHA256 (chrome-linux-122.0.6261.69-llvm17.profdata.tar.xz) = c5c3945baedbedf82b5d19e0d0aa1a561e0139da4b8499b4dc651c82e1c658c1
+SIZE (chrome-linux-122.0.6261.69-llvm17.profdata.tar.xz) = 29723280
+SHA256 (chromium-122.0.6261.69-testdata.tar.xz) = 2e66734827c136567a1d8f7bc5df2fa8f5558c78815509b60e1546089ae22b01
+SIZE (chromium-122.0.6261.69-testdata.tar.xz) = 282170324
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 9297be79c1bc..26c8e3e07811 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ BUILD.gn
-@@ -62,7 +62,7 @@ declare_args() {
+@@ -63,7 +63,7 @@ declare_args() {
root_extra_deps = []
}
@@ -9,7 +9,7 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
-@@ -94,7 +94,6 @@ group("gn_all") {
+@@ -95,7 +95,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
@@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
-@@ -417,7 +416,7 @@ group("gn_all") {
+@@ -425,7 +424,7 @@ group("gn_all") {
}
}
@@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -617,6 +616,15 @@ group("gn_all") {
+@@ -625,6 +624,15 @@ group("gn_all") {
}
}
@@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
-@@ -663,7 +671,7 @@ group("gn_all") {
+@@ -671,7 +679,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1084,7 +1092,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1092,7 +1100,7 @@ if (use_blink && !is_cronet_build) {
]
}
@@ -60,7 +60,7 @@
script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
-@@ -1174,7 +1182,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1183,7 +1191,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1183,7 +1191,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1192,7 +1200,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1624,7 +1632,7 @@ group("chromium_builder_perf") {
+@@ -1642,7 +1650,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index d4d6a4076bb8..1ea08cf2eb2c 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- base/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ base/BUILD.gn
-@@ -186,7 +186,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -187,7 +187,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
-@@ -1098,11 +1098,23 @@ component("base") {
+@@ -1118,11 +1118,23 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
@@ -34,7 +34,7 @@
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1122,7 +1134,7 @@ component("base") {
+@@ -1142,7 +1154,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2077,6 +2089,22 @@ component("base") {
+@@ -2088,6 +2100,22 @@ component("base") {
]
}
@@ -66,7 +66,7 @@
# iOS
if (is_ios) {
sources += [
-@@ -2207,6 +2235,29 @@ component("base") {
+@@ -2218,6 +2246,31 @@ component("base") {
}
}
@@ -84,6 +84,8 @@
+ "profiler/thread_delegate_posix.cc",
+ "profiler/thread_delegate_posix.h",
+ "threading/platform_thread_linux.cc",
++ "stack_canary_linux.cc",
++ "stack_canary_linux.h",
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
@@ -96,7 +98,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
-@@ -2217,7 +2268,7 @@ component("base") {
+@@ -2228,7 +2281,7 @@ component("base") {
}
if (dep_libevent) {
@@ -105,7 +107,16 @@
}
if (use_libevent) {
-@@ -3615,7 +3666,7 @@ test("base_unittests") {
+@@ -2993,7 +3046,7 @@ if (is_apple) {
+ }
+ }
+
+-if (!is_nacl && (is_linux || is_chromeos)) {
++if (!is_nacl && !is_bsd && (is_linux || is_chromeos)) {
+ # This test must compile with -fstack-protector-all
+ source_set("stack_canary_linux_unittests") {
+ testonly = true
+@@ -3629,14 +3682,14 @@ test("base_unittests") {
]
}
@@ -114,7 +125,15 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3637,7 +3688,7 @@ test("base_unittests") {
+ "nix/mime_util_xdg_unittest.cc",
+ ]
+
+- if (!is_nacl) {
++ if (!is_nacl && !is_bsd) {
+ deps += [ ":stack_canary_linux_unittests" ]
+ }
+ }
+@@ -3651,7 +3704,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -123,7 +142,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3648,7 +3699,7 @@ test("base_unittests") {
+@@ -3662,7 +3715,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -132,7 +151,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3909,7 +3960,7 @@ test("base_unittests") {
+@@ -3925,7 +3978,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index 02e6d3272fee..7ace56892161 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-01-30 07:53:34 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -333,7 +333,7 @@ declare_args() {
- # pkeys support is explicitly disabled in all Cronet builds, as some test
+@@ -335,7 +335,7 @@ declare_args() {
# dependencies that use partition_allocator are compiled in AOSP against a
# version of glibc that does not include pkeys syscall numbers.
-- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
-+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
+ enable_pkeys =
+- (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build
++ !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build
}
- assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
- "Pkeys are only supported on x64 linux")
+ assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"),
+ "Pkeys are only supported on x64 linux and ChromeOS")
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
index bb931a2fb1d3..19500f839d60 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -855,7 +855,7 @@ if (is_clang_or_gcc) {
+@@ -852,7 +852,7 @@ if (is_clang_or_gcc) {
configs -= [ "//build/config/compiler:enable_arc" ]
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
index 4b346bf37208..a2a366e6c264 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
@@ -9,7 +9,7 @@
// We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges
-@@ -124,7 +124,7 @@ AslrMask(uintptr_t bits) {
+@@ -126,7 +126,7 @@ AslrMask(uintptr_t bits) {
return AslrAddress(0x20000000ULL);
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
index 9111045d8c2a..5ead2f4b8adb 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h
-@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address,
+@@ -256,7 +256,7 @@ bool DecommitAndZeroSystemPages(void* address,
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
index ddd3c1b7a34b..2296c9fc1e02 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
@@ -25,7 +25,7 @@
// elimination.
#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+-#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
// This should work for all POSIX (if needed), but currently all other
// supported OS/architecture combinations use either hard-coded values
// (such as x86) or have means to determine these values without needing
@@ -13,8 +13,8 @@
return 14; // 16kB
#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
return static_cast<size_t>(vm_page_shift);
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+-#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
// arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
// page sizes. Retrieve from or initialize cache.
size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
@@ -22,17 +22,17 @@
// This is literally equivalent to |1 << PageAllocationGranularityShift()|
// below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
return vm_page_size;
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+-#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
// arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
// initialize cache.
size_t size = page_characteristics.size.load(std::memory_order_relaxed);
-@@ -152,7 +152,7 @@ SystemPageShift() {
- PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
+@@ -153,7 +153,7 @@ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONS
SystemPageSize() {
#if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
+ (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_ARM64)) || \
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
// This is literally equivalent to |1 << SystemPageShift()| below, but was
- // separated out for 64-bit IS_APPLE and arm64 on Linux to avoid << on a
- // non-constexpr.
+ // separated out for 64-bit IS_APPLE and arm64 on Android/Linux to avoid <<
+ // on a non-constexpr.
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
index b8293b574e93..3f74e4127498 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h
-@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc
index 8839689ed93f..a5846514a528 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc
-@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
+@@ -421,7 +421,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
}
#endif
--#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+-#if (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
++#if (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
PageCharacteristics page_characteristics;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_compiler__specific.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_compiler__specific.h
deleted file mode 100644
index 11f8157622fd..000000000000
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_compiler__specific.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h.orig 2023-12-10 06:10:27 UTC
-+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h
-@@ -24,9 +24,9 @@
- // Annotate a function indicating it should not be inlined.
- // Use like:
- // NOINLINE void DoStuff() { ... }
--#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(noinline)
- #define PA_NOINLINE [[clang::noinline]]
--#elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline)
-+#elif (defined(COMPILER_GCC) || defined(__clang__)) && PA_HAS_ATTRIBUTE(noinline)
- #define PA_NOINLINE __attribute__((noinline))
- #elif defined(COMPILER_MSVC)
- #define PA_NOINLINE __declspec(noinline)
-@@ -34,7 +34,7 @@
- #define PA_NOINLINE
- #endif
-
--#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
- #define PA_ALWAYS_INLINE [[clang::always_inline]] inline
- #elif defined(COMPILER_GCC) && defined(NDEBUG) && \
- PA_HAS_ATTRIBUTE(always_inline)
-@@ -53,7 +53,7 @@
- // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
- // Use like:
- // void NOT_TAIL_CALLED FooBar();
--#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called)
-+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(not_tail_called)
- #define PA_NOT_TAIL_CALLED [[clang::not_tail_called]]
- #else
- #define PA_NOT_TAIL_CALLED
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
index a91be545f3f9..d3aa9f9ef802 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc
@@ -1,8 +1,8 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-01-30 07:53:34 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
-@@ -12,11 +12,11 @@
- #include <string.h>
- #include <unistd.h>
+@@ -13,11 +13,11 @@
+ #include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h"
+ #include "partition_alloc/partition_alloc_base/strings/safe_sprintf.h"
-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE)
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
@@ -14,16 +14,16 @@
#include <dlfcn.h>
#endif
-@@ -24,7 +24,7 @@ namespace partition_alloc::internal::base::debug {
+@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug {
namespace {
-#if !BUILDFLAG(IS_APPLE)
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
- constexpr size_t kBufferSize = 4096u;
-
-@@ -358,7 +358,7 @@ void PrintStackTraceInternal(const void** trace, size_
+ // On Android the 'open' function has two versions:
+ // int open(const char *pathname, int flags);
+@@ -369,7 +369,7 @@ void PrintStackTraceInternal(const void** trace, size_
}
#endif // !BUILDFLAG(IS_APPLE)
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
index 0f9f18c3a666..e9d1cc9df848 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc
-@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) {
+@@ -102,6 +102,10 @@ void RandBytes(void* output, size_t output_length) {
if (getentropy(output, output_length) == 0) {
return;
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
new file mode 100644
index 000000000000..4fa07f52d169
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-02-23 21:04:38 UTC
++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h
+@@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId;
+ typedef zx_handle_t PlatformThreadId;
+ #elif BUILDFLAG(IS_APPLE)
+ typedef mach_port_t PlatformThreadId;
++#elif BUILDFLAG(IS_BSD)
++typedef uint64_t PlatformThreadId;
+ #elif BUILDFLAG(IS_POSIX)
+ typedef pid_t PlatformThreadId;
+ #endif
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
index e145135f9121..b311bc492836 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-01-30 07:53:34 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
#include "partition_alloc/partition_alloc_base/logging.h"
#include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
index 4dced6bb32e0..979df47dcdc0 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-01-30 07:53:34 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
-@@ -255,7 +255,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
@@ -9,7 +9,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
-@@ -301,7 +301,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -299,7 +299,7 @@ constexpr bool kUseLazyCommit = false;
//
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
index 5d388a6c20c7..e280ac740ef0 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
@@ -1,15 +1,15 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-01-30 07:53:34 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
-@@ -111,7 +111,7 @@ PartitionPageShift() {
- return 18; // 256 KiB
+@@ -112,7 +112,7 @@ PartitionPageShift() {
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
+ (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_ARM64)) || \
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
-@@ -313,7 +313,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
+@@ -314,7 +314,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h
index 6039cc6249dd..ab01aa758242 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
@@ -16,7 +16,7 @@ namespace partition_alloc::internal {
// (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+-#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
// so we use the 16 kiB maximum (64 kiB will crash).
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
index 5f8b8f572389..96ad9699c0a1 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -47,7 +47,7 @@
#include "wow64apiset.h"
@@ -9,7 +9,7 @@
#include <pthread.h>
#endif
-@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -278,7 +278,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@@ -18,16 +18,16 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
-@@ -379,7 +379,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro
- constexpr size_t kMaxSlotCount =
+@@ -377,7 +377,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
--#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
-+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
+ #elif BUILDFLAG(IS_APPLE) || \
+- ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && \
++ ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \
+ defined(ARCH_CPU_ARM64))
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
- // PartitionPageSize() is always SystemPageSize() << 2, so regardless of
-@@ -948,7 +948,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
+@@ -942,7 +942,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
index 0f223a7fbc08..aacc03277192 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc
@@ -1,9 +1,9 @@
---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-02-23 21:04:38 UTC
+++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc
-@@ -18,7 +18,16 @@
+@@ -17,7 +17,16 @@
+ #endif
#if PA_CONFIG(HAS_LINUX_KERNEL)
- #include <errno.h>
+#if defined(OS_OPENBSD)
+#include <sys/time.h>
+#include <sys/futex.h>
@@ -16,8 +16,8 @@
+#endif
#include <sys/syscall.h>
#include <unistd.h>
- #endif // PA_CONFIG(HAS_LINUX_KERNEL)
-@@ -108,8 +117,16 @@ void SpinningMutex::FutexWait() {
+
+@@ -109,8 +118,16 @@ void SpinningMutex::FutexWait() {
// |kLockedContended| anymore. Note that even without spurious wakeups, the
// value of |state_| is not guaranteed when this returns, as another thread
// may get the lock before we get to run.
@@ -34,7 +34,7 @@
if (err) {
// These are programming error, check them.
-@@ -121,8 +138,16 @@ void SpinningMutex::FutexWait() {
+@@ -122,8 +139,16 @@ void SpinningMutex::FutexWait() {
void SpinningMutex::FutexWake() {
int saved_errno = errno;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
new file mode 100644
index 000000000000..eb1225a8f769
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-02-23 21:04:38 UTC
++++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc
+@@ -16,7 +16,7 @@
+ #include "partition_alloc/partition_alloc_check.h"
+ #include "partition_alloc/thread_isolation/thread_isolation.h"
+
+-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
+ #error "This pkey code is currently only supported on Linux and ChromeOS"
+ #endif
+
diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc
index 214bebc575e3..ceb14284311d 100644
--- a/www/chromium/files/patch-base_base__switches.cc
+++ b/www/chromium/files/patch-base_base__switches.cc
@@ -1,6 +1,6 @@
---- base/base_switches.cc.orig 2023-10-11 18:22:24 UTC
+--- base/base_switches.cc.orig 2024-02-23 21:04:38 UTC
+++ base/base_switches.cc
-@@ -180,7 +180,7 @@ const char kPackageVersionName[] = "package-version-na
+@@ -172,7 +172,7 @@ const char kPackageVersionName[] = "package-version-na
const char kPackageVersionCode[] = "package-version-code";
#endif
diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h
index e6d6e19de940..c26526d104cb 100644
--- a/www/chromium/files/patch-base_base__switches.h
+++ b/www/chromium/files/patch-base_base__switches.h
@@ -1,6 +1,6 @@
---- base/base_switches.h.orig 2023-10-11 18:22:24 UTC
+--- base/base_switches.h.orig 2024-02-23 21:04:38 UTC
+++ base/base_switches.h
-@@ -62,7 +62,7 @@ extern const char kPackageVersionName[];
+@@ -60,7 +60,7 @@ extern const char kPackageVersionName[];
extern const char kPackageVersionCode[];
#endif
diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h
index 01643d0d5afd..32086eb84483 100644
--- a/www/chromium/files/patch-base_compiler__specific.h
+++ b/www/chromium/files/patch-base_compiler__specific.h
@@ -1,35 +1,11 @@
---- base/compiler_specific.h.orig 2024-01-30 07:53:34 UTC
+--- base/compiler_specific.h.orig 2024-02-23 21:04:38 UTC
+++ base/compiler_specific.h
-@@ -41,9 +41,9 @@
- // Annotate a function indicating it should not be inlined.
- // Use like:
- // NOINLINE void DoStuff() { ... }
--#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline)
- #define NOINLINE [[clang::noinline]]
--#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
-+#elif (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(noinline)
- #define NOINLINE __attribute__((noinline))
- #elif defined(COMPILER_MSVC)
- #define NOINLINE __declspec(noinline)
-@@ -60,9 +60,9 @@
- #define NOOPT
- #endif
-
--#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
-+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
- #define ALWAYS_INLINE [[clang::always_inline]] inline
--#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
-+#elif (defined(COMPILER_GCC) || defined(__clang__)) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
- #define ALWAYS_INLINE inline __attribute__((__always_inline__))
- #elif defined(COMPILER_MSVC) && defined(NDEBUG)
- #define ALWAYS_INLINE __forceinline
-@@ -78,7 +78,7 @@
- // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
- // Use like:
- // NOT_TAIL_CALLED void FooBar();
--#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called)
-+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(not_tail_called)
- #define NOT_TAIL_CALLED [[clang::not_tail_called]]
+@@ -316,7 +316,7 @@
+ //
+ // In some cases it's desirable to remove this, e.g. on hot functions, or if
+ // we have purposely changed the reference canary.
+-#if defined(COMPILER_GCC) || defined(__clang__)
++#if (defined(COMPILER_GCC) || defined(__clang__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ #if HAS_ATTRIBUTE(__no_stack_protector__)
+ #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__))
#else
- #define NOT_TAIL_CALLED
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
index 2784f8cee5ce..614e7b82492d 100644
--- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_path_watcher_unittest.cc.orig 2024-01-30 07:53:34 UTC
+--- base/files/file_path_watcher_unittest.cc.orig 2024-02-23 21:04:38 UTC
+++ base/files/file_path_watcher_unittest.cc
-@@ -836,7 +836,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
+@@ -847,7 +847,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
}
delegate.RunUntilEventsMatch(event_expecter);
@@ -9,7 +9,7 @@
ASSERT_TRUE(WriteFile(file1, "content v2"));
// Mac implementation does not detect files modified in a directory.
// TODO(https://crbug.com/1432064): Expect that no events are fired on Mac.
-@@ -1772,7 +1772,7 @@ namespace {
+@@ -1783,7 +1783,7 @@ namespace {
enum Permission { Read, Write, Execute };
@@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
-@@ -1806,7 +1806,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -1817,7 +1817,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
} // namespace
diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
index 483b82a9d4be..5533dcade6de 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_posix.cc.orig 2024-01-30 07:53:34 UTC
+--- base/files/file_util_posix.cc.orig 2024-02-23 21:04:38 UTC
+++ base/files/file_util_posix.cc
-@@ -772,33 +772,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -779,33 +779,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc
index 570787738725..27e3b7cdceeb 100644
--- a/www/chromium/files/patch-base_files_file__util__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__util__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_unittest.cc.orig 2023-12-10 06:10:27 UTC
+--- base/files/file_util_unittest.cc.orig 2024-02-23 21:04:38 UTC
+++ base/files/file_util_unittest.cc
-@@ -3878,7 +3878,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+@@ -3869,7 +3869,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
-@@ -4601,7 +4601,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4592,7 +4592,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
diff --git a/www/chromium/files/patch-base_functional_unretained__traits.h b/www/chromium/files/patch-base_functional_unretained__traits.h
index c5c43c9beda5..31fa0d0bb343 100644
--- a/www/chromium/files/patch-base_functional_unretained__traits.h
+++ b/www/chromium/files/patch-base_functional_unretained__traits.h
@@ -1,11 +1,11 @@
---- base/functional/unretained_traits.h.orig 2023-02-08 09:03:45 UTC
+--- base/functional/unretained_traits.h.orig 2024-02-23 21:04:38 UTC
+++ base/functional/unretained_traits.h
-@@ -130,7 +130,7 @@ struct TypeSupportsUnretained {
+@@ -99,7 +99,7 @@ struct SupportsUnretainedImpl {
// official builds, and then in non-test code as well.
- #if !defined(UNIT_TEST) && !defined(OFFICIAL_BUILD)
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
-- defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS)
-+ || BUILDFLAGS(IS_BSD) || defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS)
- static_assert(IsCompleteTypeV<T> ||
- IsIncompleteTypeSafeForUnretained<std::remove_cv_t<T>>,
- "T must be fully defined.");
+ #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \
+ (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) && \
+- (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)))
++ (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)))
+ static_assert(v,
+ "Argument requires unretained storage, but type is not "
+ "fully defined. This prevents determining whether "
diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h
index 1463ba9ed811..36e7c6deb10a 100644
--- a/www/chromium/files/patch-base_process_kill.h
+++ b/www/chromium/files/patch-base_process_kill.h
@@ -1,6 +1,6 @@
---- base/process/kill.h.orig 2022-05-19 14:06:27 UTC
+--- base/process/kill.h.orig 2024-02-23 21:04:38 UTC
+++ base/process/kill.h
-@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
+@@ -121,7 +121,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
ProcessHandle handle, int* exit_code);
diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc
index 656ff7be03d3..eae1fdd9a2af 100644
--- a/www/chromium/files/patch-base_process_launch__posix.cc
+++ b/www/chromium/files/patch-base_process_launch__posix.cc
@@ -1,6 +1,6 @@
---- base/process/launch_posix.cc.orig 2022-08-31 12:19:35 UTC
+--- base/process/launch_posix.cc.orig 2024-02-23 21:04:38 UTC
+++ base/process/launch_posix.cc
-@@ -64,6 +64,9 @@
+@@ -61,6 +61,9 @@
#error "macOS should use launch_mac.cc"
#endif
diff --git a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
index 362de6db232a..65f3911684b0 100644
--- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_openbsd.cc.orig 2023-09-13 12:11:42 UTC
+--- base/process/process_metrics_openbsd.cc.orig 2024-02-23 21:04:38 UTC
+++ base/process/process_metrics_openbsd.cc
@@ -6,14 +6,23 @@
@@ -24,7 +24,7 @@
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
ProcessHandle process) {
-@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
+@@ -24,52 +33,26 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
return false;
}
@@ -82,9 +82,17 @@
-
size_t GetSystemCommitCharge() {
int mib[] = { CTL_VM, VM_METER };
- int pagesize;
-@@ -84,6 +67,133 @@ size_t GetSystemCommitCharge() {
- pagesize = getpagesize();
+- int pagesize;
++ size_t pagesize;
+ struct vmtotal vmtotal;
+ unsigned long mem_total, mem_free, mem_inactive;
+ size_t len = sizeof(vmtotal);
+@@ -81,9 +64,136 @@ size_t GetSystemCommitCharge() {
+ mem_free = vmtotal.t_free;
+ mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
+
+- pagesize = getpagesize();
++ pagesize = checked_cast<size_t>(getpagesize());
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
+}
diff --git a/www/chromium/files/patch-base_process_process__metrics__unittest.cc b/www/chromium/files/patch-base_process_process__metrics__unittest.cc
index 76c4bee3e7de..5bf9d592d77a 100644
--- a/www/chromium/files/patch-base_process_process__metrics__unittest.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__unittest.cc
@@ -1,18 +1,12 @@
---- base/process/process_metrics_unittest.cc.orig 2023-12-10 06:10:27 UTC
+--- base/process/process_metrics_unittest.cc.orig 2024-02-23 21:04:38 UTC
+++ base/process/process_metrics_unittest.cc
-@@ -35,13 +35,13 @@
- #include <sys/mman.h>
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "base/process/internal_linux.h"
- #endif
+@@ -54,7 +54,8 @@
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE)
-+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || \
++ BUILDFLAG(IS_BSD)
#define ENABLE_CPU_TESTS 1
#else
#define ENABLE_CPU_TESTS 0
diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h
index 86c4cce010a1..49fb9cdeae61 100644
--- a/www/chromium/files/patch-base_rand__util.h
+++ b/www/chromium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig 2024-01-30 07:53:34 UTC
+--- base/rand_util.h.orig 2024-02-23 21:04:38 UTC
+++ base/rand_util.h
-@@ -146,7 +146,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -149,7 +149,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}
diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc
index e1a0737bb539..d92e78de10f5 100644
--- a/www/chromium/files/patch-base_rand__util__posix.cc
+++ b/www/chromium/files/patch-base_rand__util__posix.cc
@@ -1,6 +1,6 @@
---- base/rand_util_posix.cc.orig 2023-11-03 10:09:45 UTC
+--- base/rand_util_posix.cc.orig 2024-02-23 21:04:38 UTC
+++ base/rand_util_posix.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
#include "base/time/time.h"
#include "build/build_config.h"
@@ -9,7 +9,7 @@
#include "third_party/lss/linux_syscall_support.h"
#elif BUILDFLAG(IS_MAC)
// TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
-@@ -39,6 +39,7 @@ namespace base {
+@@ -40,6 +40,7 @@ namespace base {
namespace {
@@ -17,7 +17,7 @@
#if BUILDFLAG(IS_AIX)
// AIX has no 64-bit support for O_CLOEXEC.
static constexpr int kOpenFlags = O_RDONLY;
-@@ -63,10 +64,11 @@ class URandomFd {
+@@ -64,10 +65,11 @@ class URandomFd {
private:
const int fd_;
};
@@ -30,26 +30,26 @@
// TODO(pasko): Unify reading kernel version numbers in:
// mojo/core/channel_linux.cc
// chrome/browser/android/seccomp_support_detector.cc
-@@ -176,6 +178,7 @@ bool UseBoringSSLForRandBytes() {
+@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() {
namespace {
- void RandBytes(void* output, size_t output_length, bool avoid_allocation) {
+ void RandBytes(span<uint8_t> output, bool avoid_allocation) {
+#if !BUILDFLAG(IS_BSD)
#if !BUILDFLAG(IS_NACL)
// The BoringSSL experiment takes priority over everything else.
if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
-@@ -214,6 +217,9 @@ void RandBytes(void* output, size_t output_length, boo
- const bool success =
- ReadFromFD(urandom_fd, static_cast<char*>(output), output_length);
+@@ -215,6 +218,9 @@ void RandBytes(span<uint8_t> output, bool avoid_alloca
+ const int urandom_fd = GetUrandomFD();
+ const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
CHECK(success);
+#else
-+ arc4random_buf(static_cast<char*>(output), output_length);
++ arc4random_buf(output.data(), output.size());
+#endif
}
} // namespace
-@@ -233,9 +239,11 @@ void RandBytes(void* output, size_t output_length) {
- RandBytes(output, output_length, /*avoid_allocation=*/false);
+@@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) {
+ RandBytes(make_span(reinterpret_cast<uint8_t*>(output), output_length));
}
+#if !BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h
index c7fc0bc936a4..65885cac963f 100644
--- a/www/chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,6 +1,6 @@
---- base/synchronization/lock_impl.h.orig 2023-04-05 11:05:06 UTC
+--- base/synchronization/lock_impl.h.orig 2024-02-23 21:04:38 UTC
+++ base/synchronization/lock_impl.h
-@@ -104,6 +104,10 @@ void LockImpl::Unlock() {
+@@ -106,6 +106,10 @@ void LockImpl::Unlock() {
}
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -11,7 +11,7 @@
#if DCHECK_IS_ON()
BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -124,6 +128,9 @@ void LockImpl::Unlock() {
+@@ -126,6 +130,9 @@ void LockImpl::Unlock() {
dcheck_unlock_result(rv);
#endif
}
diff --git a/www/chromium/files/patch-base_system_sys__info__openbsd.cc b/www/chromium/files/patch-base_system_sys__info__openbsd.cc
index 20d87c1dd592..0821a62e1fdb 100644
--- a/www/chromium/files/patch-base_system_sys__info__openbsd.cc
+++ b/www/chromium/files/patch-base_system_sys__info__openbsd.cc
@@ -1,6 +1,14 @@
---- base/system/sys_info_openbsd.cc.orig 2023-11-03 10:09:45 UTC
+--- base/system/sys_info_openbsd.cc.orig 2024-02-23 21:04:38 UTC
+++ base/system/sys_info_openbsd.cc
-@@ -12,6 +12,7 @@
+@@ -3,7 +3,6 @@
+ // found in the LICENSE file.
+
+ #include "base/system/sys_info.h"
+-
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <sys/param.h>
+@@ -12,6 +11,7 @@
#include "base/notreached.h"
#include "base/posix/sysctl.h"
@@ -8,14 +16,13 @@
namespace {
-@@ -27,9 +28,15 @@ uint64_t AmountOfMemory(int pages_name) {
+@@ -27,9 +27,14 @@ uint64_t AmountOfMemory(int pages_name) {
namespace base {
+// pledge(2)
-+int64_t aofpmem = 0;
-+int64_t aofapmem = 0;
-+int64_t shmmax = 0;
++uint64_t aofpmem = 0;
++uint64_t shmmax = 0;
+char cpumodel[256];
+
// static
@@ -25,7 +32,7 @@
int ncpu;
size_t size = sizeof(ncpu);
if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
-@@ -41,10 +48,26 @@ int SysInfo::NumberOfProcessors() {
+@@ -41,10 +46,26 @@ int SysInfo::NumberOfProcessors() {
// static
uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@@ -53,7 +60,7 @@
uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
// We should add inactive file-backed memory also but there is no such
// information from OpenBSD unfortunately.
-@@ -56,16 +79,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
+@@ -56,16 +77,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
size_t limit;
size_t size = sizeof(limit);
diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
index 944c1890aa48..ce6c86ef8ed8 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,6 +1,6 @@
---- base/threading/platform_thread_posix.cc.orig 2023-09-13 12:11:42 UTC
+--- base/threading/platform_thread_posix.cc.orig 2024-02-23 21:04:38 UTC
+++ base/threading/platform_thread_posix.cc
-@@ -76,12 +76,12 @@ void* ThreadFunc(void* params) {
+@@ -78,12 +78,12 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::DisallowSingleton();
@@ -15,7 +15,7 @@
#if BUILDFLAG(IS_APPLE)
PlatformThread::SetCurrentThreadRealtimePeriodValue(
delegate->GetRealtimePeriod());
-@@ -353,7 +353,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
+@@ -357,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
// static
bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
@@ -24,7 +24,7 @@
return false;
#else
if (from >= to) {
-@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+@@ -378,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL)
NOTIMPLEMENTED();
@@ -34,7 +34,7 @@
#else
if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
return;
-@@ -396,7 +399,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+@@ -400,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
// static
ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {
diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
index 0868e4ef8859..c39bc5d4ee93 100644
--- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,4 +1,4 @@
---- base/trace_event/malloc_dump_provider.cc.orig 2023-09-13 12:11:42 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig 2024-02-23 21:04:38 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -25,6 +25,8 @@
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -188,7 +190,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
+@@ -182,7 +184,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
#if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
(!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
@@ -18,7 +18,7 @@
void ReportMallinfoStats(ProcessMemoryDump* pmd,
size_t* total_virtual_size,
size_t* resident_size,
-@@ -359,6 +361,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -353,6 +355,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.
diff --git a/www/chromium/files/patch-base_trace__event_trace__log.cc b/www/chromium/files/patch-base_trace__event_trace__log.cc
deleted file mode 100644
index 9d5e7c22f3ef..000000000000
--- a/www/chromium/files/patch-base_trace__event_trace__log.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- base/trace_event/trace_log.cc.orig 2023-11-03 10:09:45 UTC
-+++ base/trace_event/trace_log.cc
-@@ -2191,8 +2191,13 @@ void TraceLog::SetTraceBufferForTesting(
- #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
- void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
- AutoLock lock(track_event_lock_);
-+#if defined(__clang__) && (__clang_major__ >= 16)
- track_event_sessions_.emplace_back(args.internal_instance_index, *args.config,
- args.backend_type);
-+#else
-+ track_event_sessions_.emplace_back(TrackEventSession{args.internal_instance_index, *args.config,
-+ args.backend_type});
-+#endif
- }
-
- void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) {
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 1c66eef978b5..535594404c7a 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- build/config/compiler/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ build/config/compiler/BUILD.gn
-@@ -202,7 +202,7 @@ declare_args() {
+@@ -204,7 +204,7 @@ declare_args() {
# This greatly reduces the size of debug builds, at the cost of
# debugging information which is required by some specialized
# debugging tools.
@@ -9,7 +9,7 @@
}
declare_args() {
-@@ -266,13 +266,16 @@ config("default_include_dirs") {
+@@ -268,13 +268,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") {
@@ -27,7 +27,7 @@
}
# compiler ---------------------------------------------------------------------
-@@ -518,6 +521,10 @@ config("compiler") {
+@@ -520,6 +523,10 @@ config("compiler") {
}
}
@@ -38,7 +38,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
-@@ -593,7 +600,7 @@ config("compiler") {
+@@ -595,7 +602,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -47,16 +47,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
-@@ -800,7 +807,7 @@ config("compiler") {
- if (is_apple) {
- ldflags += [ "-Wcrl,object_path_lto" ]
- }
-- if (!is_chromeos) {
-+ if (!is_chromeos && !is_bsd) {
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
- # toolchain has this flag.
- # We only use one version of LLVM within a build so there's no need to
-@@ -1175,7 +1182,7 @@ config("compiler_cpu_abi") {
+@@ -1174,7 +1181,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -65,7 +56,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -1190,7 +1197,7 @@ config("compiler_cpu_abi") {
+@@ -1189,7 +1196,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -74,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1525,7 +1532,7 @@ config("compiler_deterministic") {
+@@ -1524,7 +1531,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@@ -83,7 +74,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
-@@ -1577,7 +1584,7 @@ config("compiler_deterministic") {
+@@ -1576,7 +1583,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@@ -92,16 +83,21 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
-@@ -1862,7 +1869,7 @@ config("default_warnings") {
- "-Wno-ignored-pragma-optimize",
+@@ -1874,12 +1881,9 @@ config("default_warnings") {
+
+ # TODO(crbug.com/1494809): Evaluate and possibly enable.
+ "-Wno-vla-extension",
+-
+- # TODO(https://crbug.com/1490607): Fix and re-enable.
+- "-Wno-thread-safety-reference-return",
]
- if (!is_nacl) {
+ if (!is_nacl && !is_bsd) {
- cflags += [
- # TODO(crbug.com/1343975) Evaluate and possibly enable.
- "-Wno-deprecated-builtins",
-@@ -2065,7 +2072,7 @@ config("no_chromium_code") {
+ cflags_cc += [
+ # TODO(https://crbug.com/1513724): Fix and re-enable.
+ "-Wno-c++11-narrowing-const-reference",
+@@ -2067,7 +2071,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -110,7 +106,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2594,7 +2601,7 @@ config("afdo_optimize_size") {
+@@ -2596,7 +2600,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@@ -119,7 +115,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2621,7 +2628,7 @@ config("afdo") {
+@@ -2623,7 +2627,7 @@ config("afdo") {
cflags += [ "-Wno-backend-plugin" ]
inputs = [ _clang_sample_profile ]
}
@@ -128,7 +124,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2785,7 +2792,8 @@ config("symbols") {
+@@ -2787,7 +2791,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
diff --git a/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn b/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn
deleted file mode 100644
index 88364df3494d..000000000000
--- a/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
---- build/config/compiler/pgo/BUILD.gn.orig 2023-11-03 10:09:45 UTC
-+++ build/config/compiler/pgo/BUILD.gn
-@@ -139,13 +139,14 @@ config("pgo_optimization_flags") {
-
- # Enable basic block layout based on the extended TSP problem. This aims to
- # improve icache utilization and reduce the binary size.
-- if (use_thin_lto) {
-+ # __clang_major__ >= 15
-+ if (use_thin_lto && !is_bsd) {
- if (is_win) {
- ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ]
- } else {
- ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ]
- }
-- } else {
-+ } else if (!is_bsd) {
- cflags += [
- "-mllvm",
- "-enable-ext-tsp-block-placement=1",
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index a84ce85cb7d3..af3f3d4a3638 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,4 +1,4 @@
---- build/toolchain/gcc_toolchain.gni.orig 2023-12-10 06:10:27 UTC
+--- build/toolchain/gcc_toolchain.gni.orig 2024-02-23 21:04:38 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -878,22 +885,12 @@ template("gcc_toolchain") {
+@@ -886,22 +893,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index 2fc75da50839..a0a5a073d9e4 100644
--- a/www/chromium/files/patch-cc_BUILD.gn
+++ b/www/chromium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- cc/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ cc/BUILD.gn
-@@ -676,7 +676,7 @@ cc_test_static_library("test_support") {
+@@ -678,7 +678,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
if (skia_use_dawn) {
-@@ -935,7 +935,6 @@ cc_test("cc_unittests") {
+@@ -938,7 +938,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",
diff --git a/www/chromium/files/patch-cc_paint_paint__op__writer.h b/www/chromium/files/patch-cc_paint_paint__op__writer.h
deleted file mode 100644
index 92b0e96da01c..000000000000
--- a/www/chromium/files/patch-cc_paint_paint__op__writer.h
+++ /dev/null
@@ -1,41 +0,0 @@
---- cc/paint/paint_op_writer.h.orig 2023-12-10 06:10:27 UTC
-+++ cc/paint/paint_op_writer.h
-@@ -122,10 +122,17 @@ class CC_PAINT_EXPORT PaintOpWriter {
- // easier to keep serialized size calculation in sync with serialization and
- // deserialization, and make it possible to allow dynamic sizing for some
- // data types (see the specialized/overloaded functions).
-+#if defined(__clang__) && (__clang_major__ >= 15)
- template <typename T>
- static constexpr size_t SerializedSize();
- template <typename T>
- static constexpr size_t SerializedSize(const T& data);
-+#else
-+ template <typename T>
-+ static size_t SerializedSize();
-+ template <typename T>
-+ static size_t SerializedSize(const T& data);
-+#endif
- static size_t SerializedSize(const PaintImage& image);
- static size_t SerializedSize(const PaintRecord& record);
- static size_t SerializedSize(const SkHighContrastConfig& config);
-@@ -463,12 +470,20 @@ constexpr size_t PaintOpWriter::SerializedSize<SkGainm
- }
-
- template <typename T>
-+#if defined(__clang__) && (__clang_major__ >= 15)
- constexpr size_t PaintOpWriter::SerializedSize() {
-+#else
-+size_t PaintOpWriter::SerializedSize() {
-+#endif
- static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>);
- return SerializedSizeSimple<T>();
- }
- template <typename T>
-+#if defined(__clang__) && (__clang_major__ >= 15)
- constexpr size_t PaintOpWriter::SerializedSize(const T& data) {
-+#else
-+size_t PaintOpWriter::SerializedSize(const T& data) {
-+#endif
- return SerializedSizeSimple<T>();
- }
-
diff --git a/www/chromium/files/patch-chrome_app_app__management__strings.grdp b/www/chromium/files/patch-chrome_app_app__management__strings.grdp
deleted file mode 100644
index 5e2967498e0d..000000000000
--- a/www/chromium/files/patch-chrome_app_app__management__strings.grdp
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/app/app_management_strings.grdp.orig 2024-01-30 07:53:34 UTC
-+++ chrome/app/app_management_strings.grdp
-@@ -197,7 +197,7 @@
- You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
- </message>
- </if>
-- <if expr="is_fuchsia or is_linux">
-+ <if expr="is_fuchsia or is_posix">
- <message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations.">
- You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
- </message>
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index 5eef3bf65358..dbba685eec9f 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -146,7 +146,7 @@
#include "components/about_ui/credit_utils.h"
@@ -29,7 +29,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -338,7 +338,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -339,7 +339,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@@ -38,7 +38,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -423,7 +423,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -424,7 +424,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -47,7 +47,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
-@@ -601,7 +601,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -56,7 +56,7 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
-@@ -691,7 +691,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -765,7 +765,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -65,7 +65,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
-@@ -1048,7 +1048,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
+@@ -1138,7 +1138,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
base::sequence_manager::internal::ThreadController::InitializeFeatures();
@@ -74,7 +74,7 @@
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
-@@ -1200,7 +1200,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1290,7 +1290,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@@ -83,7 +83,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -1230,7 +1230,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1320,7 +1320,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@@ -92,7 +92,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -1641,7 +1641,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1717,7 +1717,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@@ -101,7 +101,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
-@@ -1750,7 +1750,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1826,7 +1826,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
deleted file mode 100644
index 1daabcb5c875..000000000000
--- a/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/app/chromium_strings.grd.orig 2024-01-30 07:53:34 UTC
-+++ chrome/app/chromium_strings.grd
-@@ -315,7 +315,7 @@ If you update this file, be sure also to update google
- Welcome to Chromium; new browser window opened
- </message>
- </if>
-- <if expr="is_macosx or is_linux">
-+ <if expr="is_macosx or is_posix">
- <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
- Welcome to Chromium
- </message>
-@@ -483,7 +483,7 @@ If you update this file, be sure also to update google
- To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
- </message>
- </if>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
- Chromium may not function correctly because it is no longer supported on this Linux distribution
- </message>
-@@ -920,7 +920,7 @@ Permissions you've already given to websites and apps
- </message>
- </if>
-
-- <if expr="is_win or is_macosx or is_linux">
-+ <if expr="is_win or is_macosx or is_posix">
- <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false">
- Not used in Chromium. Placeholder to keep resource maps in sync.
- </message>
-@@ -1299,7 +1299,7 @@ Permissions you've already given to websites and apps
- </message>
- </if>
-
-- <if expr="is_win or is_macosx or is_linux">
-+ <if expr="is_win or is_macosx or is_posix">
- <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog." translateable="false">
- Not used in Chromium. Placeholder to keep resource maps in sync.
- </message>
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
deleted file mode 100644
index cef5913b1798..000000000000
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ /dev/null
@@ -1,92 +0,0 @@
---- chrome/app/generated_resources.grd.orig 2024-02-08 12:57:33 UTC
-+++ chrome/app/generated_resources.grd
-@@ -2,7 +2,7 @@
-
- <!--
- This file contains definitions of resources that will be translated for each
--locale. The variables is_win, is_macosx, is_linux, and is_posix are available
-+locale. The variables is_win, is_macosx, is_posix, and is_posix are available
- for making strings OS specific. Other platform defines such as use_titlecase
- are declared in tools/grit/grit_rule.gni.
- -->
-@@ -3665,7 +3665,7 @@ are declared in tools/grit/grit_rule.gni.
- </if>
-
- <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
-- <if expr="is_win or is_linux">
-+ <if expr="is_win or is_posix">
- <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
- Device Credentials
- </message>
-@@ -5553,7 +5553,7 @@ are declared in tools/grit/grit_rule.gni.
- Read information about your browser, OS, device, installed software, registry values and files
- </message>
- </if>
-- <if expr="is_macosx or is_linux">
-+ <if expr="is_macosx or is_posix">
- <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
- Read information about your browser, OS, device, installed software and files
- </message>
-@@ -6284,7 +6284,7 @@ Keep your key file in a safe place. You will need it t
- Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
- </message>
- </if>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
- Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
- </message>
-@@ -6330,7 +6330,7 @@ Keep your key file in a safe place. You will need it t
- Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
- </message>
- </if>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
- Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
- </message>
-@@ -10965,7 +10965,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
- <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
- Update
- </message>
-- <if expr="is_win or is_macosx or is_linux">
-+ <if expr="is_win or is_macosx or is_posix">
- <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
- Finish update
- </message>
-@@ -11312,7 +11312,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
- Google Pay
- </message>
-
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
- Use system title bar and borders
- </message>
-@@ -12310,7 +12310,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
- </message>
-
- <!-- Device Trust Consent dialog -->
-- <if expr="is_win or is_macosx or is_linux or is_chromeos">
-+ <if expr="is_win or is_macosx or is_posix or is_chromeos">
- <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
- Share information about your device?
- </message>
-@@ -12718,7 +12718,7 @@ Please help our engineers fix this problem. Tell us wh
- Set as default
- </message>
-
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
- Minimize
- </message>
-@@ -14949,7 +14949,7 @@ Please help our engineers fix this problem. Tell us wh
- Open Anyway
- </message>
-
-- <if expr="is_win or is_macosx or is_linux">
-+ <if expr="is_win or is_macosx or is_posix">
- <message name="IDS_UTILITY_PROCESS_SYSTEM_SIGNALS_NAME" desc="The name of the utility process used to collect system signals. Only spawned on Windows, Mac or Linux.">
- System Signals Utilities
- </message>
diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
deleted file mode 100644
index 6afdb4671f56..000000000000
--- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/app/google_chrome_strings.grd.orig 2024-01-30 07:53:34 UTC
-+++ chrome/app/google_chrome_strings.grd
-@@ -301,7 +301,7 @@ chromium_strings.grd. -->
- Welcome to Chrome; new browser window opened
- </message>
- </if>
-- <if expr="is_macosx or is_linux">
-+ <if expr="is_macosx or is_posix">
- <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
- Welcome to Google Chrome
- </message>
-@@ -453,7 +453,7 @@ chromium_strings.grd. -->
- To get future Google Chrome updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
- </message>
- </if>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
- Google Chrome may not function correctly because it is no longer supported on this Linux distribution
- </message>
-@@ -887,7 +887,7 @@ Permissions you've already given to websites and apps
- </if>
- </if>
-
-- <if expr="is_win or is_macosx or is_linux">
-+ <if expr="is_win or is_macosx or is_posix">
- <if expr="use_titlecase">
- <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item">
- Relaunch to Update - Your tabs will reopen
-@@ -1306,7 +1306,7 @@ Permissions you've already given to websites and apps
- </message>
- </if>
-
-- <if expr="is_win or is_macosx or is_linux">
-+ <if expr="is_win or is_macosx or is_posix">
- <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog.">
- Relaunch to finish Chrome update
- </message>
diff --git a/www/chromium/files/patch-chrome_app_profiles__strings.grdp b/www/chromium/files/patch-chrome_app_profiles__strings.grdp
deleted file mode 100644
index 1c7f172a5dc7..000000000000
--- a/www/chromium/files/patch-chrome_app_profiles__strings.grdp
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/app/profiles_strings.grdp.orig 2023-09-13 12:11:42 UTC
-+++ chrome/app/profiles_strings.grdp
-@@ -54,7 +54,7 @@
- Add Profile...
- </message>
- </if>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_PROFILES_ADD_PROFILE_LABEL" desc="Menu item for adding a new profile.">
- Add profile...
- </message>
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
deleted file mode 100644
index 1dd42e62dd59..000000000000
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ /dev/null
@@ -1,35 +0,0 @@
---- chrome/app/settings_strings.grdp.orig 2023-11-03 10:09:45 UTC
-+++ chrome/app/settings_strings.grdp
-@@ -183,12 +183,12 @@
- Manage accessibility features
- </message>
- </if>
-- <if expr="is_win or is_linux or is_macosx">
-+ <if expr="is_win or is_posix or is_macosx">
- <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE" desc="Title for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device.">
- Swipe between pages
- </message>
- </if>
-- <if expr="is_win or is_linux">
-+ <if expr="is_win or is_posix">
- <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE" desc="Subtitle for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device.">
- Navigate back and forward with a swipe gesture
- </message>
-@@ -222,7 +222,7 @@
- Theme
- </message>
- </if>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
- GTK
- </message>
-@@ -242,7 +242,7 @@
- Use Classic
- </message>
- </if>
-- <if expr="not is_linux or is_chromeos or is_fuchsia">
-+ <if expr="not is_posix or is_chromeos or is_fuchsia">
- <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme.">
- Reset to default
- </message>
diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
deleted file mode 100644
index 04157ab1579e..000000000000
--- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2024-01-30 07:53:34 UTC
-+++ chrome/app/theme/chrome_unscaled_resources.grd
-@@ -14,7 +14,7 @@
- </outputs>
- <release seq="1">
- <includes>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <then>
- <include name="IDR_PRODUCT_LOGO_64" file="${branding_path_component}/linux/product_logo_64.png" type="BINDATA" />
- <include name="IDR_PRODUCT_LOGO_128" file="${branding_path_component}/linux/product_logo_128.png" type="BINDATA" />
-@@ -40,7 +40,7 @@
- <then>
- <include name="IDR_PRODUCT_LOGO_SVG" file="${branding_path_component}/chrome_logo.svg" type="BINDATA" />
- <include name="IDR_PRODUCT_LOGO_ANIMATION_SVG" file="${branding_path_component}/chrome_logo_animation.svg" type="BINDATA" />
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <include name="IDR_PRODUCT_LOGO_128_BETA" file="${branding_path_component}/linux/product_logo_128_beta.png" type="BINDATA" />
- <include name="IDR_PRODUCT_LOGO_128_DEV" file="${branding_path_component}/linux/product_logo_128_dev.png" type="BINDATA" />
- </if>
diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
deleted file mode 100644
index 2591e88a4434..000000000000
--- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
+++ /dev/null
@@ -1,46 +0,0 @@
---- chrome/app/theme/theme_resources.grd.orig 2024-01-30 07:53:34 UTC
-+++ chrome/app/theme/theme_resources.grd
-@@ -153,14 +153,14 @@
- </if>
- <if expr="_google_chrome">
- <then>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <then>
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="${branding_path_component}/linux/product_logo_16.png" />
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="${branding_path_component}/linux/product_logo_32.png" />
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="${branding_path_component}/linux/product_logo_32_beta.png" />
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="${branding_path_component}/linux/product_logo_32_dev.png" />
- </then>
-- <else> <!-- not is_linux -->
-+ <else> <!-- not is_posix -->
- <if expr="not is_android">
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="${branding_path_component}/product_logo_16.png" />
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="${branding_path_component}/product_logo_32.png" />
-@@ -168,7 +168,7 @@
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="${branding_path_component}/product_logo_32_beta.png" />
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="${branding_path_component}/product_logo_32_dev.png" />
- </else>
-- </if> <!-- is_linux -->
-+ </if> <!-- is_posix -->
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="${branding_path_component}/product_logo_32_canary.png" />
- <if expr="not is_android">
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="${branding_path_component}/product_logo_name_22.png" />
-@@ -178,7 +178,7 @@
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="${branding_path_component}/product_logo_enterprise_white.png" />
- </then>
- <else> <!-- not _google_chrome -->
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <then>
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="${branding_path_component}/linux/product_logo_16.png" />
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="${branding_path_component}/linux/product_logo_32.png" />
-@@ -187,7 +187,7 @@
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="${branding_path_component}/product_logo_16.png" />
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="${branding_path_component}/product_logo_32.png" />
- </else>
-- </if> <!-- is_linux -->
-+ </if> <!-- is_posix -->
- <if expr="_is_chrome_for_testing_branded">
- <then>
- <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" />
diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn
index 216b7ea24a36..ea6d564f86af 100644
--- a/www/chromium/files/patch-chrome_browser_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig 2024-02-08 12:57:33 UTC
+--- chrome/browser/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/BUILD.gn
-@@ -6533,6 +6533,13 @@ static_library("browser") {
+@@ -6477,6 +6477,13 @@ static_library("browser") {
}
}
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 89ca66147762..e69fa0922aff 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/about_flags.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/about_flags.cc
-@@ -231,7 +231,7 @@
+@@ -234,7 +234,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@@ -9,16 +9,16 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -329,7 +329,7 @@
+@@ -327,7 +327,7 @@
#include "device/vr/public/cpp/features.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -343,7 +343,7 @@
+
+@@ -336,7 +336,7 @@
#include "chrome/browser/win/titlebar_config.h"
#endif
@@ -27,7 +27,7 @@
#include "chrome/browser/enterprise/profile_management/profile_management_features.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -481,7 +481,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -493,7 +493,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@@ -36,7 +36,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1451,7 +1451,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
+@@ -1389,7 +1389,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -45,7 +45,7 @@
const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
{"ShortcutBoostSearchScore", "0"},
{"ShortcutBoostNonTopHitThreshold", "0"},
-@@ -3934,7 +3934,7 @@ const flags_ui::FeatureEntry::FeatureVariation
+@@ -3749,7 +3749,7 @@ const flags_ui::FeatureEntry::FeatureVariation
std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
};
@@ -54,23 +54,25 @@
const flags_ui::FeatureEntry::FeatureParam
kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
const flags_ui::FeatureEntry::FeatureParam
-@@ -4675,7 +4675,7 @@ const FeatureEntry kFeatureEntries[] = {
- "DXGIWaitableSwapChain"),
+@@ -4506,7 +4506,7 @@ const FeatureEntry kFeatureEntries[] = {
},
- #endif // BUILDFLAG(IS_WIN)
+ #endif // BUILDFLAG(IS_ANDROID)
+
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{
"fluent-overlay-scrollbars",
flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -5219,13 +5219,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5063,7 +5063,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
- flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
+ {"pulseaudio-loopback-for-cast",
+ flag_descriptions::kPulseaudioLoopbackForCastName,
+ flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
+@@ -5079,7 +5079,7 @@ const FeatureEntry kFeatureEntries[] = {
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
#endif // BUILDFLAG(IS_LINUX)
@@ -79,7 +81,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -5539,7 +5539,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5367,7 +5367,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kRefreshFeedOnRestart)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -88,7 +90,7 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
-@@ -6192,7 +6192,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6011,7 +6011,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -97,7 +99,7 @@
{"omnibox-actions-ui-simplification",
flag_descriptions::kOmniboxActionsUISimplificationName,
flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop,
-@@ -7047,7 +7047,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6836,7 +6836,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kParallelDownloadingDescription, kOsAll,
FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
@@ -106,16 +108,16 @@
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
-@@ -8066,7 +8066,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)},
- #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
+@@ -7817,7 +7817,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{"enable-network-service-sandbox",
flag_descriptions::kEnableNetworkServiceSandboxName,
flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -8091,7 +8091,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7850,7 +7850,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(
supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)},
@@ -124,7 +126,7 @@
{"enable-family-link-extensions-permissions",
flag_descriptions::
kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
-@@ -8741,7 +8741,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8478,7 +8478,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -133,7 +135,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -9015,7 +9015,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8738,7 +8738,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -142,7 +144,7 @@
{"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
-@@ -9057,7 +9057,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8780,7 +8780,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -151,7 +153,16 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -9648,7 +9648,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9065,7 +9065,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ {"policy-indication-for-managed-default-search",
+ flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
+ flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
+@@ -9365,7 +9365,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -160,7 +171,7 @@
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
-@@ -10772,7 +10772,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10432,7 +10432,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsDesktop | kOsAndroid,
FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
@@ -169,7 +180,16 @@
{"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
flag_descriptions::kCameraMicEffectsDescription,
static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10938,7 +10938,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10463,7 +10463,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ {"site-search-settings-policy",
+ flag_descriptions::kSiteSearchSettingsPolicyName,
+ flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
+@@ -10593,7 +10593,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
#endif
@@ -178,12 +198,12 @@
{"third-party-profile-management",
flag_descriptions::kThirdPartyProfileManagementName,
flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -11329,7 +11329,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kAutofillEnableCardBenefitsDescription, kOsAll,
- FEATURE_VALUE_TYPE(autofill::features::kAutofillEnableCardBenefits)},
+@@ -10945,7 +10945,7 @@ const FeatureEntry kFeatureEntries[] = {
+ trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
+ #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- {flag_descriptions::kAutofillContentEditablesId,
- flag_descriptions::kAutofillContentEditablesName,
- flag_descriptions::kAutofillContentEditablesDescription,
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ {"restart-to-gain-access-to-keychain",
+ flag_descriptions::kRestartToGainAccessToKeychainName,
+ flag_descriptions::kRestartToGainAccessToKeychainDescription,
diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc
index 402d1ee8317d..5e36cefd73f0 100644
--- a/www/chromium/files/patch-chrome_browser_browser__features.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__features.cc
@@ -1,4 +1,4 @@
---- chrome/browser/browser_features.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/browser_features.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/browser_features.cc
@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache,
BASE_FEATURE(kDestroyProfileOnBrowserClose,
@@ -9,7 +9,7 @@
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -286,7 +286,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2,
+@@ -302,7 +302,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2,
BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
"SupportSearchSuggestionForPrerender2",
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
index d492a0e4010f..cc4312205cef 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/browser_process_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/browser_process_impl.cc
-@@ -215,7 +215,7 @@
+@@ -219,7 +219,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
-@@ -1219,7 +1219,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1232,7 +1232,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
-@@ -1485,7 +1485,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1511,7 +1511,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
index 59bb95c52a24..ecc8b68284cb 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/browser_process_impl.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/browser_process_impl.h
-@@ -390,7 +390,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -389,7 +389,7 @@ class BrowserProcessImpl : public BrowserProcess,
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index e90ef5dfe74e..be368aeca89c 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -126,13 +126,13 @@
+@@ -128,13 +128,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
-@@ -218,7 +218,7 @@
+@@ -222,7 +222,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,7 +25,7 @@
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
-@@ -862,7 +862,7 @@ void BindScreen2xMainContentExtractor(
+@@ -829,7 +829,7 @@ void BindScreen2xMainContentExtractor(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -34,7 +34,7 @@
void BindVisualSuggestionsModelProvider(
content::RenderFrameHost* frame_host,
mojo::PendingReceiver<
-@@ -1004,7 +1004,7 @@ void PopulateChromeFrameBinders(
+@@ -1025,7 +1025,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -43,7 +43,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -1012,7 +1012,7 @@ void PopulateChromeFrameBinders(
+@@ -1033,7 +1033,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -52,7 +52,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
-@@ -1094,7 +1094,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1120,7 +1120,7 @@ void PopulateChromeWebUIFrameBinders(
commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -61,7 +61,7 @@
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -1115,7 +1115,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1132,7 +1132,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -70,7 +70,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
-@@ -1653,7 +1653,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1676,7 +1676,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index d8ce5f3dca70..bef392ca91e3 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -247,11 +247,11 @@
+@@ -245,11 +245,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -14,7 +14,7 @@
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -285,14 +285,14 @@
+@@ -282,14 +282,14 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -31,7 +31,7 @@
#include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck
#include "chrome/browser/headless/headless_mode_util.h" // nogncheck
#include "components/headless/select_file_dialog/headless_select_file_dialog.h"
-@@ -354,14 +354,14 @@
+@@ -351,14 +351,14 @@
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -48,7 +48,7 @@
constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
FILE_PATH_LITERAL("Media History");
-@@ -1067,7 +1067,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@@ -57,7 +57,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1123,7 +1123,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1124,7 +1124,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -66,7 +66,7 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
-@@ -1322,7 +1322,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
+@@ -1323,7 +1323,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -75,7 +75,7 @@
// Delete the media history database if it still exists.
// TODO(crbug.com/1198344): Remove this.
base::ThreadPool::PostTask(
-@@ -1371,7 +1371,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
+@@ -1372,7 +1372,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
*UrlLanguageHistogramFactory::GetForBrowserContext(profile));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -84,7 +84,7 @@
if (headless::IsHeadlessMode()) {
headless::ReportHeadlessActionMetrics();
}
-@@ -1477,7 +1477,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
+@@ -1480,7 +1480,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
// In headless mode provide alternate SelectFileDialog factory overriding
// any platform specific SelectFileDialog implementation that may have been
// set.
@@ -93,7 +93,7 @@
if (headless::IsHeadlessMode()) {
headless::HeadlessSelectFileDialogFactory::SetUp();
}
-@@ -2012,7 +2012,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
+@@ -2011,7 +2011,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
// Drop the request if headless mode is in effect or the request is from
// a headless Chrome process.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
index 009b0cbbe1e2..607a84e3902a 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
-@@ -120,7 +120,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt
+@@ -117,7 +117,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt
ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default;
void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
index 0c5acc3fd1b5..2a8765abda83 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig 2022-11-30 08:12:58 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/chrome_browser_main_posix.cc
-@@ -73,7 +73,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
+@@ -79,7 +79,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
} else {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 6dadd6356489..c7b5ce24abc2 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2024-02-08 12:57:33 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -459,7 +459,7 @@
+@@ -456,7 +456,7 @@
#include "storage/browser/file_system/external_mount_points.h"
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#elif BUILDFLAG(IS_ANDROID)
-@@ -562,12 +562,12 @@
+@@ -559,12 +559,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -24,7 +24,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -578,14 +578,14 @@
+@@ -575,14 +575,14 @@
#include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
#endif
@@ -41,7 +41,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -601,7 +601,7 @@
+@@ -598,7 +598,7 @@
#include "components/lens/lens_features.h"
#endif
@@ -50,16 +50,16 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1560,7 +1560,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+@@ -1457,7 +1457,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+ #if BUILDFLAG(IS_CHROMEOS)
registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
- registry->RegisterBooleanPref(
- policy::policy_prefs::kPPAPISharedImagesForVideoDecoderAllowed, true);
+ #endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1684,7 +1684,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1576,7 +1576,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@@ -68,7 +68,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1721,7 +1721,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1613,7 +1613,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -77,7 +77,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1742,7 +1742,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1634,7 +1634,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@@ -86,7 +86,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1761,7 +1761,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1653,7 +1653,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@@ -95,7 +95,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2598,6 +2598,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2485,6 +2485,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@@ -104,7 +104,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2939,7 +2941,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2826,7 +2828,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@@ -113,7 +113,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4621,7 +4623,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4478,7 +4480,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -122,7 +122,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -5189,7 +5191,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5037,7 +5039,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -131,7 +131,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
-@@ -5199,7 +5201,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5047,7 +5049,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -140,7 +140,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -5238,7 +5240,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5086,7 +5088,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}
@@ -149,7 +149,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -7187,7 +7189,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
+@@ -7033,7 +7035,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
// This enterprise policy is supported on Android, but the feature will not be
// launched there.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index 5a5cf85267d4..0d7df7be5355 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,9 +1,9 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -495,7 +495,7 @@ class ChromeContentBrowserClient : public content::Con
- void OverridePageVisibilityState(
- content::RenderFrameHost* render_frame_host,
- content::PageVisibilityState* visibility_state) override;
+@@ -489,7 +489,7 @@ class ChromeContentBrowserClient : public content::Con
+ bool IsPluginAllowedToUseDevChannelAPIs(
+ content::BrowserContext* browser_context,
+ const GURL& url) override;
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
void GetAdditionalMappedFilesForChildProcess(
diff --git a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
index cc2a17b48dbe..570e4b0e649c 100644
--- a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
+++ b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2023-10-11 18:22:24 UTC
+--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -40,7 +40,7 @@
#include "third_party/widevine/cdm/buildflags.h"
@@ -9,7 +9,7 @@
#include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
#endif
-@@ -77,7 +77,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
+@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
const char ImageLoaderComponentName[] = "WidevineCdm";
#endif
@@ -18,7 +18,7 @@
// On Linux and ChromeOS the Widevine CDM is loaded at startup before the
// zygote is locked down. As a result there is no need to register the CDM
// with Chrome as it can't be used until Chrome is restarted.
-@@ -363,7 +363,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
+@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
return;
}
diff --git a/www/chromium/files/patch-chrome_browser_compose_chrome__compose__client.cc b/www/chromium/files/patch-chrome_browser_compose_chrome__compose__client.cc
deleted file mode 100644
index 59dfa8458f35..000000000000
--- a/www/chromium/files/patch-chrome_browser_compose_chrome__compose__client.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- chrome/browser/compose/chrome_compose_client.cc.orig 2024-01-30 07:53:34 UTC
-+++ chrome/browser/compose/chrome_compose_client.cc
-@@ -170,14 +170,14 @@ void ChromeComposeClient::CloseUI(compose::mojom::Clos
- void ChromeComposeClient::ApproveConsent() {
- pref_service_->SetBoolean(
- unified_consent::prefs::kPageContentCollectionEnabled, true);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- pref_service_->SetBoolean(prefs::kPrefHasAcceptedComposeConsent, true);
- #endif
- UpdateAllSessionsWithConsentApproved();
- }
-
- void ChromeComposeClient::AcknowledgeConsentDisclaimer() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- pref_service_->SetBoolean(prefs::kPrefHasAcceptedComposeConsent, true);
- #endif
- UpdateAllSessionsWithConsentApproved();
diff --git a/www/chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc b/www/chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc
deleted file mode 100644
index e2ff7ba446a2..000000000000
--- a/www/chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc
+++ /dev/null
@@ -1,30 +0,0 @@
---- chrome/browser/content_settings/one_time_permission_provider.cc.orig 2024-01-30 07:53:34 UTC
-+++ chrome/browser/content_settings/one_time_permission_provider.cc
-@@ -231,8 +231,13 @@ void OneTimePermissionProvider::OnSuspend() {
-
- while (rule_iterator && rule_iterator->HasNext()) {
- auto rule = rule_iterator->Next();
-+#if defined(__clang__) && (__clang_major__ >= 16)
- patterns_to_delete.emplace_back(setting_type, rule->primary_pattern,
- rule->secondary_pattern);
-+#else
-+ patterns_to_delete.emplace_back(ContentSettingEntry{setting_type, rule->primary_pattern,
-+ rule->secondary_pattern});
-+#endif
- permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
- setting_type,
- permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
-@@ -334,8 +339,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG
- auto rule = rule_iterator->Next();
- if (rule->primary_pattern.Matches(origin_gurl) &&
- rule->secondary_pattern.Matches(origin_gurl)) {
-+#if defined(__clang__) && (__clang_major__ >= 16)
- patterns_to_delete.emplace_back(
- content_setting_type, rule->primary_pattern, rule->secondary_pattern);
-+#else
-+ patterns_to_delete.emplace_back(
-+ ContentSettingEntry{content_setting_type, rule->primary_pattern, rule->secondary_pattern});
-+#endif
- permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
- content_setting_type, trigger_event);
- }
diff --git a/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc b/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc
deleted file mode 100644
index 8c422381d997..000000000000
--- a/www/chromium/files/patch-chrome_browser_download_bubble_download__bubble__update__service.cc
+++ /dev/null
@@ -1,32 +0,0 @@
---- chrome/browser/download/bubble/download_bubble_update_service.cc.orig 2023-12-10 06:10:27 UTC
-+++ chrome/browser/download/bubble/download_bubble_update_service.cc
-@@ -89,7 +89,11 @@ ItemSortKey GetSortKey(const Item& item) {
- // Helper to get an iterator to the last element in the cache. The cache
- // must not be empty.
- template <typename Item>
-+#if defined(__clang__) && (__clang_major__ >= 16)
- SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
-+#else
-+typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
-+#endif
- CHECK(!cache.empty());
- auto it = cache.end();
- return std::prev(it);
-@@ -1089,9 +1093,17 @@ bool DownloadBubbleUpdateService::CacheManager::Remove
- }
-
- template <typename Id, typename Item>
-+#if defined(__clang__) && (__clang_major__ >= 16)
- SortedItems<Item>::iterator
-+#else
-+typename SortedItems<Item>::iterator
-+#endif
- DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
-+#if defined(__clang__) && (__clang_major__ >= 16)
- SortedItems<Item>::iterator iter,
-+#else
-+ typename SortedItems<Item>::iterator iter,
-+#endif
- SortedItems<Item>& cache,
- IterMap<Id, Item>& iter_map) {
- CHECK(iter != cache.end());
diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index cb80a428b11e..1c746bfd2d17 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,7 +1,7 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1633,7 +1633,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
- bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
+@@ -1661,7 +1661,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)
@@ -9,7 +9,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
-@@ -1752,7 +1752,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1780,7 +1780,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,12 +18,12 @@
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
-@@ -1798,7 +1798,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
+@@ -1826,7 +1826,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_MAC)
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- absl::optional<enterprise_connectors::AnalysisSettings> settings =
+ std::optional<enterprise_connectors::AnalysisSettings> settings =
safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item);
diff --git a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
index 35122fc1135c..2507aa8f3529 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
@@ -1,15 +1,15 @@
---- chrome/browser/download/download_file_picker.cc.orig 2023-02-08 09:03:45 UTC
+--- chrome/browser/download/download_file_picker.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/download/download_file_picker.cc
-@@ -17,7 +17,7 @@
- #include "content/public/browser/download_manager.h"
+@@ -18,7 +18,7 @@
#include "content/public/browser/web_contents.h"
+ #include "ui/shell_dialogs/selected_file_info.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "ui/aura/window.h"
-@@ -82,7 +82,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
+@@ -83,7 +83,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
// dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc).
// and windows.Here we make owning_window host to browser current active
// window if it is null. https://crbug.com/1301898
diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
index 6e50d1520aba..6a61aa66b760 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_item_model.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/download/download_item_model.cc
-@@ -756,7 +756,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -747,7 +747,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
-@@ -802,7 +802,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -793,7 +793,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1166,7 +1166,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1149,7 +1149,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
index 57405958adc3..d15ed1cc8af5 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
#include <vector>
@@ -9,7 +9,7 @@
#include "base/files/file_util.h"
#include "base/functional/bind.h"
@@ -63,6 +64,10 @@
- #include "chrome/browser/download/bubble/download_bubble_prefs.h"
+ #include "chrome/browser/flags/android/chrome_feature_list.h"
#endif
+#if BUILDFLAG(IS_BSD)
@@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
-@@ -308,7 +313,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -305,7 +310,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
-@@ -535,7 +540,7 @@ void DownloadPrefs::SaveAutoOpenState() {
+@@ -544,7 +549,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
-@@ -659,7 +664,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -668,7 +673,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#else
// If the stored download directory is an absolute path, we presume it's
// correct; there's not really much more validation we can do here.
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
index 0f58d02aa7fc..c392293a3793 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -560,7 +560,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
+@@ -542,7 +542,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
Profile* profile = Profile::FromBrowserContext(context_);
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
index 230d780ef316..0b19e1ffa74d 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2023-08-17 07:33:31 UTC
+--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc
-@@ -13,7 +13,7 @@
+@@ -14,7 +14,7 @@
#if BUILDFLAG(IS_WIN)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h"
#elif BUILDFLAG(IS_MAC)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h"
-@@ -46,7 +46,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand
+@@ -47,7 +47,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
#if BUILDFLAG(IS_WIN)
return std::make_unique<WinKeyRotationCommand>();
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index 2d448044ef44..c2f896012ec3 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1377,6 +1377,10 @@ static_library("extensions") {
+@@ -1380,6 +1380,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
index cd8c69565344..070f82493f62 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2022-08-31 12:19:35 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h
@@ -7,7 +7,7 @@
@@ -7,5 +7,5 @@
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include <optional>
#include <vector>
-
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index e98fb7376b0a..cd22ff4c2f1e 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -32,7 +32,7 @@
#include "components/reporting/util/statusor.h"
@@ -6,10 +6,10 @@
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include <optional>
+
#include "base/strings/string_util.h"
- #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
- #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h"
-@@ -148,7 +148,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+@@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
return info;
}
@@ -18,7 +18,7 @@
device_signals::SignalsAggregationRequest CreateAggregationRequest(
device_signals::SignalName signal_name) {
-@@ -209,7 +209,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
@@ -27,7 +27,7 @@
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -635,7 +635,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
}
#endif
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
index d996bfb604a4..1b6af07ff2ae 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
-@@ -597,7 +597,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
+@@ -600,7 +600,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
index 983190ecfd70..50380b6a27ff 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -1,11 +1,11 @@
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/extensions/api/tabs/tabs_api.cc
-@@ -861,7 +861,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
- // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as
+@@ -836,7 +836,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
// minimized.
// TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1410400): Find a fix for wayland as well.
-
- // Must be defined inside IS_LINUX to compile on windows/mac.
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
+ if (new_window->initial_show_state() == ui::SHOW_STATE_MINIMIZED) {
+ new_window->window()->Minimize();
+ }
diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
index 2874d53f5e72..937b156220fd 100644
--- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
+++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
@@ -1,6 +1,6 @@
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -324,7 +324,7 @@ const struct {
+@@ -316,7 +316,7 @@ const struct {
FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 0db413820030..c83088966134 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,24 @@
---- chrome/browser/flag_descriptions.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -7420,7 +7420,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
+@@ -2895,7 +2895,7 @@ const char kCbdTimeframeRequiredDescription[] =
+ "value to the list.";
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ const char kPolicyIndicationForManagedDefaultSearchName[] =
+ "Enable policy indication for managed Default Search provider";
+ const char kPolicyIndicationForManagedDefaultSearchDescription[] =
+@@ -3213,7 +3213,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
+ "but in the same SiteInstanceGroup, and thus the same process.";
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
+ const char kSiteSearchSettingsPolicyDescription[] =
+ "Allow site search engines to be defined by the SiteSearchSettings policy.";
+@@ -7387,7 +7387,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
"Enables sharing common areas of icudtl.dat between Ash and Lacros.";
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -9,8 +27,17 @@
const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
const char kGetAllScreensMediaDescription[] =
"When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7660,7 +7660,7 @@ const char kSearchWebInSidePanelDescription[] =
- // Random platform combinations -----------------------------------------------
+@@ -7633,7 +7633,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[]
+
+ // Linux -----------------------------------------------------------------------
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kOzonePlatformHintChoiceDefault[] = "Default";
+ const char kOzonePlatformHintChoiceAuto[] = "Auto";
+ const char kOzonePlatformHintChoiceX11[] = "X11";
+@@ -7681,7 +7681,7 @@ const char kZeroCopyVideoCaptureDescription[] =
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
@@ -18,7 +45,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
-@@ -7669,7 +7669,7 @@ const char kQuickCommandsDescription[] =
+@@ -7690,7 +7690,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +54,7 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
-@@ -7684,7 +7684,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
+@@ -7705,7 +7705,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
"instead of JSON.";
#endif
@@ -36,16 +63,7 @@
const char kEnableNetworkServiceSandboxName[] =
"Enable the network service sandbox.";
const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7708,7 +7708,7 @@ const char kWebShareDescription[] =
- "platforms.";
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
- const char kOzonePlatformHintChoiceDefault[] = "Default";
- const char kOzonePlatformHintChoiceAuto[] = "Auto";
- const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7728,7 +7728,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -7737,7 +7737,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -54,8 +72,8 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -7742,7 +7742,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
- "storage and requests initial sync.";
+@@ -7757,7 +7757,7 @@ const char kRestartToGainAccessToKeychainDescription[]
+ "to restart Chrome to gain access to computer's password manager.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -63,7 +81,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -7848,7 +7848,7 @@ const char kElementCaptureDescription[] =
+@@ -7858,7 +7858,7 @@ const char kElementCaptureDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -72,7 +90,7 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
-@@ -7900,7 +7900,7 @@ const char kComposeName[] = "CCO Edits";
+@@ -7910,7 +7910,7 @@ const char kComposeName[] = "CCO Edits";
const char kComposeDescription[] = "Enables CCO editing feature";
#endif // BUILDFLAG(ENABLE_COMPOSE)
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index f0f760692a32..0e1c8455992d 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,24 @@
---- chrome/browser/flag_descriptions.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/flag_descriptions.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -4257,7 +4257,7 @@ extern const char kLacrosMergeIcuDataFileName[];
+@@ -1665,7 +1665,7 @@ extern const char kCbdTimeframeRequiredName[];
+ extern const char kCbdTimeframeRequiredDescription[];
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ extern const char kPolicyIndicationForManagedDefaultSearchName[];
+ extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
+ #endif
+@@ -1847,7 +1847,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
+ extern const char kSiteInstanceGroupsForDataUrlsDescription[];
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ extern const char kSiteSearchSettingsPolicyName[];
+ extern const char kSiteSearchSettingsPolicyDescription[];
+ #endif
+@@ -4242,7 +4242,7 @@ extern const char kLacrosMergeIcuDataFileName[];
extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -9,8 +27,17 @@
extern const char kGetAllScreensMediaName[];
extern const char kGetAllScreensMediaDescription[];
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4397,14 +4397,14 @@ extern const char kSearchWebInSidePanelDescription[];
- // Random platform combinations -----------------------------------------------
+@@ -4382,7 +4382,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
+
+ // Linux ---------------------------------------------------------------------
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kOzonePlatformHintChoiceDefault[];
+ extern const char kOzonePlatformHintChoiceAuto[];
+ extern const char kOzonePlatformHintChoiceX11[];
+@@ -4415,14 +4415,14 @@ extern const char kZeroCopyVideoCaptureDescription[];
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
@@ -26,26 +53,17 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -4414,7 +4414,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -4432,7 +4432,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kOzonePlatformHintChoiceDefault[];
- extern const char kOzonePlatformHintChoiceAuto[];
- extern const char kOzonePlatformHintChoiceX11[];
-@@ -4424,7 +4424,7 @@ extern const char kOzonePlatformHintName[];
- extern const char kOzonePlatformHintDescription[];
- #endif // BUILDFLAG(IS_LINUX)
-
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
-@@ -4432,13 +4432,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
- extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
+@@ -4443,13 +4443,13 @@ extern const char kRestartToGainAccessToKeychainName[]
+ extern const char kRestartToGainAccessToKeychainDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -60,7 +78,7 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4449,7 +4449,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
+@@ -4460,7 +4460,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
extern const char kEnableProtoApiForClassifyUrlDescription[];
#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
@@ -69,7 +87,7 @@
extern const char kEnableNetworkServiceSandboxName[];
extern const char kEnableNetworkServiceSandboxDescription[];
-@@ -4531,7 +4531,7 @@ extern const char kElementCaptureDescription[];
+@@ -4537,7 +4537,7 @@ extern const char kElementCaptureDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -78,7 +96,7 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
-@@ -4567,7 +4567,7 @@ extern const char kComposeName[];
+@@ -4573,7 +4573,7 @@ extern const char kComposeName[];
extern const char kComposeDescription[];
#endif // BUILDFLAG(ENABLE_COMPOSE)
diff --git a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
index b8d9430e0c5b..e80a7f933701 100644
--- a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
+++ b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/headless/headless_mode_util.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/headless/headless_mode_util.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/headless/headless_mode_util.cc
@@ -18,7 +18,7 @@
#include "chrome/common/chrome_switches.h"
@@ -9,7 +9,7 @@
#include "ui/gl/gl_switches.h" // nogncheck
#include "ui/ozone/public/ozone_switches.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX)
-@@ -81,7 +81,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
+@@ -86,7 +86,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand
command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir());
}
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
index 64a310f4e5dd..d2e7bfafba61 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
@@ -21,7 +21,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -9,8 +9,8 @@
#include "base/functional/callback.h"
#include "content/public/browser/desktop_capture.h"
#endif
-@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
- root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
+@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<raw_ptr<aura::Window, V
+ DestructorAtExit root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
} // namespace
-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
@@ -18,7 +18,7 @@
namespace {
base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
-@@ -78,7 +78,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
+@@ -79,7 +79,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
return stream_devices_set;
}
@@ -27,7 +27,7 @@
blink::mojom::StreamDevicesSetPtr EnumerateScreens(
blink::mojom::MediaStreamType stream_type) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
+@@ -130,7 +130,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
root_windows_for_testing_.Get() = std::move(root_windows);
}
@@ -36,7 +36,7 @@
void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
std::unique_ptr<webrtc::DesktopCapturer> capturer) {
g_desktop_capturer_for_testing.Get() = std::move(capturer);
-@@ -142,7 +142,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
+@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
ScreensCallback screens_callback) const {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h b/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
index 9f7430e5d302..c9c749f5e897 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.h
-@@ -21,7 +21,7 @@ namespace aura {
+@@ -20,7 +20,7 @@ namespace aura {
class Window;
}
@@ -10,9 +10,9 @@
class DesktopCapturer;
}
@@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu
-
#if BUILDFLAG(IS_CHROMEOS_ASH)
- static void SetRootWindowsForTesting(std::vector<aura::Window*> root_windows);
+ static void SetRootWindowsForTesting(
+ std::vector<raw_ptr<aura::Window, VectorExperimental>> root_windows);
-#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
static void SetDesktopCapturerForTesting(
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
new file mode 100644
index 000000000000..7c249c855c29
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc
+@@ -92,7 +92,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur
+ } else {
+ return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare);
+ }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (request_source == Params::RequestSource::kCast) {
+ return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast);
+ } else {
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 5b9d91ff512c..9e7afddfe6fc 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -78,8 +78,10 @@
+@@ -79,8 +79,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
-@@ -104,7 +106,7 @@
+@@ -105,7 +107,7 @@
#include "chromeos/crosapi/cpp/crosapi_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -21,7 +21,7 @@
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -113,7 +115,7 @@
+@@ -114,7 +116,7 @@
#include "components/user_manager/user_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -30,7 +30,7 @@
#include "components/power_metrics/system_power_monitor.h"
#endif
-@@ -837,7 +839,7 @@ void RecordStartupMetrics() {
+@@ -838,7 +840,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -39,7 +39,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1145,11 +1147,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -1142,11 +1144,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
index e94fa9934113..193b5133c7b2 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
-@@ -33,7 +33,7 @@ class PowerMetricsReporter;
+@@ -28,7 +28,7 @@ class PowerMetricsReporter;
class ProcessMonitor;
#endif
@@ -9,7 +9,7 @@
class PressureMetricsReporter;
#endif // BUILDFLAG(IS_LINUX)
-@@ -131,7 +131,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
+@@ -115,7 +115,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_;
#endif // !BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index 78a674eae822..dea62848186b 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -185,7 +185,7 @@
+@@ -191,7 +191,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@@ -9,7 +9,7 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
-@@ -202,7 +202,7 @@
+@@ -208,7 +208,7 @@
#include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
#endif
@@ -18,7 +18,25 @@
#include "chrome/browser/metrics/bluetooth_metrics_provider.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -806,7 +806,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -581,7 +581,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
+
+ #if !BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -767,7 +767,7 @@ void ChromeMetricsServiceClient::Initialize() {
+ RegisterUKMProviders();
+ }
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
+ base::SequencedTaskRunner::GetCurrentDefault());
+ #endif
+@@ -814,7 +814,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@@ -27,7 +45,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
-@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -899,7 +899,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@@ -36,7 +54,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
-@@ -1004,7 +1004,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -1009,7 +1009,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@@ -45,7 +63,16 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
-@@ -1204,7 +1204,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -1174,7 +1174,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+ }
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ // Begin initializing the structured metrics system. Initialization must wait
+ // until a profile is added, because it reads keys stored within the user's
+ // cryptohome. We only initialize for profiles that are valid candidates
+@@ -1205,7 +1205,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@@ -54,3 +81,12 @@
// This creates the DesktopProfileSessionDurationsServices if it didn't exist
// already.
metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
+@@ -1548,7 +1548,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
+ recorder =
+ std::make_unique<metrics::structured::AshStructuredMetricsRecorder>(
+ cros_system_profile_provider_.get());
+-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+
+ // Make sure that Structured Metrics recording delegates have been created
+ // before the service is created. This is handled in other places for ChromeOS
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index 25182c1f0a10..d445f0c13404 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -92,7 +92,7 @@
@@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/branded_strings.h"
#include "ui/base/l10n/l10n_util.h"
-@@ -136,7 +136,7 @@ SystemNetworkContextManager* g_system_network_context_
+@@ -137,7 +137,7 @@ SystemNetworkContextManager* g_system_network_context_
// received a failed launch for a sandboxed network service.
bool g_previously_failed_to_launch_sandboxed_service = false;
@@ -18,7 +18,7 @@
// Whether kerberos library loading will work in the network service due to the
// sandbox.
bool g_network_service_will_allow_gssapi_library_load = false;
-@@ -144,7 +144,7 @@ bool g_network_service_will_allow_gssapi_library_load
+@@ -145,7 +145,7 @@ bool g_network_service_will_allow_gssapi_library_load
const char* kGssapiDesiredPref =
#if BUILDFLAG(IS_CHROMEOS)
prefs::kKerberosEnabled;
@@ -27,7 +27,7 @@
prefs::kReceivedHttpAuthNegotiateHeader;
#endif
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -190,7 +190,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -191,7 +191,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@@ -36,7 +36,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -205,7 +205,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -206,7 +206,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
#endif // BUILDFLAG(IS_ANDROID)
@@ -45,7 +45,7 @@
auth_dynamic_params->allow_gssapi_library_load =
local_state->GetBoolean(kGssapiDesiredPref);
#endif // BUILDFLAG(IS_CHROMEOS)
-@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -216,7 +216,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
void OnNewHttpAuthDynamicParams(
network::mojom::HttpAuthDynamicParamsPtr& params) {
@@ -54,7 +54,7 @@
// The kerberos library is incompatible with the network service sandbox, so
// if library loading is now enabled, the network service needs to be
// restarted. It will be restarted unsandboxed because is
-@@ -257,11 +257,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
+@@ -258,11 +258,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
if (g_previously_failed_to_launch_sandboxed_service) {
return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
}
@@ -68,7 +68,7 @@
// The network service sandbox and the kerberos library are incompatible.
// If kerberos is enabled by policy, disable the network service sandbox.
if (g_network_service_will_allow_gssapi_library_load ||
-@@ -277,7 +277,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
+@@ -278,7 +278,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal()
}
#endif // BUILDFLAG(IS_WIN)
@@ -77,7 +77,7 @@
if (local_state &&
local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
-@@ -472,7 +472,7 @@ void SystemNetworkContextManager::DeleteInstance() {
+@@ -508,7 +508,7 @@ void SystemNetworkContextManager::DeleteInstance() {
g_system_network_context_manager = nullptr;
}
@@ -86,7 +86,7 @@
SystemNetworkContextManager::GssapiLibraryLoadObserver::
GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
: owner_(owner) {}
-@@ -530,7 +530,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -566,7 +566,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@@ -95,7 +95,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -544,7 +544,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -580,7 +580,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
auth_pref_callback);
#endif // BUILDFLAG(IS_ANDROID)
@@ -104,7 +104,7 @@
pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -570,7 +570,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -606,7 +606,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -113,7 +113,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
-@@ -625,7 +625,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -661,7 +661,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -122,7 +122,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -649,7 +649,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -685,7 +685,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -131,7 +131,7 @@
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
-@@ -658,11 +658,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -694,11 +694,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
@@ -145,7 +145,7 @@
registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
#endif // BUILDFLAG(IS_LINUX)
-@@ -715,7 +715,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -751,7 +751,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
@@ -154,7 +154,7 @@
gssapi_library_loader_observer_.Install(network_service);
#endif // BUILDFLAG(IS_LINUX)
-@@ -929,7 +929,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
+@@ -954,7 +954,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
break;
}
@@ -163,7 +163,7 @@
if (!enabled) {
g_network_service_will_allow_gssapi_library_load = true;
}
-@@ -1010,7 +1010,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
+@@ -1040,7 +1040,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
index 513b5f55a2c8..fa9e4e69fc2d 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/net/system_network_context_manager.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/net/system_network_context_manager.h
-@@ -185,7 +185,7 @@ class SystemNetworkContextManager {
+@@ -200,7 +200,7 @@ class SystemNetworkContextManager {
class URLLoaderFactoryForSystem;
class NetworkProcessLaunchWatcher;
@@ -9,7 +9,7 @@
class GssapiLibraryLoadObserver
: public network::mojom::GssapiLibraryLoadObserver {
public:
-@@ -221,7 +221,7 @@ class SystemNetworkContextManager {
+@@ -236,7 +236,7 @@ class SystemNetworkContextManager {
void UpdateExplicitlyAllowedNetworkPorts();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,12 +18,12 @@
// Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
// pref to the enforcement state.
void UpdateEnforceLocalAnchorConstraintsEnabled();
-@@ -269,7 +269,7 @@ class SystemNetworkContextManager {
+@@ -284,7 +284,7 @@ class SystemNetworkContextManager {
- static absl::optional<bool> certificate_transparency_enabled_for_testing_;
+ static std::optional<bool> certificate_transparency_enabled_for_testing_;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
GssapiLibraryLoadObserver gssapi_library_loader_observer_{this};
#endif // BUILDFLAG(IS_LINUX)
- };
+
diff --git a/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
index d0f0036afb0f..47d709028e69 100644
--- a/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
+++ b/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
@@ -1,15 +1,6 @@
---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2022-10-24 13:33:33 UTC
+--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/new_tab_page/new_tab_page_util.cc
-@@ -11,7 +11,7 @@
-
- namespace {
- bool IsOsSupportedForRecipe() {
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return true;
- #else
- return false;
-@@ -27,7 +27,7 @@ bool IsOsSupportedForCart() {
+@@ -20,7 +20,7 @@ bool IsOsSupportedForCart() {
}
bool IsOsSupportedForDrive() {
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
new file mode 100644
index 000000000000..4c978277ee20
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/password_manager/chrome_password_manager_client.cc
+@@ -675,7 +675,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
+ }
+
+ void ChromePasswordManagerClient::NotifyKeychainError() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ PasswordsClientUIDelegate* manage_passwords_ui_controller =
+ PasswordsClientUIDelegateFromWebContents(web_contents());
+ manage_passwords_ui_controller->OnKeychainError();
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
index 8d6639ac91fb..52b55e79e669 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
-@@ -133,7 +133,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
+@@ -136,7 +136,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_permissions_chrome__permissions__client.cc b/www/chromium/files/patch-chrome_browser_permissions_chrome__permissions__client.cc
new file mode 100644
index 000000000000..a0ed7a0c68ed
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_permissions_chrome__permissions__client.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/permissions/chrome_permissions_client.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/permissions/chrome_permissions_client.cc
+@@ -225,7 +225,7 @@ void ChromePermissionsClient::AreSitesImportant(
+ bool ChromePermissionsClient::IsCookieDeletionDisabled(
+ content::BrowserContext* browser_context,
+ const GURL& origin) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ if (!base::FeatureList::IsEnabled(
+ supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)) {
+ return false;
diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
index 0a36da452f03..f370402d0a81 100644
--- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/platform_util_linux.cc.orig 2023-09-13 12:11:42 UTC
+--- chrome/browser/platform_util_linux.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/platform_util_linux.cc
-@@ -299,7 +299,9 @@ void RunCommand(const std::string& command,
+@@ -300,7 +300,9 @@ void RunCommand(const std::string& command,
base::LaunchOptions options;
options.current_directory = working_directory;
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index 0fe16bce41d6..00d258718861 100644
--- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -223,19 +223,20 @@
+@@ -224,19 +224,20 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -24,7 +24,7 @@
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ||
-@@ -246,7 +247,7 @@
+@@ -247,7 +248,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -33,7 +33,7 @@
#include "chrome/browser/policy/battery_saver_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -835,7 +836,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -837,7 +838,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -42,7 +42,7 @@
{ key::kRequireOnlineRevocationChecksForLocalAnchors,
prefs::kCertRevocationCheckingRequiredLocalAnchors,
base::Value::Type::BOOLEAN },
-@@ -845,7 +846,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -847,7 +848,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -51,8 +51,8 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
-@@ -1577,7 +1578,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
- base::Value::Type::LIST },
+@@ -1586,7 +1587,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@@ -60,7 +60,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
-@@ -1622,7 +1623,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1631,7 +1632,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_WIN)
@@ -69,7 +69,7 @@
{ key::kNetworkServiceSandboxEnabled,
prefs::kNetworkServiceSandboxEnabled,
base::Value::Type::BOOLEAN },
-@@ -1648,12 +1649,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1657,12 +1658,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -84,7 +84,7 @@
{ key::kUnmanagedDeviceSignalsConsentFlowEnabled,
device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
base::Value::Type::BOOLEAN },
-@@ -1662,7 +1663,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1671,7 +1672,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -93,7 +93,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
-@@ -1675,7 +1676,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1684,7 +1685,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -102,7 +102,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
-@@ -1776,7 +1777,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1785,7 +1786,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@@ -111,7 +111,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
-@@ -1875,7 +1876,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1883,7 +1884,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -120,7 +120,7 @@
// TODO(crbug.com/1454054): replace the
// kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that
// matches the name of the new `getAllScreensMedia` API.
-@@ -1884,7 +1885,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1892,7 +1893,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::LIST },
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
@@ -129,7 +129,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
-@@ -1909,7 +1910,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1917,7 +1918,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -138,7 +138,7 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
-@@ -1985,7 +1986,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1981,7 +1982,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -147,7 +147,7 @@
{ key::kTabDiscardingExceptions,
performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
base::Value::Type::LIST },
-@@ -2013,7 +2014,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -2009,7 +2010,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kCloudApAuthEnabled,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN)
@@ -156,7 +156,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
-@@ -2053,7 +2054,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -2044,7 +2045,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedPrivateNetworkAccessRestrictionsEnabled,
base::Value::Type::BOOLEAN },
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -165,16 +165,16 @@
{ key::kExtensionInstallTypeBlocklist,
extensions::pref_names::kExtensionInstallTypeBlocklist,
base::Value::Type::LIST},
-@@ -2165,7 +2166,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2171,7 +2172,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
// Policies for all platforms - End
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
handlers->AddHandler(
- std::make_unique<performance_manager::HighEfficiencyPolicyHandler>());
+ std::make_unique<performance_manager::MemorySaverPolicyHandler>());
// Note: This needs to be created after `DefaultSearchPolicyHandler`.
-@@ -2364,7 +2365,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2370,7 +2371,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -183,7 +183,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
-@@ -2422,7 +2423,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2428,7 +2429,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@@ -192,7 +192,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
handlers->AddHandler(
-@@ -2486,7 +2487,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2492,7 +2493,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
signin_legacy_policies;
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -201,7 +201,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
-@@ -2848,7 +2849,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2850,7 +2851,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -210,7 +210,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -2856,7 +2857,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2858,7 +2859,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -219,7 +219,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
-@@ -2873,7 +2874,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2875,7 +2876,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
/*new_policy_handler=*/std::make_unique<
first_party_sets::FirstPartySetsOverridesPolicyHandler>(
policy::key::kRelatedWebsiteSetsOverrides, chrome_schema)));
@@ -228,7 +228,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -2898,7 +2899,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2900,7 +2901,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
base::Value::Type::BOOLEAN)));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index 933570e56035..206d6c869b04 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -493,18 +493,18 @@
+@@ -486,18 +486,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -22,7 +22,7 @@
#include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
#endif
-@@ -536,7 +536,7 @@
+@@ -529,7 +529,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@@ -31,7 +31,7 @@
#include "ui/color/system_theme.h"
#endif
-@@ -660,7 +660,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
+@@ -567,7 +567,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
@@ -40,16 +40,16 @@
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -1020,7 +1020,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- // Deprecated 02/2023.
+@@ -972,7 +972,7 @@ const char kBorealisVmTokenHash[] = "borealis.vm_token
+ // key).
+ void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
+ // Deprecated 02/2023.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -2029,12 +2029,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1986,12 +1986,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -64,10 +64,10 @@
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
enterprise_signin::RegisterProfilePrefs(registry);
#endif
-@@ -2194,7 +2194,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -2121,7 +2121,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
+ // Please don't delete the preceding line. It is used by PRESUBMIT.py.
- // Added 02/2023
+ // Added 02/2023.
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
local_state->ClearPref(kWebAppsUrlHandlerInfo);
diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
index f079aece12d5..b013578814ee 100644
--- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
@@ -1,7 +1,7 @@
---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
-@@ -33,7 +33,7 @@
- #include "printing/buildflags/buildflags.h"
+@@ -34,7 +34,7 @@
+ #include "printing/printing_context.h"
#include "printing/printing_features.h"
-#if BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
#include "content/public/common/content_switches.h"
#endif
-@@ -849,7 +849,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
+@@ -853,7 +853,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
host.BindNewPipeAndPassReceiver(),
content::ServiceProcessHost::Options()
.WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
@@ -18,7 +18,7 @@
.WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
#endif
.Pass());
-@@ -1022,7 +1022,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -1026,7 +1026,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:
@@ -26,4 +26,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// No need to update if there were other query with UI clients.
if (HasQueryWithUiClientForRemoteId(remote_id)) {
- return absl::nullopt;
+ return std::nullopt;
diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index 4261f53b5dd9..1e2565d4dd9c 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,15 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -402,18 +402,18 @@
+@@ -314,7 +314,7 @@
+ #include "chromeos/constants/chromeos_features.h"
+ #endif
+
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
+ #endif
+
+@@ -409,18 +409,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -22,7 +31,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
-@@ -644,7 +644,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -647,7 +647,7 @@ void ChromeBrowserMainExtraPartsProfiles::
DiceBoundSessionCookieServiceFactory::GetInstance();
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
@@ -31,7 +40,7 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
browser_sync::UserEventServiceFactory::GetInstance();
-@@ -764,29 +764,29 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -765,29 +765,29 @@ void ChromeBrowserMainExtraPartsProfiles::
enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -67,7 +76,7 @@
enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -904,7 +904,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -911,7 +911,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -76,7 +85,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
-@@ -1003,7 +1003,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1017,7 +1017,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(IS_CHROMEOS)
policy::PolicyCertServiceFactory::GetInstance();
#endif
@@ -85,12 +94,21 @@
policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
#endif
policy::UserCloudPolicyInvalidatorFactory::GetInstance();
-@@ -1047,7 +1047,7 @@ void ChromeBrowserMainExtraPartsProfiles::
- #if !BUILDFLAG(IS_ANDROID)
- ProfileThemeUpdateServiceFactory::GetInstance();
+@@ -1058,7 +1058,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
+ ProfileStatisticsFactory::GetInstance();
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ProfileTokenWebSigninInterceptorFactory::GetInstance();
#endif
#if !BUILDFLAG(IS_ANDROID)
+@@ -1076,7 +1076,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ #endif
+ ReduceAcceptLanguageFactory::GetInstance();
+ RendererUpdaterFactory::GetInstance();
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ reporting::ManualTestHeartbeatEventFactory::GetInstance();
+ #endif
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
index 4c09d75ecf98..231bd9596e6b 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_impl.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/profiles/profile_impl.cc
-@@ -260,6 +260,10 @@
+@@ -261,6 +261,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
-@@ -605,7 +609,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
+@@ -592,7 +596,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
#else
{
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -20,7 +20,7 @@
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileAttributesEntry* entry =
profile_manager->GetProfileAttributesStorage()
-@@ -884,7 +888,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
+@@ -873,7 +877,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
index 13e8ab242934..a57a58b41513 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profiles_state.cc.orig 2023-05-31 08:12:17 UTC
+--- chrome/browser/profiles/profiles_state.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/profiles/profiles_state.cc
-@@ -182,7 +182,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
+@@ -195,7 +195,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
PrefService* local_state,
bool show_warning) {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
diff --git a/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts
deleted file mode 100644
index 26db99026dbb..000000000000
--- a/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2023-02-08 09:03:45 UTC
-+++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
--// <if expr="is_linux or is_chromeos">
-+// <if expr="is_posix or is_chromeos">
- import './strings.m.js';
-
- import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
-@@ -121,7 +121,7 @@ function androidHandler() {
- }
- // </if>
-
--// <if expr="is_linux or is_chromeos">
-+// <if expr="is_posix or is_chromeos">
-
- /**
- * Adds a status row that reports either Yes or No.
-@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => {
- // <if expr="is_android">
- androidHandler();
- // </if>
-- // <if expr="is_linux or is_chromeos">
-+ // <if expr="is_posix or is_chromeos">
- linuxHandler();
- // </if>
- });
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
deleted file mode 100644
index 1b7fd97144a4..000000000000
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2023-08-17 07:33:31 UTC
-+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts
-@@ -18,7 +18,7 @@ export interface AppearanceBrowserProxy {
-
- useDefaultTheme(): void;
-
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- useGtkTheme(): void;
- useQtTheme(): void;
- // </if>
-@@ -48,7 +48,7 @@ export class AppearanceBrowserProxyImpl implements App
- chrome.send('useDefaultTheme');
- }
-
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- useGtkTheme() {
- chrome.send('useGtkTheme');
- }
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
deleted file mode 100644
index 51234e40b0e9..000000000000
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-09-13 12:11:42 UTC
-+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -27,7 +27,7 @@
- <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
- label="$i18n{themes}" sub-label="[[themeSublabel_]]"
- on-click="openThemeUrl_" external></cr-link-row>
--<if expr="not is_linux">
-+<if expr="not is_posix">
- <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
- <div class="separator"></div>
- <cr-button id="useDefault" on-click="onUseDefaultClick_">
-@@ -35,7 +35,7 @@
- </cr-button>
- </template>
- </if>
--<if expr="is_linux">
-+<if expr="is_posix">
- <div class="settings-row continuation"
- hidden="[[!showThemesSecondary_(
- prefs.extensions.theme.id.value, systemTheme_)]]"
-@@ -172,7 +172,7 @@
- </div>
- </template>
-
--<if expr="is_linux">
-+<if expr="is_posix">
- <div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div>
- <settings-toggle-button
- hidden="[[!showCustomChromeFrame_]]"
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
deleted file mode 100644
index 786258e411e5..000000000000
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
+++ /dev/null
@@ -1,65 +0,0 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2023-09-13 12:11:42 UTC
-+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
-@@ -72,7 +72,7 @@ export interface SettingsAppearancePageElement {
- export enum SystemTheme {
- // Either classic or web theme.
- DEFAULT = 0,
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- GTK = 1,
- QT = 2,
- // </if>
-@@ -193,7 +193,7 @@ export class SettingsAppearancePageElement extends
- 'prefs.autogenerated.theme.policy.color.controlledBy)',
- },
-
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- /**
- * Whether to show the "Custom Chrome Frame" setting.
- */
-@@ -229,7 +229,7 @@ export class SettingsAppearancePageElement extends
- 'themeChanged_(' +
- 'prefs.extensions.theme.id.value, systemTheme_, isForcedTheme_)',
-
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- 'systemThemePrefChanged_(prefs.extensions.theme.system_theme.value)',
- // </if>
- ];
-@@ -253,7 +253,7 @@ export class SettingsAppearancePageElement extends
- private isForcedTheme_: boolean;
- private showHoverCardImagesOption_: boolean;
-
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- private showCustomChromeFrame_: boolean;
- // </if>
-
-@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends
- this.appearanceBrowserProxy_.useDefaultTheme();
- }
-
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- private systemThemePrefChanged_(systemTheme: SystemTheme) {
- this.systemTheme_ = systemTheme;
- }
-@@ -427,7 +427,7 @@ export class SettingsAppearancePageElement extends
- }
-
- let i18nId;
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- switch (this.systemTheme_) {
- case SystemTheme.GTK:
- i18nId = 'gtkTheme';
-@@ -440,7 +440,7 @@ export class SettingsAppearancePageElement extends
- break;
- }
- // </if>
-- // <if expr="not is_linux">
-+ // <if expr="not is_posix">
- i18nId = 'chooseFromWebStore';
- // </if>
- this.themeSublabel_ = this.i18n(i18nId);
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
deleted file mode 100644
index c370a29b32bb..000000000000
--- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/resources/settings/route.ts.orig 2024-01-30 07:53:34 UTC
-+++ chrome/browser/resources/settings/route.ts
-@@ -245,7 +245,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
- r.ACCESSIBILITY = r.ADVANCED.createSection(
- '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));
-
-- // <if expr="is_linux">
-+ // <if expr="is_posix">
- r.CAPTIONS = r.ACCESSIBILITY.createChild('/captions');
- // </if>
-
diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
deleted file mode 100644
index 4ef5cd50b516..000000000000
--- a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-07-16 15:47:57 UTC
-+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
-@@ -290,7 +290,7 @@
- autofocus="[[isModalDialog_]]">
- $i18n{syncConfirmationConfirmLabel}
- </cr-button>
-- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
-+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
- <cr-button id="settingsButton" on-click="onGoToSettings_"
- disabled="[[anyButtonClicked_]]" consent-confirmation>
- $i18n{syncConfirmationSettingsLabel}
-@@ -300,7 +300,7 @@
- disabled="[[anyButtonClicked_]]">
- $i18n{syncConfirmationUndoLabel}
- </cr-button>
-- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
-+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
- <cr-button id="settingsButton" on-click="onGoToSettings_"
- disabled="[[anyButtonClicked_]]" consent-confirmation>
- $i18n{syncConfirmationSettingsLabel}
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
index 675829be7946..f2286802ae93 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -21,7 +21,7 @@
#include "content/public/browser/browser_thread.h"
@@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
-@@ -318,7 +318,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
+@@ -324,7 +324,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
new file mode 100644
index 000000000000..ad2376ea9315
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
@@ -0,0 +1,29 @@
+--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/screen_ai/screen_ai_install_state.cc
+@@ -23,7 +23,7 @@
+ #include "components/services/screen_ai/public/cpp/utilities.h"
+ #include "content/public/browser/browser_thread.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/cpu.h"
+ #include "base/files/file_util.h"
+ #endif
+@@ -39,7 +39,7 @@ const char kMinExpectedVersion[] = "121.1";
+ bool IsDeviceCompatible() {
+ // Check if the CPU has the required instruction set to run the Screen AI
+ // library.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (!base::CPU().has_sse41()) {
+ return false;
+ }
+@@ -284,7 +284,7 @@ void ScreenAIInstallState::ResetForTesting() {
+
+ void ScreenAIInstallState::SetComponentFolderForTesting() {
+ CHECK_IS_TEST();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Set the path to the ScreenAI test files. For more details, see the
+ // `screen_ai_test_files` rule in the accessibility_common BUILD file.
+ base::FilePath screenai_library_path =
diff --git a/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__client__side__trial.cc b/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__client__side__trial.cc
index a0c4c521fb55..134908a9fb0b 100644
--- a/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__client__side__trial.cc
+++ b/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__client__side__trial.cc
@@ -1,6 +1,6 @@
---- chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc
-@@ -133,7 +133,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* regis
+@@ -132,7 +132,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* regis
void SetUpIfNeeded(const base::FieldTrial::EntropyProvider& entropy_provider,
base::FeatureList* feature_list,
PrefService* local_state) {
diff --git a/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__service__factory.cc b/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__service__factory.cc
new file mode 100644
index 000000000000..6772968fcc25
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__service__factory.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc
+@@ -11,7 +11,7 @@
+ #include "components/country_codes/country_codes.h"
+ #include "components/search_engines/search_engine_choice/search_engine_choice_service.h"
+
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/browser_process.h"
+ #include "components/variations/service/variations_service.h"
+ #endif
+@@ -21,7 +21,7 @@ namespace {
+ std::unique_ptr<KeyedService> BuildSearchEngineChoiceService(
+ content::BrowserContext* context) {
+ int variations_country_id = country_codes::kCountryIDUnknown;
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (g_browser_process->variations_service()) {
+ variations_country_id =
+ country_codes::CountryStringToCountryID(base::ToUpperASCII(
diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
index 608073247f7b..095ab6780e60 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/sharing/sharing_device_registration.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/sharing/sharing_device_registration.cc
-@@ -326,7 +326,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
+@@ -328,7 +328,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
bool SharingDeviceRegistration::IsRemoteCopySupported() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
index 77f951f7c396..d3f31c85c9ce 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-10-24 13:33:33 UTC
+--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/sharing/sharing_handler_registry_impl.cc
@@ -23,7 +23,7 @@
#endif // BUILDFLAG(IS_ANDROID)
@@ -9,7 +9,7 @@
#include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS)
-@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
+@@ -78,7 +78,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
index 2746ca27f70f..2678c8774eb1 100644
--- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-07-16 15:47:57 UTC
+--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
-@@ -44,7 +44,7 @@
+@@ -47,7 +47,7 @@
#include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
#elif BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h"
#endif
-@@ -64,7 +64,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
+@@ -67,7 +67,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
#elif BUILDFLAG(IS_ANDROID)
return std::make_unique<SupervisedUserWebContentHandlerImpl>(
web_contents, frame_id, navigation_id);
diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
index dac5d4eb703a..31b9a0d2ed4e 100644
--- a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sync/sync_service_factory.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/sync/sync_service_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/sync/sync_service_factory.cc
@@ -84,7 +84,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN)
-@@ -131,7 +131,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -126,7 +126,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
// TODO(crbug.com/1052397): Reassess whether the following block needs to be
// included in lacros-chrome once build flag switch of lacros-chrome is
// complete.
@@ -18,7 +18,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
-@@ -258,7 +258,7 @@ SyncServiceFactory::SyncServiceFactory()
+@@ -260,7 +260,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ProfilePasswordStoreFactory::GetInstance());
DependsOn(PowerBookmarkServiceFactory::GetInstance());
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index 03e90c59964b..87e0c02326ba 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig 2023-05-31 08:12:17 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/task_manager/sampling/task_group.h
@@ -44,7 +44,7 @@ constexpr int kUnsupportedVMRefreshFlags =
REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
@@ -9,7 +9,7 @@
REFRESH_TYPE_FD_COUNT |
#endif
REFRESH_TYPE_HARD_FAULTS;
-@@ -150,7 +150,7 @@ class TaskGroup {
+@@ -152,7 +152,7 @@ class TaskGroup {
}
#endif // BUILDFLAG(ENABLE_NACL)
@@ -18,7 +18,7 @@
int open_fd_count() const { return open_fd_count_; }
void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; }
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -170,7 +170,7 @@ class TaskGroup {
+@@ -172,7 +172,7 @@ class TaskGroup {
void RefreshNaClDebugStubPort(int child_process_unique_id);
void OnRefreshNaClDebugStubPortDone(int port);
#endif
@@ -27,7 +27,7 @@
void OnOpenFdCountRefreshDone(int open_fd_count);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -243,7 +243,7 @@ class TaskGroup {
+@@ -244,7 +244,7 @@ class TaskGroup {
#if BUILDFLAG(ENABLE_NACL)
int nacl_debug_stub_port_;
#endif // BUILDFLAG(ENABLE_NACL)
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index f6fdb90e023f..3316b458e4e7 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -217,7 +217,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -218,7 +218,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
}
int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
index 820547336989..688cfbb747e0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
+++ b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/actions/chrome_action_id.h.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/actions/chrome_action_id.h
-@@ -526,7 +526,7 @@
+@@ -527,7 +527,7 @@
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \
E(kActionContentContextQuickAnswersInlineQuery, \
IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY)
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h
index 4e461e950a09..e698696bd0df 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser.h
@@ -1,7 +1,7 @@
---- chrome/browser/ui/browser.h.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/ui/browser.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/browser.h
-@@ -293,7 +293,7 @@ class Browser : public TabStripModelObserver,
- absl::optional<int64_t> display_id;
+@@ -309,7 +309,7 @@ class Browser : public TabStripModelObserver,
+ std::optional<int64_t> display_id;
#endif
-#if BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
index b5f7a7a5a11b..77bab1fbbff0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/chrome_pages.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -80,7 +80,7 @@
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
-@@ -702,7 +702,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
+@@ -700,7 +700,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc
deleted file mode 100644
index c01647da9ba0..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- chrome/browser/ui/omnibox/chrome_omnibox_client.cc.orig 2023-09-13 12:11:42 UTC
-+++ chrome/browser/ui/omnibox/chrome_omnibox_client.cc
-@@ -474,10 +474,18 @@ void ChromeOmniboxClient::OnAutocompleteAccept(
- alternative_nav_match);
-
- // Store the details necessary to open the omnibox match via browser commands.
-+#if defined(__clang__) && (__clang_major__ >= 16)
- location_bar_->set_navigation_params(LocationBar::NavigationParams(
- destination_url, disposition, transition, match_selection_timestamp,
- destination_url_entered_without_scheme,
- destination_url_entered_with_http_scheme));
-+#else
-+ LocationBar::NavigationParams np = {
-+ destination_url, disposition, transition, match_selection_timestamp,
-+ destination_url_entered_without_scheme,
-+ destination_url_entered_with_http_scheme };
-+ location_bar_->set_navigation_params(np);
-+#endif
-
- if (browser_) {
- auto navigation = chrome::OpenCurrentURL(browser_);
diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
index 1bf1be049723..2b1415ad1f02 100644
--- a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
-@@ -1995,7 +1995,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
+@@ -2005,7 +2005,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled()
? omnibox::kShareWinChromeRefreshIcon
: omnibox::kShareWinIcon;
diff --git a/www/chromium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc b/www/chromium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
new file mode 100644
index 000000000000..7093d3d5c14b
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc
+@@ -44,7 +44,7 @@ std::u16string RelaunchChromeBubbleController::GetTitl
+ #if BUILDFLAG(IS_MAC)
+ ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_BRANDED
+ : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_NON_BRANDED
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_LINUX_BRANDED
+ : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_LINUX_NON_BRANDED
+ #endif
+@@ -57,7 +57,7 @@ std::u16string RelaunchChromeBubbleController::GetBody
+ #if BUILDFLAG(IS_MAC)
+ ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_BRANDED
+ : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_NON_BRANDED
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_LINUX_BRANDED
+ : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_LINUX_NON_BRANDED
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
new file mode 100644
index 000000000000..58146fd6c477
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+@@ -87,7 +87,7 @@ int ManagePasswordsUIController::save_fallback_timeout
+
+ namespace {
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Should be kept in sync with constant declared in
+ // bubble_controllers/relaunch_chrome_bubble_controller.cc.
+ constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
+@@ -452,7 +452,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
+ }
+
+ void ManagePasswordsUIController::OnKeychainError() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ CHECK(!dialog_controller_);
+ PrefService* prefs =
+ Profile::FromBrowserContext(web_contents()->GetBrowserContext())
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
index 56880fb2dcd0..f157b2b9c2b2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2023-10-11 18:22:24 UTC
+--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/signin/signin_view_controller.cc
-@@ -253,7 +253,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+@@ -254,7 +254,7 @@ void SigninViewController::ShowModalManagedUserNoticeD
bool show_link_data_option,
signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -8,4 +8,4 @@
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
CloseModalSignin();
dialog_ = std::make_unique<SigninModalDialogImpl>(
- SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate(
+ SigninViewControllerDelegate::CreateManagedUserNoticeDelegate(
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
index 8e0630151ac7..df5cd37418fe 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2023-10-11 18:22:24 UTC
+--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/signin/signin_view_controller_delegate.h
@@ -81,7 +81,7 @@ class SigninViewControllerDelegate {
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -7,5 +7,5 @@
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// Returns a platform-specific SigninViewContolllerDelegate instance that
- // displays the enterprise confirmation modal dialog. The returned object
+ // displays the managed user notice modal dialog. The returned object
// should delete itself when the window it's managing is closed.
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index b6366d827b66..2c57fbfa6fe5 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -135,7 +135,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#include "components/headless/policy/headless_mode_policy.h"
-@@ -935,7 +935,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -937,7 +937,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line);
@@ -18,7 +18,7 @@
if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) {
-@@ -1040,7 +1040,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1042,7 +1042,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@@ -27,7 +27,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1251,7 +1251,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1253,7 +1253,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
<< "Failed launch with app: couldn't pick a profile";
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
index 7f3cada9cd20..321e56eaf521 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -255,7 +255,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -256,7 +256,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
// at the state of the MessageLoop.
Browser::CreateParams params = Browser::CreateParams(profile_, false);
params.creation_source = Browser::CreationSource::kStartupCreator;
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index 383c18dd72f8..1b2dad652fee 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -226,7 +226,7 @@
+@@ -230,7 +230,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/hats/hats_helper.h"
-@@ -662,12 +662,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -668,12 +668,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_tabs_organization_trigger__observer.h b/www/chromium/files/patch-chrome_browser_ui_tabs_organization_trigger__observer.h
deleted file mode 100644
index 335829b76dcf..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_tabs_organization_trigger__observer.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- chrome/browser/ui/tabs/organization/trigger_observer.h.orig 2023-12-10 06:10:27 UTC
-+++ chrome/browser/ui/tabs/organization/trigger_observer.h
-@@ -6,6 +6,7 @@
- #define CHROME_BROWSER_UI_TABS_ORGANIZATION_TRIGGER_OBSERVER_H_
-
- #include <memory>
-+#include <unordered_map>
-
- #include "base/functional/callback.h"
- #include "chrome/browser/ui/browser_list_observer.h"
diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
index 86d8ce0b8b89..817319654491 100644
--- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/ui_features.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/ui_features.cc
-@@ -345,7 +345,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
+@@ -348,7 +348,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
"TopChromeWebUIUsesSpareRenderer",
base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h
index b36c99c9e57a..27858b1ea0ef 100644
--- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h
+++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/ui_features.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/ui_features.h
-@@ -219,7 +219,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
+@@ -221,7 +221,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index 72e0db28d04b..6ab1d76205f7 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
@@ -32,7 +32,7 @@
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
-@@ -249,7 +249,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -254,7 +254,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
#endif // !BUILDFLAG(IS_CHROMEOS)
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
index 8bb09f96e0d6..aa7648ca1575 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2023-02-08 09:03:45 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -54,11 +54,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat
+@@ -59,11 +59,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat
base::OnceClosure callback) override;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
new file mode 100644
index 000000000000..f2ba1af2a6de
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/views/compose/compose_dialog_view.cc
+@@ -144,7 +144,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit(
+ views::Widget::InitParams* params,
+ views::Widget* widget) const {
+ WebUIBubbleDialogView::OnBeforeBubbleWidgetInit(params, widget);
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // In linux, windows may be clipped to their anchors' bounds,
+ // resulting in visual errors, unless they use accelerated rendering. See
+ // crbug.com/1445770 for details.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index 811b1a7469a4..29c18de6f02c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-10-11 18:22:24 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -54,7 +54,7 @@
#include "components/user_manager/user_manager.h"
@@ -18,15 +18,15 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
-@@ -180,7 +180,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() {
Init(std::move(params));
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Because getting `linux_ui_theme` requires `native_widget_` to be
- // initialized, this needs to happen after Init().
- if (!IsIncognitoBrowser() &&
+ SelectNativeTheme();
+ #else
+ SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi());
@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
@@ -36,7 +36,7 @@
// If the window was sent to a different workspace, prioritize it if
// it was sent to the current workspace and deprioritize it
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
-@@ -558,7 +558,7 @@ void BrowserFrame::OnMenuClosed() {
+@@ -563,7 +563,7 @@ void BrowserFrame::OnMenuClosed() {
}
void BrowserFrame::SelectNativeTheme() {
@@ -45,7 +45,7 @@
// Use the regular NativeTheme instance if running incognito mode, regardless
// of system theme (gtk, qt etc).
ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
-@@ -599,7 +599,7 @@ void BrowserFrame::OnTouchUiChanged() {
+@@ -604,7 +604,7 @@ void BrowserFrame::OnTouchUiChanged() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
index 2734f0125367..3386bfb16c67 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
@@ -1,29 +1,20 @@
---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-10-11 18:22:24 UTC
+--- chrome/browser/ui/views/frame/browser_frame.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/browser_frame.h
-@@ -12,7 +12,7 @@
- #include "ui/views/context_menu_controller.h"
- #include "ui/views/widget/widget.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "ui/base/ui_base_types.h"
- #endif
-
-@@ -68,7 +68,7 @@ class BrowserFrame : public views::Widget, public view
+@@ -65,7 +65,7 @@ class BrowserFrame : public views::Widget, public view
~BrowserFrame() override;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- // Returns which edges of the frame are tiled.
- const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
- void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
-@@ -230,7 +230,7 @@ class BrowserFrame : public views::Widget, public view
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns whether the frame is in a tiled state.
+ bool tiled() const { return tiled_; }
+ void set_tiled(bool tiled) { tiled_ = tiled; }
+@@ -225,7 +225,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- ui::WindowTiledEdges tiled_edges_;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool tiled_ = false;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
new file mode 100644
index 000000000000..1a70d3466501
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc
+@@ -53,7 +53,7 @@ gfx::Insets BrowserFrameViewLayoutLinux::RestoredFrame
+ OpaqueBrowserFrameViewLayout::RestoredFrameBorderInsets());
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const bool tiled = delegate_->IsTiled();
+ #else
+ const bool tiled = false;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
new file mode 100644
index 000000000000..ac7f01e7e27c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc
+@@ -18,7 +18,7 @@ BrowserFrameViewLayoutLinuxNative::~BrowserFrameViewLa
+
+ ui::WindowFrameProvider* BrowserFrameViewLayoutLinuxNative::GetFrameProvider()
+ const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const bool tiled = delegate_->IsTiled();
+ #else
+ const bool tiled = false;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
new file mode 100644
index 000000000000..7d4390872151
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/views/frame/browser_frame_view_linux.cc
+@@ -77,7 +77,7 @@ void BrowserFrameViewLinux::OnWindowButtonOrderingChan
+
+ void BrowserFrameViewLinux::PaintRestoredFrameBorder(
+ gfx::Canvas* canvas) const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const bool tiled = frame()->tiled();
+ #else
+ const bool tiled = false;
+@@ -103,7 +103,7 @@ bool BrowserFrameViewLinux::ShouldDrawRestoredFrameSha
+ }
+
+ float BrowserFrameViewLinux::GetRestoredCornerRadiusDip() const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const bool tiled = frame()->tiled();
+ #else
+ const bool tiled = false;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
index 5582bf847934..c91a51098da6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -16,7 +16,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_view_win.h"
@@ -18,7 +18,7 @@
auto* profile = browser_view->browser()->profile();
auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -81,7 +81,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows
+@@ -85,7 +85,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows
if (browser_view->browser()->is_type_picture_in_picture()) {
auto view =
std::make_unique<PictureInPictureBrowserFrameView>(frame, browser_view);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index a0e77c1c8929..de917edae177 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2150,7 +2150,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -2161,7 +2161,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
// CrOS cleanup is done.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 361faed868aa..f8f1cbf0c151 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -54,7 +54,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
@@ -18,16 +18,16 @@
return FrameButtonStyle::kMdButton;
#else
return FrameButtonStyle::kImageButton;
-@@ -589,7 +589,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
+@@ -585,7 +585,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
return false;
}
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const {
- return frame()->tiled_edges();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool OpaqueBrowserFrameView::IsTiled() const {
+ return frame()->tiled();
}
-@@ -787,7 +787,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
+@@ -783,7 +783,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
}
void OpaqueBrowserFrameView::WindowIconPressed() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
index 2bb016b99410..b269b939ae9d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
@@ -1,12 +1,12 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -115,7 +115,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
+ void UpdateWindowControlsOverlay(
const gfx::Rect& bounding_rect) const override;
- bool IsTranslucentWindowOpacitySupported() const override;
bool ShouldDrawRestoredFrameShadow() const override;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- ui::WindowTiledEdges GetTiledEdges() const override;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool IsTiled() const override;
#endif
int WebAppButtonHeight() const override;
@@ -232,7 +232,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
index 751261bcc487..def5c143167a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h
@@ -10,7 +10,7 @@
#include "build/build_config.h"
@@ -9,12 +9,12 @@
#include "ui/base/ui_base_types.h"
#endif
-@@ -97,7 +97,7 @@ class OpaqueBrowserFrameViewLayoutDelegate {
+@@ -94,7 +94,7 @@ class OpaqueBrowserFrameViewLayoutDelegate {
// Returns true if a client-side shadow should be drawn for restored windows.
virtual bool ShouldDrawRestoredFrameShadow() const = 0;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- // Returns which edges of the window are snapped to the edges of the desktop
- // (or "tiled").
- virtual ui::WindowTiledEdges GetTiledEdges() const = 0;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Returns whether the window is in a tiled state.
+ virtual bool IsTiled() const = 0;
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
index c6afa024d408..8f0468cd9793 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
#include "ui/aura/window.h"
#endif
@@ -9,16 +9,16 @@
#include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
#endif
-@@ -85,7 +85,7 @@ constexpr int kContentSettingIconSize = 16;
+@@ -90,7 +90,7 @@ constexpr int kContentSettingIconSize = 16;
// The height of the controls bar at the top of the window.
- constexpr int kTopControlsHeight = 30;
+ constexpr int kTopControlsHeight = 34;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Frame border when window shadow is not drawn.
constexpr int kFrameBorderThickness = 4;
#endif
-@@ -180,7 +180,7 @@ class WindowEventObserver : public ui::EventObserver {
+@@ -185,7 +185,7 @@ class WindowEventObserver : public ui::EventObserver {
gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
@@ -27,7 +27,7 @@
// Calculate input bounds for Linux. This is needed because the input bounds
// is not necessary the same as the local bounds on Linux.
if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -570,7 +570,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+@@ -575,7 +575,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
AddChildView(std::move(auto_pip_setting_overlay));
}
@@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
-@@ -746,7 +746,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+@@ -751,7 +751,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
for (ContentSettingImageView* view : content_setting_views_)
view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
@@ -45,7 +45,7 @@
// On Linux the top bar background will be drawn in OnPaint().
top_bar_container_view_->SetBackground(views::CreateSolidBackground(
color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -825,7 +825,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -830,7 +830,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
-@@ -1079,7 +1079,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -1084,7 +1084,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
// views::View implementations:
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -63,7 +63,7 @@
// Draw the PiP window frame borders and shadows, including the top bar
// background.
if (window_frame_provider_) {
-@@ -1203,7 +1203,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -1208,7 +1208,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -71,8 +71,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
- const auto tiled_edges = frame()->tiled_edges();
-@@ -1224,7 +1224,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+ const bool tiled = frame()->tiled();
+@@ -1226,7 +1226,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@@ -81,7 +81,7 @@
return FrameBorderInsets();
#elif BUILDFLAG(IS_CHROMEOS_ASH)
return gfx::Insets(chromeos::kResizeInsideBoundsSize);
-@@ -1245,7 +1245,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
+@@ -1247,7 +1247,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
top_height + border_thickness.bottom());
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
index ce0863199aee..71ff3ce3e539 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
-@@ -24,7 +24,7 @@
+@@ -26,7 +26,7 @@
#include "ui/views/controls/image_view.h"
#include "ui/views/widget/widget_observer.h"
@@ -9,16 +9,16 @@
#include "ui/linux/window_frame_provider.h"
#endif
-@@ -32,7 +32,7 @@
- // window, so to prevent cutting off important dialogs we resize the
- // picture-in-picture window to fit them. While ChromeOS also uses Aura, it does
- // not have this issue so we do not resize on ChromeOS.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+@@ -34,7 +34,7 @@
+ // parent window, so to prevent cutting off important dialogs we resize the
+ // picture-in-picture window to fit them. While ChromeOS Ash also uses Aura, it
+ // does not have this issue so we do not resize on ChromeOS Ash.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-
-@@ -97,7 +97,7 @@ class PictureInPictureBrowserFrameView
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+ // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -100,7 +100,7 @@ class PictureInPictureBrowserFrameView
void Layout() override;
void AddedToWidget() override;
void RemovedFromWidget() override;
@@ -27,7 +27,7 @@
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
-@@ -191,7 +191,7 @@ class PictureInPictureBrowserFrameView
+@@ -194,7 +194,7 @@ class PictureInPictureBrowserFrameView
// Returns true if there's an overlay view that's currently shown.
bool IsOverlayViewVisible() const;
@@ -36,9 +36,9 @@
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
-@@ -358,7 +358,7 @@ class PictureInPictureBrowserFrameView
+@@ -366,7 +366,7 @@ class PictureInPictureBrowserFrameView
// `top_bar_color_animation_`.
- absl::optional<SkColor> current_foreground_color_;
+ std::optional<SkColor> current_foreground_color_;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
index 82ad7895ef1e..60d79c04bd5c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -195,7 +195,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
+@@ -196,7 +196,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
index d4221010469b..ba6f0668d67d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -405,7 +405,7 @@ void HungRendererDialogView::ForceCrashHungRenderer()
+@@ -406,7 +406,7 @@ void HungRendererDialogView::ForceCrashHungRenderer()
content::RenderProcessHost* rph =
hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
if (rph) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
new file mode 100644
index 000000000000..77c95f43b49e
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc
+@@ -33,7 +33,7 @@
+ #include "ui/base/metadata/metadata_impl_macros.h"
+ #include "ui/views/controls/button/button.h"
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h"
+ #endif
+
+@@ -136,7 +136,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create
+ } else if (model_state ==
+ password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) {
+ view = new SharedPasswordsNotificationView(web_contents, anchor_view);
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ } else if (model_state == password_manager::ui::KEYCHAIN_ERROR_STATE) {
+ view = new RelaunchChromeView(
+ web_contents, anchor_view,
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
index df19036a5b8d..3d4b1db5bfb1 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -666,7 +666,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
+@@ -672,7 +672,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
index 7a89c5b946ab..de6325f6cf96 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
@@ -1,13 +1,13 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -56,7 +56,7 @@ namespace {
+@@ -55,7 +55,7 @@ namespace {
const int kModalDialogWidth = 448;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- const int kEnterpriseConfirmationDialogWidth = 512;
- const int kEnterpriseConfirmationDialogHeight = 576;
+ const int kManagedUserNoticeConfirmationDialogWidth = 512;
+ const int kManagedUserNoticeConfirmationDialogHeight = 576;
#endif
@@ -182,7 +182,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -17,8 +17,8 @@
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// static
std::unique_ptr<views::WebView>
- SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
-@@ -327,7 +327,7 @@ SigninViewControllerDelegateViews::SigninViewControlle
+ SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView(
+@@ -328,7 +328,7 @@ SigninViewControllerDelegateViews::SigninViewControlle
SetButtons(ui::DIALOG_BUTTON_NONE);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
// On the local profile creation dialog, cancelling the dialog (for instance
// through the VKEY_ESCAPE accelerator) should delete the profile.
if (delete_profile_on_cancel) {
-@@ -417,7 +417,7 @@ void SigninViewControllerDelegateViews::DisplayModal()
+@@ -418,7 +418,7 @@ void SigninViewControllerDelegateViews::DisplayModal()
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
void SigninViewControllerDelegateViews::DeleteProfileOnCancel() {
ProfileAttributesEntry* entry =
g_browser_process->profile_manager()
-@@ -490,7 +490,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
+@@ -491,7 +491,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -44,4 +44,4 @@
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// static
SigninViewControllerDelegate*
- SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate(
+ SigninViewControllerDelegate::CreateManagedUserNoticeDelegate(
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
index c2f2f586589b..17a9ce56b7ab 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -6,10 +6,10 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- static std::unique_ptr<views::WebView> CreateEnterpriseConfirmationWebView(
+ static std::unique_ptr<views::WebView>
+ CreateManagedUserNoticeConfirmationWebView(
Browser* browser,
- const AccountInfo& account_info,
-@@ -137,7 +137,7 @@ class SigninViewControllerDelegateViews
+@@ -138,7 +138,7 @@ class SigninViewControllerDelegateViews
InitializeSigninWebDialogUI initialize_signin_web_dialog_ui);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc b/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc
index e48ace88a5a5..4b1aa016a561 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/tab_search_bubble_host.cc
-@@ -249,7 +249,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
+@@ -285,7 +285,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
// Mac should have tabsearch on the right side. Windows >= Win10 has the
// Tab Search button as a FrameCaptionButton, but it still needs to be on the
// left if it exists.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index d2add8e652b8..3a94f3289bf5 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,8 +1,8 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
-@@ -610,7 +610,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
- if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
+@@ -618,7 +618,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
return;
+ }
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index 7b5ac9ff2039..232522af70cd 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -89,7 +89,7 @@
+@@ -94,7 +94,7 @@
#include "components/remote_cocoa/browser/window.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/aura/client/drag_drop_client.h"
#endif
-@@ -206,7 +206,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -214,7 +214,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
void UpdateSystemDnDDragImage(TabDragContext* attached_context,
const gfx::ImageSkia& image) {
@@ -18,7 +18,7 @@
aura::Window* root_window =
attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
if (aura::client::GetDragDropClient(root_window)) {
-@@ -386,7 +386,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -395,7 +395,7 @@ TabDragController::Liveness TabDragController::Init(
// synchronous on desktop Linux, so use that.
// - ChromeOS Ash
// Releasing capture on Ash cancels gestures so avoid it.
@@ -27,7 +27,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -1011,7 +1011,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+@@ -1032,7 +1032,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,7 +36,7 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
-@@ -2059,7 +2059,7 @@ void TabDragController::CompleteDrag() {
+@@ -2071,7 +2071,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@@ -45,7 +45,7 @@
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2483,7 +2483,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2535,7 +2535,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
index ba5ff2d3f27a..65b13eaceff7 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -376,7 +376,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
+@@ -385,7 +385,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
// not become active. Setting this to false creates the need to explicitly
// hide the hovercard on press, touch, and keyboard events.
SetCanActivate(false);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
index 66cb010fb4e6..66107b4140a7 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2023-08-17 07:33:31 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
-@@ -81,7 +81,7 @@ void FixWidgetStackOrder(views::Widget* widget, const
+@@ -82,7 +82,7 @@ void FixWidgetStackOrder(views::Widget* widget, const
return;
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
index 0195e568ccf4..1a2176fdc4be 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -716,7 +716,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -777,7 +777,7 @@ void MaybeRegisterChromeFeaturePromos(
FeaturePromoSpecification::AcceleratorInfo())
.SetBubbleArrow(HelpBubbleArrow::kTopLeft)));
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
index 086710108bf4..06979ca21c4c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
-@@ -463,7 +463,7 @@ std::string GetFileExtension(FileExtension file_extens
+@@ -466,7 +466,7 @@ std::string GetFileExtension(FileExtension file_extens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
SiteConfig config;
bool is_app_found = false;
-@@ -1924,7 +1924,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
+@@ -1938,7 +1938,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
@@ -18,7 +18,7 @@
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
-@@ -3243,7 +3243,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
+@@ -3257,7 +3257,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
app_state->id, app_state->name);
ASSERT_TRUE(icon_color.has_value());
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@@ -27,7 +27,7 @@
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
-@@ -3258,7 +3258,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3272,7 +3272,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
@@ -36,7 +36,7 @@
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
-@@ -3268,7 +3268,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3282,7 +3282,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
@@ -45,7 +45,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
-@@ -3284,7 +3284,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
+@@ -3298,7 +3298,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
@@ -54,7 +54,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
-@@ -4077,7 +4077,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
+@@ -4091,7 +4091,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const webapps::AppId& app_id) {
@@ -63,7 +63,7 @@
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
-@@ -4271,7 +4271,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
+@@ -4285,7 +4285,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const webapps::AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
@@ -72,7 +72,7 @@
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
-@@ -4315,7 +4315,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
+@@ -4329,7 +4329,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}
@@ -80,4 +80,4 @@
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
SkColor expected_icon_pixel_color =
GetSiteConfigurationFromAppName(name).icon_color;
- absl::optional<SkColor> actual_color_install_icon_size =
+ std::optional<SkColor> actual_color_install_icon_size =
diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
new file mode 100644
index 000000000000..489ecd4cbf54
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
+@@ -586,7 +586,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
+ content::WebContents* web_contents,
+ Profile* profile,
+ const std::string& app_id) {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
+ CHECK(provider);
+
+@@ -806,7 +806,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
+ }
+ }
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void WebAppUiManagerImpl::ShowIPHPromoForAppsLaunchedViaLinkCapturing(
+ const Browser* browser,
+ const webapps::AppId& app_id,
diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
new file mode 100644
index 000000000000..0281bb883a80
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h
+@@ -221,7 +221,7 @@ class WebAppUiManagerImpl : public BrowserListObserver
+ UninstallCompleteCallback uninstall_complete_callback,
+ webapps::UninstallResultCode uninstall_code);
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void ShowIPHPromoForAppsLaunchedViaLinkCapturing(const Browser* browser,
+ const webapps::AppId& app_id,
+ bool is_activated);
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
index b929902757c2..861f1128a8b4 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-09-13 12:11:42 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -415,7 +415,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
+@@ -386,7 +386,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
bool deprecated_app = false;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
auto* context = extension_system_->extension_service()->GetBrowserContext();
deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
-@@ -478,7 +478,7 @@ void AppHomePageHandler::FillExtensionInfoList(
+@@ -450,7 +450,7 @@ void AppHomePageHandler::FillExtensionInfoList(
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index ba15464ad17c..6d5b79472ec1 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -209,7 +209,7 @@
#include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h"
@@ -30,7 +30,7 @@
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
-@@ -398,7 +398,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -403,7 +403,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@@ -39,7 +39,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -652,7 +652,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -654,7 +654,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUIMobileSetupHost)
return &NewWebUI<ash::cellular_setup::MobileSetupUI>;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
-@@ -717,7 +717,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -710,7 +710,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@@ -57,7 +57,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
-@@ -778,27 +778,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -771,27 +771,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
index e970de3993a1..2fab48becb48 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
@@ -1,11 +1,16 @@
---- chrome/browser/ui/webui/management/management_ui.cc.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/management/management_ui.cc
-@@ -92,7 +92,7 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml
- {kManagementOnFileTransferVisibleData,
- IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
+@@ -98,11 +98,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml
+ {kManagementOnFileTransferVisibleData,
+ IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT},
- {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA},
+ {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT},
+ {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ {kManagementDeviceSignalsDisclosure,
+ IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE},
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
index 99565e728f60..340597042cc1 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-10-11 18:22:24 UTC
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -94,7 +94,7 @@
+@@ -95,7 +95,7 @@
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
#include "components/device_signals/core/browser/user_permission_service.h" // nogncheck
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -190,12 +190,12 @@ enum class ReportingType {
+@@ -191,12 +191,12 @@ enum class ReportingType {
kLegacyTech,
};
@@ -24,7 +24,7 @@
const char kManagementDeviceSignalsDisclosure[] =
"managementDeviceSignalsDisclosure";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -773,7 +773,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
+@@ -830,7 +830,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
GetReportingTypeValue(report_definition.reporting_type));
report_sources->Append(std::move(data));
}
@@ -33,7 +33,7 @@
// Insert the device signals consent disclosure at the end of browser
// reporting section.
auto* user_permission_service = GetUserPermissionService();
-@@ -1061,7 +1061,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
+@@ -1118,7 +1118,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
kManagementOnPageVisitedVisibleData, &info);
}
@@ -42,7 +42,7 @@
if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) {
AddThreatProtectionPermission(kManagementScreenCaptureEvent,
kManagementScreenCaptureData, &info);
-@@ -1145,7 +1145,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
+@@ -1202,7 +1202,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
->policy_service();
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
index 361e2f93b227..0b93311c4f4b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-10-11 18:22:24 UTC
+--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/management/management_ui_handler.h
@@ -24,14 +24,14 @@
#include "extensions/common/extension_id.h"
@@ -17,7 +17,7 @@
extern const char kManagementDeviceSignalsDisclosure[];
#endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -117,7 +117,7 @@ class StatusCollector;
+@@ -119,7 +119,7 @@ class StatusCollector;
class SystemLogUploader;
} // namespace policy
@@ -26,7 +26,7 @@
namespace device_signals {
class UserPermissionService;
} // namespace device_signals
-@@ -177,7 +177,7 @@ class ManagementUIHandler : public content::WebUIMessa
+@@ -179,7 +179,7 @@ class ManagementUIHandler : public content::WebUIMessa
base::Value::List GetManagedWebsitesInfo(Profile* profile) const;
base::Value::List GetApplicationsInfo(Profile* profile) const;
virtual policy::PolicyService* GetPolicyService();
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
new file mode 100644
index 000000000000..e12a440b44db
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/webui/password_manager/promo_cards_handler.cc
+@@ -28,7 +28,7 @@
+ #include "chrome/browser/ui/webui/password_manager/promo_cards/web_password_manager_promo.h"
+ #endif
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h"
+ #endif
+
+@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge
+ .get()));
+ #endif
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ promo_cards.push_back(
+ std::make_unique<RelaunchChromePromo>(profile->GetPrefs()));
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc b/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
new file mode 100644
index 000000000000..b8ebcb47f522
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig 2024-02-23 21:04:38 UTC
++++ chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc
+@@ -37,7 +37,7 @@ std::u16string RelaunchChromePromo::GetTitle() const {
+ return l10n_util::GetStringUTF16(
+ #if BUILDFLAG(IS_MAC)
+ IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE_LINUX
+ #endif
+ );
+@@ -47,7 +47,7 @@ std::u16string RelaunchChromePromo::GetDescription() c
+ return l10n_util::GetStringUTF16(
+ #if BUILDFLAG(IS_MAC)
+ IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION_LINUX
+ #endif
+ );
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc
index e3fdb7feb8de..d365533b4608 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/realbox/realbox_handler.cc
-@@ -146,7 +146,7 @@ const char* kMacShareIconResourceName =
+@@ -148,7 +148,7 @@ const char* kMacShareIconResourceName =
#elif BUILDFLAG(IS_WIN)
const char* kWinShareIconResourceName =
"//resources/cr_components/omnibox/icons/win_share.svg";
@@ -9,7 +9,7 @@
const char* kLinuxShareIconResourceName =
"//resources/cr_components/omnibox/icons/share.svg";
#else
-@@ -203,7 +203,7 @@ static void DefineChromeRefreshRealboxIcons() {
+@@ -207,7 +207,7 @@ static void DefineChromeRefreshRealboxIcons() {
#elif BUILDFLAG(IS_WIN)
kWinShareIconResourceName =
"//resources/cr_components/omnibox/icons/win_share_cr23.svg";
@@ -18,7 +18,7 @@
kLinuxShareIconResourceName =
"//resources/cr_components/omnibox/icons/share_cr23.svg";
#else
-@@ -818,7 +818,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN
+@@ -835,7 +835,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN
icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
return kWinShareIconResourceName;
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc
index c7e160466d7e..754f256ed6a3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/settings/accessibility_main_handler.cc
@@ -19,7 +19,7 @@
#include "content/public/browser/web_contents.h"
@@ -9,7 +9,16 @@
#include "ui/accessibility/accessibility_features.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -49,7 +49,7 @@ void AccessibilityMainHandler::OnJavascriptAllowed() {
+@@ -39,7 +39,7 @@ void AccessibilityMainHandler::RegisterMessages() {
+ base::BindRepeating(
+ &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels,
+ base::Unretained(this)));
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ web_ui()->RegisterMessageCallback(
+ "getScreenAiInstallState",
+ base::BindRepeating(
+@@ -56,7 +56,7 @@ void AccessibilityMainHandler::OnJavascriptAllowed() {
base::Unretained(this)));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -18,7 +27,7 @@
if (features::IsPdfOcrEnabled()) {
CHECK(!component_ready_observer_.IsObserving());
component_ready_observer_.Observe(
-@@ -63,14 +63,14 @@ void AccessibilityMainHandler::OnJavascriptDisallowed(
+@@ -70,14 +70,14 @@ void AccessibilityMainHandler::OnJavascriptDisallowed(
accessibility_subscription_ = {};
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h
index 20e1283bb1a6..b9ec3bafed68 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/settings/accessibility_main_handler.h
@@ -13,7 +13,7 @@
#include "chrome/browser/ash/accessibility/accessibility_manager.h"
@@ -27,7 +27,16 @@
// screen_ai::ScreenAIInstallState::Observer:
void DownloadProgressChanged(double progress) override;
void StateChanged(screen_ai::ScreenAIInstallState::State state) override;
-@@ -59,7 +59,7 @@ class AccessibilityMainHandler
+@@ -50,7 +50,7 @@ class AccessibilityMainHandler
+ void HandleGetScreenReaderState(const base::Value::List& args);
+ void HandleCheckAccessibilityImageLabels(const base::Value::List& args);
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ void HandleGetScreenAIInstallState(const base::Value::List& args);
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+
+@@ -63,7 +63,7 @@ class AccessibilityMainHandler
base::CallbackListSubscription accessibility_subscription_;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index 08e2bc538491..4e4e3bd6e71c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -138,7 +138,7 @@
#include "ash/webui/settings/public/constants/routes.mojom.h"
#endif
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
#include "ui/display/screen.h"
#endif
@@ -18,7 +18,7 @@
#include "ui/linux/linux_ui_factory.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -263,7 +263,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
+@@ -265,7 +265,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
base::FeatureList::IsEnabled(
supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn));
@@ -27,39 +27,39 @@
bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
#else
bool allow_qt_theme = false;
-@@ -292,7 +292,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
- {"focusHighlightLabel",
- IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
+@@ -295,7 +295,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
+ {"focusHighlightLabel",
+ IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
#endif
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- {"overscrollHistoryNavigationTitle",
- IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
- {"overscrollHistoryNavigationSubtitle",
-@@ -437,7 +437,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
- {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
- {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
- {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
+ {"overscrollHistoryNavigationTitle",
+ IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
+ {"overscrollHistoryNavigationSubtitle",
+@@ -440,7 +440,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+ {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
+ {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
+ {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- {"gtkTheme", IDS_SETTINGS_GTK_THEME},
- {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
- {"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -447,7 +447,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+ {"gtkTheme", IDS_SETTINGS_GTK_THEME},
+ {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
+ {"qtTheme", IDS_SETTINGS_QT_THEME},
+@@ -450,7 +450,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
- {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
+ {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
- {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
+ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
-@@ -472,7 +472,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -475,7 +475,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
->GetPlatformRuntimeProperties()
.supports_server_side_window_decorations;
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc b/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
index 60c285f4d9d2..a5b3ad64c4d7 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-08-17 07:33:31 UTC
+--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/web_applications/commands/install_app_locally_command.cc
-@@ -80,7 +80,7 @@ void InstallAppLocallyCommand::StartWithLock(
+@@ -75,7 +75,7 @@ void InstallAppLocallyCommand::StartWithLock(
options.os_hooks[OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
index 2d177ac9fb66..11f22a8203f8 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/web_applications/policy/web_app_policy_manager.cc
-@@ -128,7 +128,7 @@ namespace web_app {
+@@ -113,7 +113,7 @@ namespace web_app {
BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration,
"DesktopPWAsForceUnregisterOSIntegration",
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
index ec0e289d812b..c2a25f4fb3d6 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-11-03 10:09:45 UTC
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc
@@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
}
@@ -46,14 +46,14 @@
applications_dir().Append("applications");
bool database_update_called = false;
@@ -378,7 +378,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC
- return absl::nullopt;
+ return std::nullopt;
}
return GetIconTopLeftColorFromShortcutFile(shortcut_path);
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile);
if (!provider) {
- return absl::nullopt;
+ return std::nullopt;
@@ -428,7 +428,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort
app_installed_profiles.end()) {
return shortcut_path;
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index cf24884ad52e..2e2bc33c7ea9 100644
--- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -669,7 +669,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
+@@ -745,7 +745,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
g_observer->ConfiguringCable(request_type);
}
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 661a417130df..0cea5013c674 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/common/chrome_features.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/chrome_features.cc
-@@ -76,7 +76,7 @@ BASE_FEATURE(kAppShimNotificationAttribution,
+@@ -78,7 +78,7 @@ BASE_FEATURE(kAppShimNotificationAttribution,
BASE_FEATURE(kAsyncDns,
"AsyncDns",
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \
@@ -9,7 +9,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -84,7 +84,7 @@ BASE_FEATURE(kAsyncDns,
+@@ -86,7 +86,7 @@ BASE_FEATURE(kAsyncDns,
);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
// Enables or disables the Autofill survey triggered by opening a prompt to
// save address info.
BASE_FEATURE(kAutofillAddressSurvey,
-@@ -102,7 +102,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
+@@ -104,7 +104,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
base::FEATURE_DISABLED_BY_DEFAULT);
#endif
@@ -27,7 +27,7 @@
// Enables the Restart background mode optimization. When all Chrome UI is
// closed and it goes in the background, allows to restart the browser to
// discard memory.
-@@ -304,7 +304,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
+@@ -315,7 +315,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
BASE_FEATURE(kDesktopPWAsRunOnOsLogin,
"DesktopPWAsRunOnOsLogin",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -350,7 +350,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
+@@ -354,7 +354,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings,
base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -45,7 +45,7 @@
// Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
// If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
// Apps will not launch and will be marked in the UI as deprecated.
-@@ -378,7 +378,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
+@@ -374,7 +374,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
BASE_FEATURE(kDnsOverHttps,
"DnsOverHttps",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -54,7 +54,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -394,7 +394,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -390,7 +390,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -63,7 +63,7 @@
true
#else
false
-@@ -951,7 +951,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir,
+@@ -957,7 +957,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir,
base::FEATURE_ENABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -72,7 +72,7 @@
BASE_FEATURE(kLinuxLowMemoryMonitor,
"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -964,7 +964,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -970,7 +970,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
&kLinuxLowMemoryMonitor, "critical_level", 255};
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index bf1dacea7ad6..17e11252bab7 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/common/chrome_features.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/chrome_features.h
-@@ -62,13 +62,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution);
+@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -16,16 +16,16 @@
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -227,7 +227,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
- COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles);
+@@ -226,7 +226,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
- COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps);
-@@ -562,7 +562,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+ #endif
+
+@@ -567,7 +567,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -34,7 +34,7 @@
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -570,7 +570,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -575,7 +575,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index 4b5258e1f35d..d7069602daab 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/common/chrome_paths.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/chrome_paths.cc
@@ -30,7 +30,7 @@
#include "base/apple/foundation_util.h"
@@ -27,7 +27,7 @@
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -220,7 +220,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -225,7 +225,7 @@ bool PathProvider(int key, base::FilePath* result) {
}
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -36,7 +36,7 @@
if (!GetUserDownloadsDirectorySafe(&cur)) {
return false;
}
-@@ -523,7 +523,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -539,7 +539,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
}
break;
@@ -45,7 +45,7 @@
case chrome::DIR_POLICY_FILES: {
cur = base::FilePath(policy::kPolicyPath);
break;
-@@ -534,7 +534,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -550,7 +550,7 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
BUILDFLAG(CHROMIUM_BRANDING)) || \
@@ -54,7 +54,7 @@
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
return false;
-@@ -543,7 +543,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -559,7 +559,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
}
#endif
@@ -63,7 +63,7 @@
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
-@@ -591,7 +591,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -607,7 +607,7 @@ bool PathProvider(int key, base::FilePath* result) {
#endif
#if BUILDFLAG(ENABLE_EXTENSIONS) && \
@@ -72,7 +72,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if BUILDFLAG(IS_MAC)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -605,6 +605,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -621,6 +621,9 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(
FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h
index da123e6edd17..5f4a03df043e 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/common/chrome_paths.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/chrome_paths.h
-@@ -58,7 +58,7 @@ enum {
+@@ -59,7 +59,7 @@ enum {
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
BUILDFLAG(CHROMIUM_BRANDING)) || \
@@ -9,7 +9,7 @@
DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions
// on Chrome Mac and Chromium Linux.
// On Chrome OS, this path is used for OEM
-@@ -66,7 +66,7 @@ enum {
+@@ -67,7 +67,7 @@ enum {
// create it.
#endif
@@ -18,7 +18,7 @@
DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
// definition manifest files that
// describe extensions which are to be
-@@ -125,7 +125,7 @@ enum {
+@@ -126,7 +126,7 @@ enum {
#endif
#if BUILDFLAG(ENABLE_EXTENSIONS) && \
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index 65d8b05d1673..5db3c4e7b9c7 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/common/chrome_switches.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/chrome_switches.cc
-@@ -858,14 +858,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -865,14 +865,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index 395244a660db..fccab6ef533d 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig 2023-12-10 06:10:27 UTC
+--- chrome/common/chrome_switches.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/chrome_switches.h
-@@ -272,12 +272,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -274,12 +274,12 @@ extern const char kAllowNaClSocketAPI[];
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_common_crash__keys.cc b/www/chromium/files/patch-chrome_common_crash__keys.cc
deleted file mode 100644
index f42201603cd4..000000000000
--- a/www/chromium/files/patch-chrome_common_crash__keys.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- chrome/common/crash_keys.cc.orig 2023-11-03 10:09:45 UTC
-+++ chrome/common/crash_keys.cc
-@@ -32,20 +32,10 @@ namespace crash_keys {
- namespace {
-
- // A convenient wrapper around a crash key and its name.
--//
--// The CrashKey contract requires that CrashKeyStrings are never
--// moved, copied, or deleted (see
--// third_party/crashpad/crashpad/client/annotation.h); since this class holds
--// a CrashKeyString, it likewise cannot be moved, copied, or deleted.
- class CrashKeyWithName {
- public:
- explicit CrashKeyWithName(std::string name)
- : name_(std::move(name)), crash_key_(name_.c_str()) {}
-- CrashKeyWithName(const CrashKeyWithName&) = delete;
-- CrashKeyWithName& operator=(const CrashKeyWithName&) = delete;
-- CrashKeyWithName(CrashKeyWithName&&) = delete;
-- CrashKeyWithName& operator=(CrashKeyWithName&&) = delete;
-- ~CrashKeyWithName() = delete;
-
- void Clear() { crash_key_.Clear(); }
- void Set(base::StringPiece value) { crash_key_.Set(value); }
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index 67810565270d..de77fd606b59 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2024-02-08 12:57:33 UTC
+--- chrome/common/pref_names.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/pref_names.h
-@@ -1330,7 +1330,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u
+@@ -1323,7 +1323,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
inline constexpr char kSystemTheme[] = "extensions.theme.system_theme";
#endif
-@@ -1456,7 +1456,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] =
+@@ -1449,7 +1449,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] =
"browser.show_update_promotion_info_bar";
#endif
@@ -18,7 +18,7 @@
// Boolean that is false if we should show window manager decorations. If
// true, we draw a custom chrome frame (thicker title bar and blue border).
inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -2007,7 +2007,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
+@@ -2001,7 +2001,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
inline constexpr char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
-@@ -2441,14 +2441,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
+@@ -2439,14 +2439,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
#endif // BUILDFLAG(IS_WIN)
@@ -44,7 +44,7 @@
// Records whether the user has seen an HTTP auth "negotiate" header.
inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
"net.received_http_auth_negotiate_headers";
-@@ -2526,7 +2526,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM
+@@ -2524,7 +2524,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM
inline constexpr char kBasicAuthOverHttpEnabled[] =
"auth.basic_over_http_enabled";
@@ -53,7 +53,7 @@
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
// along with kAuthNegotiateDelegateAllowlist.
inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3565,7 +3565,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes
+@@ -3575,7 +3575,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes
inline constexpr char kSandboxExternalProtocolBlocked[] =
"profile.sandbox_external_protocol_blocked";
@@ -62,7 +62,7 @@
// Boolean that indicates if system notifications are allowed to be used in
// place of Chrome notifications.
inline constexpr char kAllowSystemNotifications[] =
-@@ -3614,7 +3614,7 @@ inline constexpr char kCACertificateManagementAllowed[
+@@ -3624,7 +3624,7 @@ inline constexpr char kCACertificateManagementAllowed[
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -71,7 +71,7 @@
inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] =
"enforce_local_anchor_constraints_enabled";
#endif
-@@ -3926,7 +3926,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf
+@@ -3938,7 +3938,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf
inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] =
"new_base_url_inheritance_behavior_allowed";
diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h
index 0268e726f8b0..d753c46e29f8 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.h
+++ b/www/chromium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/common/url_constants.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/url_constants.h
-@@ -821,7 +821,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[
+@@ -822,7 +822,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[
"https://support.google.com/chromebook?p=multidevice";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index 7f6a368070f2..3d8abc11f123 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/common/webui_url_constants.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -508,18 +508,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os://
+@@ -507,18 +507,18 @@ const char kOsUISystemURL[] = "os://system";
const char kOsUIVersionURL[] = "os://version";
#endif
@@ -22,7 +22,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
-@@ -534,14 +534,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -533,14 +533,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -38,8 +38,8 @@
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
const char kChromeUIBrowserSwitchHost[] = "browser-switch";
const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
- const char kChromeUIEnterpriseProfileWelcomeHost[] =
-@@ -560,7 +560,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+ const char kChromeUIIntroHost[] = "intro";
+@@ -559,7 +559,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
const char kChromeUIProfilePickerStartupQuery[] = "startup";
#endif
@@ -48,7 +48,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
-@@ -643,7 +643,7 @@ const char kCookiesSubPagePath[] = "/cookies";
+@@ -641,7 +641,7 @@ const char kCookiesSubPagePath[] = "/cookies";
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -57,7 +57,7 @@
const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
const char kChromeUIWebAppSettingsHost[] = "app-settings";
#endif
-@@ -876,7 +876,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -872,7 +872,7 @@ const char* const kChromeDebugURLs[] = {
blink::kChromeUIGpuJavaCrashURL,
kChromeUIJavaCrashURL,
#endif
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index e148213ca5b9..b513ca32cb7b 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig 2024-01-30 07:53:34 UTC
+--- chrome/common/webui_url_constants.h.orig 2024-02-23 21:04:38 UTC
+++ chrome/common/webui_url_constants.h
-@@ -424,24 +424,24 @@ extern const char kOsUIShortcutCustomizationAppURL[];
+@@ -429,24 +429,24 @@ extern const char kOsUISystemURL[];
extern const char kOsUIVersionURL[];
#endif
@@ -29,7 +29,7 @@
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
-@@ -456,7 +456,7 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -461,14 +461,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -38,7 +38,6 @@
extern const char kChromeUISandboxHost[];
#endif
-@@ -468,7 +468,7 @@ extern const char kChromeUISearchEngineChoiceHost[];
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \
@@ -46,7 +45,7 @@
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
extern const char kChromeUIBrowserSwitchHost[];
extern const char kChromeUIBrowserSwitchURL[];
- extern const char kChromeUIEnterpriseProfileWelcomeHost[];
+ extern const char kChromeUIIntroHost[];
@@ -484,7 +484,7 @@ extern const char kChromeUIProfilePickerUrl[];
extern const char kChromeUIProfilePickerStartupQuery[];
#endif
diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index c531e0704318..2578fdbaed25 100644
--- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,6 +1,6 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/services/printing/print_backend_service_impl.cc
-@@ -46,7 +46,7 @@
+@@ -49,7 +49,7 @@
#include "printing/backend/cups_connection_pool.h"
#endif
@@ -9,7 +9,7 @@
#include "base/no_destructor.h"
#include "ui/linux/linux_ui.h"
#include "ui/linux/linux_ui_delegate_stub.h"
-@@ -73,7 +73,7 @@ namespace printing {
+@@ -76,7 +76,7 @@ namespace printing {
namespace {
@@ -18,7 +18,7 @@
void InstantiateLinuxUiDelegate() {
// TODO(crbug.com/809738) Until a real UI can be used in a utility process,
// need to use the stub version.
-@@ -82,7 +82,7 @@ void InstantiateLinuxUiDelegate() {
+@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() {
#endif
scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() {
@@ -27,7 +27,7 @@
// Use task runner associated with equivalent of UI thread. Needed for calls
// made through `PrintDialogLinuxInterface` to properly execute.
CHECK(base::SequencedTaskRunner::HasCurrentDefault());
-@@ -460,7 +460,7 @@ void PrintBackendServiceImpl::Init(
+@@ -467,7 +467,7 @@ void PrintBackendServiceImpl::Init(
// `InitCommon()`.
InitializeProcessForPrinting();
print_backend_ = PrintBackend::CreateInstance(locale);
@@ -36,7 +36,7 @@
// Test framework already initializes the UI, so this should not go in
// `InitCommon()`. Additionally, low-level Linux UI is not needed when tests
// are using `TestPrintingContext`.
-@@ -681,7 +681,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -688,7 +688,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
*printer_name, print_backend_->GetPrinterDriverInfo(*printer_name));
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index 2959bac937d3..2a2c1b9ec0de 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2024-02-08 12:57:33 UTC
+--- chrome/test/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ chrome/test/BUILD.gn
-@@ -11479,7 +11479,7 @@ test("chrome_app_unittests") {
+@@ -11604,7 +11604,7 @@ test("chrome_app_unittests") {
"//components/heap_profiling/in_process",
"//components/safe_browsing:buildflags",
]
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc b/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc
deleted file mode 100644
index ad682d3a2c75..000000000000
--- a/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- chrome/test/chromedriver/capabilities.cc.orig 2023-09-13 12:11:42 UTC
-+++ chrome/test/chromedriver/capabilities.cc
-@@ -346,7 +346,11 @@ Status ParseMobileEmulation(const base::Value& option,
- "'version' field of type string");
- }
-
-+#if defined(__clang__) && (__clang_major__ >= 15)
- brands.emplace_back(*brand, *version);
-+#else
-+ brands.emplace_back() = {*brand, *version};
-+#endif
- }
-
- client_hints.brands = std::move(brands);
-@@ -384,7 +388,11 @@ Status ParseMobileEmulation(const base::Value& option,
- "a 'version' field of type string");
- }
-
-+#if defined(__clang__) && (__clang_major__ >= 15)
- full_version_list.emplace_back(*brand, *version);
-+#else
-+ full_version_list.emplace_back() = {*brand, *version};
-+#endif
- }
-
- client_hints.full_version_list = std::move(full_version_list);
diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc
index 63f5ec050236..4832e36163ac 100644
--- a/www/chromium/files/patch-chrome_updater_configurator.cc
+++ b/www/chromium/files/patch-chrome_updater_configurator.cc
@@ -1,8 +1,8 @@
---- chrome/updater/configurator.cc.orig 2024-01-30 07:53:34 UTC
+--- chrome/updater/configurator.cc.orig 2024-02-23 21:04:38 UTC
+++ chrome/updater/configurator.cc
-@@ -63,7 +63,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs>
+@@ -67,7 +67,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs>
return std::nullopt;
- #endif
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
}()) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index 22ed523faa71..051bbfc96b4d 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig 2024-01-30 07:53:34 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig 2024-02-23 21:04:38 UTC
+++ chromecast/browser/cast_content_browser_client.cc
-@@ -432,7 +432,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -433,7 +433,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
switches::kAudioOutputChannels));
}
} else if (process_type == switches::kGpuProcess) {
diff --git a/www/chromium/files/patch-components_autofill__payments__strings.grdp b/www/chromium/files/patch-components_autofill__payments__strings.grdp
deleted file mode 100644
index bc28110abf5c..000000000000
--- a/www/chromium/files/patch-components_autofill__payments__strings.grdp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/autofill_payments_strings.grdp.orig 2023-11-03 10:09:45 UTC
-+++ components/autofill_payments_strings.grdp
-@@ -134,7 +134,7 @@
- <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java">
- Save card
- </message>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <then>
- <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt is a bubble.">
- Do you want to save this card in your Google Account?
diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
index 4bb8e931fc24..ede8ae26a768 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig 2024-01-30 07:53:34 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2024-02-23 21:04:38 UTC
+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -2380,7 +2380,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -2409,7 +2409,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index cd6714b6dd49..8710a5313e18 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-01-30 07:53:34 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-02-23 21:04:38 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -282,7 +282,7 @@ BASE_FEATURE(kEnablePixPayments,
+@@ -281,7 +281,7 @@ BASE_FEATURE(kAutofillEnableVirtualCards,
bool ShouldShowImprovedUserConsentForCreditCardSave() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
index e2df8922e980..7b5c2560fb4b 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_util.cc.orig 2024-01-30 07:53:34 UTC
+--- components/autofill/core/common/autofill_util.cc.orig 2024-02-23 21:04:38 UTC
+++ components/autofill/core/common/autofill_util.cc
-@@ -143,7 +143,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
+@@ -130,7 +130,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
bool ShouldAutoselectFirstSuggestionOnArrowDown() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_commerce__strings.grdp b/www/chromium/files/patch-components_commerce__strings.grdp
deleted file mode 100644
index 5cc528fede40..000000000000
--- a/www/chromium/files/patch-components_commerce__strings.grdp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/commerce_strings.grdp.orig 2024-01-30 07:53:34 UTC
-+++ components/commerce_strings.grdp
-@@ -309,7 +309,7 @@
- <message name="IDS_PRICE_HISTORY_DESCRIPTION" desc="The description of the Price History section in the Shopping Insights side panel explaining how the prices are gathered.">
- Typical prices are based on stores across the web over the past 90 days.
- </message>
-- <if expr="is_win or is_linux">
-+ <if expr="is_win or is_posix">
- <then>
- <message name="IDS_PRICE_HISTORY_GRAPH_ACCESSIBILITY" desc="Accessibility string for the price history graph indicating how users can review the price changes on the graph.">
- Browse mode, you can change to Forms mode to use the left/right arrow to review price changes on the graph
diff --git a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
index 2922322f9472..8c10441f7dcd 100644
--- a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
+++ b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
@@ -1,6 +1,6 @@
---- components/commerce/core/commerce_feature_list.cc.orig 2024-01-30 07:53:34 UTC
+--- components/commerce/core/commerce_feature_list.cc.orig 2024-02-23 21:04:38 UTC
+++ components/commerce/core/commerce_feature_list.cc
-@@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights,
+@@ -167,7 +167,7 @@ BASE_FEATURE(kPriceInsights,
"PriceInsights",
base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
BASE_FEATURE(kPriceInsightsRegionLaunched,
"PriceInsightsRegionLaunched",
base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -249,7 +249,7 @@ BASE_FEATURE(kShoppingCollection,
+@@ -240,7 +240,7 @@ BASE_FEATURE(kShoppingCollection,
BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-components_components__chromium__strings.grd b/www/chromium/files/patch-components_components__chromium__strings.grd
deleted file mode 100644
index 59efb2fb1c24..000000000000
--- a/www/chromium/files/patch-components_components__chromium__strings.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/components_chromium_strings.grd.orig 2024-01-30 07:53:34 UTC
-+++ components/components_chromium_strings.grd
-@@ -220,7 +220,7 @@
- </message>
- </if>
- <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
- Go to
- the Chromium menu &gt;
diff --git a/www/chromium/files/patch-components_components__google__chrome__strings.grd b/www/chromium/files/patch-components_components__google__chrome__strings.grd
deleted file mode 100644
index e127374829fe..000000000000
--- a/www/chromium/files/patch-components_components__google__chrome__strings.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/components_google_chrome_strings.grd.orig 2024-01-30 07:53:34 UTC
-+++ components/components_google_chrome_strings.grd
-@@ -220,7 +220,7 @@
- </message>
- </if>
- <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
- Go to
- the Chrome menu &gt;
diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
index ec6aa3e29ca0..82d5060e2a76 100644
--- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
+++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
@@ -1,6 +1,6 @@
---- components/content_settings/core/browser/website_settings_registry.cc.orig 2022-02-28 16:54:41 UTC
+--- components/content_settings/core/browser/website_settings_registry.cc.orig 2024-02-23 21:04:38 UTC
+++ components/content_settings/core/browser/website_settings_registry.cc
-@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
+@@ -67,7 +67,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
#if BUILDFLAG(IS_WIN)
if (!(platform & PLATFORM_WINDOWS))
return nullptr;
diff --git a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
index 29868d2cdaa7..311eeb2fa98c 100644
--- a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
+++ b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
@@ -1,6 +1,6 @@
---- components/cookie_config/cookie_store_util.cc.orig 2024-01-30 07:53:34 UTC
+--- components/cookie_config/cookie_store_util.cc.orig 2024-02-23 21:04:38 UTC
+++ components/cookie_config/cookie_store_util.cc
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
namespace cookie_config {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc
index 72ff6060af69..a1261651b91e 100644
--- a/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc
+++ b/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc
@@ -1,6 +1,6 @@
---- components/eye_dropper/eye_dropper_view.cc.orig 2023-12-10 06:10:27 UTC
+--- components/eye_dropper/eye_dropper_view.cc.orig 2024-02-23 21:04:38 UTC
+++ components/eye_dropper/eye_dropper_view.cc
-@@ -196,7 +196,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent,
+@@ -200,7 +200,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent,
// EyeDropper/WidgetDelegate.
set_owned_by_client();
SetPreferredSize(GetSize());
diff --git a/www/chromium/files/patch-components_eye__dropper_eye__dropper__view__aura.cc b/www/chromium/files/patch-components_eye__dropper_eye__dropper__view__aura.cc
deleted file mode 100644
index 9a62d5152620..000000000000
--- a/www/chromium/files/patch-components_eye__dropper_eye__dropper__view__aura.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/eye_dropper/eye_dropper_view_aura.cc.orig 2023-12-10 06:10:27 UTC
-+++ components/eye_dropper/eye_dropper_view_aura.cc
-@@ -129,7 +129,7 @@ void EyeDropperView::MoveViewToFront() {
- }
-
- void EyeDropperView::CaptureInputIfNeeded() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // The eye dropper needs to capture input since it is not activated
- // in order to avoid dismissing the color picker.
- GetWidget()->GetNativeWindow()->SetCapture();
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
index 677dc7037286..83af6f40843a 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig 2024-01-30 07:53:34 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig 2024-02-23 21:04:38 UTC
+++ components/feature_engagement/public/feature_configurations.cc
@@ -48,7 +48,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
@@ -18,7 +18,7 @@
if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
absl::optional<FeatureConfig> config = FeatureConfig();
config->valid = true;
-@@ -1498,7 +1498,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+@@ -1530,7 +1530,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
index caefc600ed86..ec333d0957bb 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2024-01-30 07:53:34 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2024-02-23 21:04:38 UTC
+++ components/feature_engagement/public/feature_constants.cc
@@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH,
BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -9,7 +9,7 @@
BASE_FEATURE(kIPHBatterySaverModeFeature,
"IPH_BatterySaverMode",
base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -583,7 +583,7 @@ constexpr base::FeatureParam<int> kDefaultBrowserEligi
+@@ -610,7 +610,7 @@ constexpr base::FeatureParam<int> kDefaultBrowserEligi
/*default_value=*/365};
#endif // BUILDFLAG(IS_IOS)
@@ -18,7 +18,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature,
"IPH_AutofillExternalAccountProfileSuggestion",
-@@ -709,7 +709,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
+@@ -736,7 +736,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
base::FEATURE_DISABLED_BY_DEFAULT);
#endif
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
index 8b3465af6cb4..0607ba0ddb3e 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig 2024-01-30 07:53:34 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2024-02-23 21:04:38 UTC
+++ components/feature_engagement/public/feature_constants.h
@@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH);
BASE_DECLARE_FEATURE(kIPHDummyFeature);
@@ -9,7 +9,7 @@
BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature);
BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature);
BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature);
-@@ -243,7 +243,7 @@ extern const base::FeatureParam<int>
+@@ -252,7 +252,7 @@ extern const base::FeatureParam<int>
kDefaultBrowserEligibilitySlidingWindowParam;
#endif // BUILDFLAG(IS_IOS)
@@ -18,7 +18,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature);
BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature);
-@@ -291,7 +291,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea
+@@ -300,7 +300,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea
BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
#endif
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
index 836ba5b1d843..1566ab8fb7a3 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,7 +1,7 @@
---- components/feature_engagement/public/feature_list.cc.orig 2024-01-30 07:53:34 UTC
+--- components/feature_engagement/public/feature_list.cc.orig 2024-02-23 21:04:38 UTC
+++ components/feature_engagement/public/feature_list.cc
-@@ -150,7 +150,7 @@ const base::Feature* const kAllFeatures[] = {
- &kIPHiOSBlueDotPromoEnhancedSafeBrowsingFeature,
+@@ -157,7 +157,7 @@ const base::Feature* const kAllFeatures[] = {
+ &kIPHiOSPromoStaySafeFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -9,7 +9,7 @@
&kIPHBatterySaverModeFeature,
&kIPHCompanionSidePanelFeature,
&kIPHCompanionSidePanelRegionSearchFeature,
-@@ -205,7 +205,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -214,7 +214,7 @@ const base::Feature* const kAllFeatures[] = {
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -18,7 +18,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
&kIPHAutofillExternalAccountProfileSuggestionFeature,
&kIPHAutofillVirtualCardCVCSuggestionFeature,
-@@ -253,7 +253,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -262,7 +262,7 @@ const base::Feature* const kAllFeatures[] = {
&kIPHScalableIphGamingFeature,
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
index c0f1d766c5ff..a21a65acd1e5 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig 2024-01-30 07:53:34 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2024-02-23 21:04:38 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -278,7 +278,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSBlueDotPromoEnhancedSafe
+@@ -288,7 +288,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoStaySafeFeature, "I
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode");
DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel");
DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelRegionSearchFeature,
-@@ -369,7 +369,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature,
+@@ -386,7 +386,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature,
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -18,7 +18,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature,
"IPH_AutofillExternalAccountProfileSuggestion");
-@@ -453,7 +453,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
+@@ -470,7 +470,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming");
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -27,16 +27,16 @@
DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch,
"IPH_DesktopPWAsLinkCapturingLaunch");
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -592,7 +592,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
- VARIATION_ENTRY(kIPHiOSPullToRefreshFeature),
- VARIATION_ENTRY(kIPHiOSReplaceSyncPromosWithSignInPromos),
+@@ -615,7 +615,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+ VARIATION_ENTRY(kIPHiOSPromoMadeForIOSFeature),
+ VARIATION_ENTRY(kIPHiOSPromoStaySafeFeature),
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
VARIATION_ENTRY(kIPHBatterySaverModeFeature),
VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature),
-@@ -647,7 +647,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -672,7 +672,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -45,7 +45,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature),
VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature),
-@@ -695,7 +695,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -720,7 +720,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
VARIATION_ENTRY(kIPHScalableIphGamingFeature),
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/www/chromium/files/patch-components_management__strings.grdp b/www/chromium/files/patch-components_management__strings.grdp
deleted file mode 100644
index 8e4971398bfd..000000000000
--- a/www/chromium/files/patch-components_management__strings.grdp
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/management_strings.grdp.orig 2024-01-30 07:53:34 UTC
-+++ components/management_strings.grdp
-@@ -345,7 +345,7 @@
- </if>
-
- <!-- Strings related to Chrome Enterprise Device Signals Sharing -->
-- <if expr="is_win or is_linux or is_macosx">
-+ <if expr="is_win or is_posix or is_macosx">
- <message name="IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE" desc="Disclosure message explaining that device signals can be shared.">
- Information about your browser, OS, device, installed software, and files
- </message>
diff --git a/www/chromium/files/patch-components_media__router_common_media__source.cc b/www/chromium/files/patch-components_media__router_common_media__source.cc
new file mode 100644
index 000000000000..11630a22c275
--- /dev/null
+++ b/www/chromium/files/patch-components_media__router_common_media__source.cc
@@ -0,0 +1,11 @@
+--- components/media_router/common/media_source.cc.orig 2024-02-23 21:04:38 UTC
++++ components/media_router/common/media_source.cc
+@@ -59,7 +59,7 @@ bool IsSystemAudioCaptureSupported() {
+ }
+ #if BUILDFLAG(IS_MAC)
+ return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForCast);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast);
+ #else
+ return true;
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
index 577f9a903110..daca0b03cbdb 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-01-30 07:53:34 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-02-23 21:04:38 UTC
+++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -813,7 +813,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -827,7 +827,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
// backport, having it behave differently than in stable would be a bigger
// problem. TODO: Does this work in later macOS releases?
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
index 4509f6c21dde..f335e09434db 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-01-30 07:53:34 UTC
+--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-02-23 21:04:38 UTC
+++ components/network_session_configurator/browser/network_session_configurator_unittest.cc
-@@ -788,7 +788,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
+@@ -793,7 +793,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) {
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
deleted file mode 100644
index e781a06fe05c..000000000000
--- a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
+++ /dev/null
@@ -1,20 +0,0 @@
---- components/new_or_sad_tab_strings.grdp.orig 2022-07-22 17:30:31 UTC
-+++ components/new_or_sad_tab_strings.grdp
-@@ -66,7 +66,7 @@
- Close other tabs or apps
- </message>
- </if>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer.">
- Close other tabs or programs
- </message>
-@@ -76,7 +76,7 @@
- Close other apps
- </message>
- </if>
-- <if expr="is_linux">
-+ <if expr="is_posix">
- <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux).">
- Close other programs
- </message>
diff --git a/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h b/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h
deleted file mode 100644
index fa01af84854a..000000000000
--- a/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- components/optimization_guide/core/tflite_model_executor.h.orig 2024-01-30 07:53:34 UTC
-+++ components/optimization_guide/core/tflite_model_executor.h
-@@ -241,7 +241,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
- void SendForBatchExecution(
- BatchExecutionCallback callback_on_complete,
- base::TimeTicks start_time,
-+#if defined(__clang__) && (__clang_major__ >= 15)
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+#else
-+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+#endif
- override {
- DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -263,7 +267,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
- // Starts the synchronous execution of the model. Returns model outputs.
- // Model needs to be loaded. Synchronous calls do not load or unload model.
- std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
-+#if defined(__clang__) && (__clang_major__ >= 15)
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+#else
-+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+#endif
- override {
- DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -421,7 +429,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
- // executes it on the model execution thread.
- void LoadModelFileAndBatchExecute(
- BatchExecutionCallback callback_on_complete,
-+#if defined(__clang__) && (__clang_major__ >= 15)
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
-+#else
-+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
-+#endif
- DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
-@@ -438,7 +450,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
-
- // Batch executes the loaded model for inputs.
- void BatchExecuteLoadedModel(
-+#if defined(__clang__) && (__clang_major__ >= 15)
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
-+#else
-+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
-+#endif
- std::vector<absl::optional<OutputType>>* outputs) {
- DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -498,7 +514,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
- // Unloads the model if needed.
- void BatchExecuteLoadedModelAndRunCallback(
- BatchExecutionCallback callback_on_complete,
-+#if defined(__clang__) && (__clang_major__ >= 15)
- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
-+#else
-+ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
-+#endif
- ExecutionStatus execution_status) {
- DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
index 9496a9394b7e..75916fc3a9c7 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
@@ -1,7 +1,7 @@
---- components/password_manager/core/browser/features/password_features.cc.orig 2024-01-30 07:53:34 UTC
+--- components/password_manager/core/browser/features/password_features.cc.orig 2024-02-23 21:04:38 UTC
+++ components/password_manager/core/browser/features/password_features.cc
-@@ -22,7 +22,7 @@ BASE_FEATURE(kBiometricTouchToFill,
- // Delete undecryptable passwords from the store when Sync is active.
+@@ -24,7 +24,7 @@ BASE_FEATURE(kButterOnDesktopFollowup,
+
BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
"ClearUndecryptablePasswordsInSync",
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS)
@@ -9,3 +9,12 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
+@@ -104,7 +104,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal,
+ "PasswordManagerLogToTerminal",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kRestartToGainAccessToKeychain,
+ "RestartToGainAccessToKeychain",
+ base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h
new file mode 100644
index 000000000000..b87784f46f41
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/features/password_features.h.orig 2024-02-23 21:04:38 UTC
++++ components/password_manager/core/browser/features/password_features.h
+@@ -94,7 +94,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerEnableSenderServi
+ // terminal.
+ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal);
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables "Needs access to keychain, restart chrome" bubble and banner.
+ BASE_DECLARE_FEATURE(kRestartToGainAccessToKeychain);
+ #endif // BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
new file mode 100644
index 000000000000..bafe710801e5
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
@@ -0,0 +1,29 @@
+--- components/password_manager/core/browser/password_form_manager.cc.orig 2024-02-23 21:04:38 UTC
++++ components/password_manager/core/browser/password_form_manager.cc
+@@ -58,7 +58,7 @@
+ #include "components/webauthn/android/webauthn_cred_man_delegate.h"
+ #endif // BUILDFLAG(IS_ANDROID)
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/os_crypt/sync/os_crypt.h"
+ #endif
+
+@@ -229,7 +229,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
+ return false;
+ }
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool ShouldShowKeychainErrorBubble(
+ absl::optional<PasswordStoreBackendError> backend_error) {
+ if (!backend_error.has_value()) {
+@@ -794,7 +794,7 @@ void PasswordFormManager::OnFetchCompleted() {
+ error.value().type);
+ }
+
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (ShouldShowKeychainErrorBubble(
+ form_fetcher_->GetProfileStoreBackendError())) {
+ client_->NotifyKeychainError();
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc
new file mode 100644
index 000000000000..9e09cb4ebded
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/password_manager.cc.orig 2024-02-23 21:04:38 UTC
++++ components/password_manager/core/browser/password_manager.cc
+@@ -363,7 +363,7 @@ void PasswordManager::RegisterProfilePrefs(
+ registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList);
+ #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
+ registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true);
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter,
+ 0);
+ #endif
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
new file mode 100644
index 000000000000..e0fd6e5b6ad8
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-02-23 21:04:38 UTC
++++ components/password_manager/core/browser/password_store/login_database_async_helper.cc
+@@ -135,7 +135,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc
+ std::vector<PasswordForm> matched_forms;
+ if (!login_db_ ||
+ !login_db_->GetLogins(form, include_psl, &matched_forms)) {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return PasswordStoreBackendError(
+ OSCrypt::IsEncryptionAvailable()
+ ? PasswordStoreBackendErrorType::kUncategorized
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
new file mode 100644
index 000000000000..de620598068b
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
@@ -0,0 +1,11 @@
+--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-02-23 21:04:38 UTC
++++ components/password_manager/core/common/password_manager_pref_names.h
+@@ -324,7 +324,7 @@ inline constexpr char kPasswordManagerPromoCardsList[]
+ inline constexpr char kPasswordSharingEnabled[] =
+ "password_manager.password_sharing_enabled";
+
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Integer pref indicating how many times relaunch Chrome bubble was dismissed.
+ inline constexpr char kRelaunchChromeBubbleDismissedCounter[] =
+ "password_manager.relaunch_chrome_bubble_dismissed_counter";
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index 014326ab15ed..4822e59aa429 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-01-30 07:53:34 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-02-23 21:04:38 UTC
+++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -516,7 +516,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason
+@@ -554,7 +554,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason
fetch_request->set_invalidation_payload(invalidation_payload_);
}
}
diff --git a/www/chromium/files/patch-components_qr__code__generator_BUILD.gn b/www/chromium/files/patch-components_qr__code__generator_BUILD.gn
index 7c5eedf33afc..1167c4a03f75 100644
--- a/www/chromium/files/patch-components_qr__code__generator_BUILD.gn
+++ b/www/chromium/files/patch-components_qr__code__generator_BUILD.gn
@@ -1,6 +1,6 @@
---- components/qr_code_generator/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- components/qr_code_generator/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ components/qr_code_generator/BUILD.gn
-@@ -39,20 +39,20 @@ source_set("qr_code_generator") {
+@@ -40,20 +40,20 @@ source_set("qr_code_generator") {
]
deps = [
":qr_code_generator_features",
diff --git a/www/chromium/files/patch-components_qr__code__generator_features.cc b/www/chromium/files/patch-components_qr__code__generator_features.cc
index b8783e64c262..9bc549348eed 100644
--- a/www/chromium/files/patch-components_qr__code__generator_features.cc
+++ b/www/chromium/files/patch-components_qr__code__generator_features.cc
@@ -1,11 +1,13 @@
---- components/qr_code_generator/features.cc.orig 2024-01-30 07:53:34 UTC
+--- components/qr_code_generator/features.cc.orig 2024-02-23 21:04:38 UTC
+++ components/qr_code_generator/features.cc
-@@ -12,7 +12,7 @@ namespace qr_code_generator {
+@@ -11,6 +11,10 @@ namespace qr_code_generator {
+
BASE_FEATURE(kRustyQrCodeGeneratorFeature,
"RustyQrCodeGenerator",
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_ANDROID)
-+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_BSD)
++ base::FEATURE_DISABLED_BY_DEFAULT);
++#else
base::FEATURE_ENABLED_BY_DEFAULT);
- #else
- base::FEATURE_DISABLED_BY_DEFAULT);
++#endif
+
+ } // namespace qr_code_generator
diff --git a/www/chromium/files/patch-components_qr__code__generator_qr__code__generator.cc b/www/chromium/files/patch-components_qr__code__generator_qr__code__generator.cc
index 40409c052828..e31833b35d58 100644
--- a/www/chromium/files/patch-components_qr__code__generator_qr__code__generator.cc
+++ b/www/chromium/files/patch-components_qr__code__generator_qr__code__generator.cc
@@ -1,4 +1,4 @@
---- components/qr_code_generator/qr_code_generator.cc.orig 2024-01-30 07:53:34 UTC
+--- components/qr_code_generator/qr_code_generator.cc.orig 2024-02-23 21:04:38 UTC
+++ components/qr_code_generator/qr_code_generator.cc
@@ -11,12 +11,16 @@
#include <vector>
@@ -33,15 +33,15 @@
} // namespace
-@@ -617,9 +623,11 @@ absl::optional<QRCodeGenerator::GeneratedCode> QRCodeG
- return absl::nullopt;
- }
-
+@@ -613,9 +619,11 @@ QRCodeGenerator::GeneratedCode::~GeneratedCode() = def
+ absl::optional<QRCodeGenerator::GeneratedCode> QRCodeGenerator::Generate(
+ base::span<const uint8_t> in,
+ absl::optional<int> min_version) {
+#ifdef notyet
if (IsRustyQrCodeGeneratorFeatureEnabled()) {
return GenerateQrCodeUsingRust(in, min_version);
}
+#endif
- std::vector<Segment> segments;
- const QRVersionInfo* version_info = nullptr;
+ if (in.size() > kMaxInputSize) {
+ return absl::nullopt;
diff --git a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc
new file mode 100644
index 000000000000..bb62d15bc130
--- /dev/null
+++ b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc
@@ -0,0 +1,11 @@
+--- components/safe_browsing/core/common/features.cc.orig 2024-02-23 21:04:38 UTC
++++ components/safe_browsing/core/common/features.cc
+@@ -201,7 +201,7 @@ BASE_FEATURE(kSafeBrowsingSkipSubresources,
+ BASE_FEATURE(kSafeBrowsingSkipSubresources2,
+ "SafeBrowsingSkipSubResources2",
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_LACROS)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc
new file mode 100644
index 000000000000..e03d8603ca9e
--- /dev/null
+++ b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc
@@ -0,0 +1,11 @@
+--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-02-23 21:04:38 UTC
++++ components/search_engines/search_engine_choice/search_engine_choice_service.cc
+@@ -456,7 +456,7 @@ void SearchEngineChoiceService::PreprocessPrefsForRepr
+
+ int SearchEngineChoiceService::GetCountryIdInternal() {
+ // `country_codes::kCountryIDAtInstall` may not be set yet.
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // On Android, ChromeOS and Linux, `country_codes::kCountryIDAtInstall` is
+ // computed asynchronously using platform-specific signals, and may not be
+ // available yet.
diff --git a/www/chromium/files/patch-components_search__engines_template__url__service.cc b/www/chromium/files/patch-components_search__engines_template__url__service.cc
index aa2c3834a0ca..3490e68e907c 100644
--- a/www/chromium/files/patch-components_search__engines_template__url__service.cc
+++ b/www/chromium/files/patch-components_search__engines_template__url__service.cc
@@ -1,6 +1,6 @@
---- components/search_engines/template_url_service.cc.orig 2024-01-30 07:53:34 UTC
+--- components/search_engines/template_url_service.cc.orig 2024-02-23 21:04:38 UTC
+++ components/search_engines/template_url_service.cc
-@@ -2573,7 +2573,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
+@@ -2907,7 +2907,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
std::unique_ptr<EnterpriseSiteSearchManager>
TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc b/www/chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc
new file mode 100644
index 000000000000..f76bf0b762b8
--- /dev/null
+++ b/www/chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc
@@ -0,0 +1,20 @@
+--- components/services/screen_ai/public/cpp/utilities.cc.orig 2024-02-23 21:04:38 UTC
++++ components/services/screen_ai/public/cpp/utilities.cc
+@@ -32,7 +32,7 @@ constexpr char kScreenAIDlcRootPath[] =
+ "/run/imageloader/screen-ai/package/root/";
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] =
+ FILE_PATH_LITERAL("third_party/screen-ai/linux/resources");
+
+@@ -72,7 +72,7 @@ base::FilePath GetComponentDir() {
+ }
+
+ base::FilePath GetLatestComponentBinaryPath() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (features::IsScreenAITestModeEnabled()) {
+ CHECK_IS_TEST();
+ return GetTestComponentBinaryPath();
diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc
new file mode 100644
index 000000000000..3e27036a575a
--- /dev/null
+++ b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc
@@ -0,0 +1,11 @@
+--- components/signin/public/base/signin_switches.cc.orig 2024-02-23 21:04:38 UTC
++++ components/signin/public/base/signin_switches.cc
+@@ -104,7 +104,7 @@ BASE_FEATURE(kSearchEngineChoice,
+ BASE_FEATURE(kUnoDesktop, "UnoDesktop", base::FEATURE_DISABLED_BY_DEFAULT);
+
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn,
+ "MinorModeRestrictionsForHistorySyncOptIn",
+ base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.h b/www/chromium/files/patch-components_signin_public_base_signin__switches.h
new file mode 100644
index 000000000000..4f74e0fdd7ad
--- /dev/null
+++ b/www/chromium/files/patch-components_signin_public_base_signin__switches.h
@@ -0,0 +1,11 @@
+--- components/signin/public/base/signin_switches.h.orig 2024-02-23 21:04:38 UTC
++++ components/signin/public/base/signin_switches.h
+@@ -92,7 +92,7 @@ BASE_DECLARE_FEATURE(kUnoDesktop);
+
+ // Controls the view mode for (history) sync screen.
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn);
+ #endif
+
diff --git a/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
index da22c77ceed4..f23e84b504ff 100644
--- a/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
+++ b/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
@@ -1,6 +1,6 @@
---- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2023-09-13 12:11:42 UTC
+--- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-02-23 21:04:38 UTC
+++ components/startup_metric_utils/common/startup_metric_utils.cc
-@@ -78,7 +78,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi
+@@ -85,7 +85,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi
// Enabling this logic on OS X causes a significant performance regression.
// TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are
// ignored on Mac main thread.
diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.cc b/www/chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.cc
deleted file mode 100644
index 836a25187f9c..000000000000
--- a/www/chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- components/supervised_user/core/browser/proto_fetcher.cc.orig 2024-01-30 07:53:34 UTC
-+++ components/supervised_user/core/browser/proto_fetcher.cc
-@@ -527,8 +527,11 @@ class RetryingFetcherImpl final : public DeferredFetch
- // Not copyable.
- RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
- RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
--
-+#if defined(__clang__) && (__clang_major__ >= 15)
- void Start(ProtoFetcher<Response>::Callback callback) override {
-+#else
-+ void Start(typename ProtoFetcher<Response>::Callback callback) override {
-+#endif
- callback_ = std::move(callback);
- Retry();
- }
-@@ -566,7 +569,11 @@ class RetryingFetcherImpl final : public DeferredFetch
- }
-
- // Client callback.
-+#if defined(__clang__) && (__clang_major__ >= 15)
- ProtoFetcher<Response>::Callback callback_;
-+#else
-+ typename ProtoFetcher<Response>::Callback callback_;
-+#endif
-
- // Retry controls.
- base::OneShotTimer timer_;
-@@ -709,7 +716,11 @@ ParallelFetchManager<Request, Response>::ParallelFetch
- template <typename Request, typename Response>
- void ParallelFetchManager<Request, Response>::Fetch(
- const Request& request,
-+#if defined(__clang__) && (__clang_major__ >= 15)
- Fetcher::Callback callback) {
-+#else
-+ typename Fetcher::Callback callback) {
-+#endif
- CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
- KeyType key = requests_in_flight_.Add(MakeFetcher(request));
- requests_in_flight_.Lookup(key)->Start(
diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.h b/www/chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.h
deleted file mode 100644
index 6238622fc190..000000000000
--- a/www/chromium/files/patch-components_supervised__user_core_browser_proto__fetcher.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- components/supervised_user/core/browser/proto_fetcher.h.orig 2023-09-13 12:11:42 UTC
-+++ components/supervised_user/core/browser/proto_fetcher.h
-@@ -165,10 +165,18 @@ class ParallelFetchManager {
-
- // Starts the fetch. Underlying fetcher is stored internally, and will be
- // cleaned up after finish or when this manager is destroyed.
-+#if defined(__clang__) && (__clang_major__ >= 15)
- void Fetch(const Request& request, Fetcher::Callback callback);
-+#else
-+ void Fetch(const Request& request, typename Fetcher::Callback callback);
-+#endif
-
- private:
-+#if defined(__clang__) && (__clang_major__ >= 15)
- using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
-+#else
-+ using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
-+#endif
-
- // Remove fetcher under key from requests_in_flight_.
- void Remove(KeyType key);
diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc
index 6f790fe39362..9f2ddced4466 100644
--- a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc
+++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc
@@ -1,6 +1,6 @@
---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-01-30 07:53:34 UTC
+--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-02-23 21:04:38 UTC
+++ components/supervised_user/core/browser/supervised_user_service.cc
-@@ -162,7 +162,7 @@ FirstTimeInterstitialBannerState SupervisedUserService
+@@ -164,7 +164,7 @@ FirstTimeInterstitialBannerState SupervisedUserService
const FirstTimeInterstitialBannerState original_state) {
FirstTimeInterstitialBannerState target_state = original_state;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.cc b/www/chromium/files/patch-components_supervised__user_core_common_features.cc
index 74398b61b436..59ec85c61ca5 100644
--- a/www/chromium/files/patch-components_supervised__user_core_common_features.cc
+++ b/www/chromium/files/patch-components_supervised__user_core_common_features.cc
@@ -1,15 +1,49 @@
---- components/supervised_user/core/common/features.cc.orig 2024-01-30 07:53:34 UTC
+--- components/supervised_user/core/common/features.cc.orig 2024-02-23 21:04:38 UTC
+++ components/supervised_user/core/common/features.cc
-@@ -85,7 +85,7 @@ BASE_FEATURE(kEnableManagedByParentUi,
+@@ -66,7 +66,7 @@ bool IsLocalWebApprovalsEnabled() {
+ BASE_FEATURE(kFilterWebsitesForSupervisedUsersOnDesktopAndIOS,
+ "FilterWebsitesForSupervisedUsersOnDesktopAndIOS",
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_IOS)
++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT);
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -74,7 +74,7 @@ BASE_FEATURE(kFilterWebsitesForSupervisedUsersOnDeskto
+
+ BASE_FEATURE(kSupervisedPrefsControlledBySupervisedStore,
+ "SupervisedPrefsControlledBySupervisedStore",
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT);
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -84,13 +84,13 @@ BASE_FEATURE(kSupervisedPrefsControlledBySupervisedSto
+ // users in various UI surfaces.
+ BASE_FEATURE(kEnableManagedByParentUi,
"EnableManagedByParentUi",
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT);
+ #else
base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop,
"EnableExtensionsPermissionsForSupervisedUsersOnDesktop",
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -143,7 +143,7 @@ bool IsChildAccountSupervisionEnabled() {
+@@ -111,7 +111,7 @@ bool CanDisplayFirstTimeInterstitialBanner() {
+ // their google account when cookies are cleared
+ BASE_FEATURE(kClearingCookiesKeepsSupervisedUsersSignedIn,
+ "ClearingCookiesKeepsSupervisedUsersSignedIn",
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT);
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -152,7 +152,7 @@ bool IsChildAccountSupervisionEnabled() {
return base::FeatureList::IsEnabled(
supervised_user::
kFilterWebsitesForSupervisedUsersOnDesktopAndIOS) ||
diff --git a/www/chromium/files/patch-components_sync_base_features.cc b/www/chromium/files/patch-components_sync_base_features.cc
index 5d4aadb33a98..615aa1c45b84 100644
--- a/www/chromium/files/patch-components_sync_base_features.cc
+++ b/www/chromium/files/patch-components_sync_base_features.cc
@@ -1,6 +1,6 @@
---- components/sync/base/features.cc.orig 2024-01-30 07:53:34 UTC
+--- components/sync/base/features.cc.orig 2024-02-23 21:04:38 UTC
+++ components/sync/base/features.cc
-@@ -101,7 +101,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage,
+@@ -113,7 +113,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage,
BASE_FEATURE(kSyncPollImmediatelyOnEveryStartup,
"SyncPollImmediatelyOnEveryStartup2",
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_metrics_cpu__probe_cpu__probe.cc b/www/chromium/files/patch-components_system__cpu_cpu__probe.cc
index 350e3e61130d..bbd2188c9fed 100644
--- a/www/chromium/files/patch-chrome_browser_performance__manager_metrics_cpu__probe_cpu__probe.cc
+++ b/www/chromium/files/patch-components_system__cpu_cpu__probe.cc
@@ -1,5 +1,5 @@
---- chrome/browser/performance_manager/metrics/cpu_probe/cpu_probe.cc.orig 2023-12-10 06:10:27 UTC
-+++ chrome/browser/performance_manager/metrics/cpu_probe/cpu_probe.cc
+--- components/system_cpu/cpu_probe.cc.orig 2024-02-23 21:04:38 UTC
++++ components/system_cpu/cpu_probe.cc
@@ -30,6 +30,9 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() {
return CpuProbeWin::Create();
#elif BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
index 90aa9dccab9f..084b204dae90 100644
--- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
+++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
@@ -1,6 +1,6 @@
---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-09-13 12:11:42 UTC
+--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2024-02-23 21:04:38 UTC
+++ components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -293,7 +293,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
+@@ -294,7 +294,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
// The ideal fix would be to change the omnibox font used for Thai. In
// that case, the Linux-only list should be revisited and potentially
// removed.
diff --git a/www/chromium/files/patch-components_variations_service_variations__service.cc b/www/chromium/files/patch-components_variations_service_variations__service.cc
index 1f99986bf844..0f02d30b0b80 100644
--- a/www/chromium/files/patch-components_variations_service_variations__service.cc
+++ b/www/chromium/files/patch-components_variations_service_variations__service.cc
@@ -1,6 +1,6 @@
---- components/variations/service/variations_service.cc.orig 2023-12-10 06:10:27 UTC
+--- components/variations/service/variations_service.cc.orig 2024-02-23 21:04:38 UTC
+++ components/variations/service/variations_service.cc
-@@ -96,7 +96,7 @@ std::string GetPlatformString() {
+@@ -98,7 +98,7 @@ std::string GetPlatformString() {
return "android";
#elif BUILDFLAG(IS_FUCHSIA)
return "fuchsia";
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index f8e8e3bfdd62..f21998db099a 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1528,7 +1528,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1549,7 +1549,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
->GetDeviceQueue()
->GetVulkanPhysicalDevice(),
VK_IMAGE_TILING_OPTIMAL, vk_format, yuv_color_space, ycbcr_info);
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc
deleted file mode 100644
index 624cac3e4644..000000000000
--- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig 2024-01-30 07:53:34 UTC
-+++ components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
-@@ -1564,7 +1564,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12(
-
- // Issue readbacks from the surfaces:
- for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
-+#if defined(__clang__) && (__clang_major__ >= 16)
- SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
-+#else
-+ SkISize s = { plane_surfaces[i]->width(), plane_surfaces[i]->height() };
-+ SkISize size(s);
-+#endif
- SkImageInfo dst_info = SkImageInfo::Make(
- size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
- kUnpremul_SkAlphaType);
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
index 932210a9ce0d..3f501b56ec58 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
@@ -1,4 +1,4 @@
---- components/viz/service/display_embedder/software_output_surface.cc.orig 2023-12-10 06:10:27 UTC
+--- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-02-23 21:04:38 UTC
+++ components/viz/service/display_embedder/software_output_surface.cc
@@ -124,7 +124,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
@@ -9,7 +9,7 @@
if (needs_swap_size_notifications_)
client_->DidSwapWithSize(pixel_size);
#endif
-@@ -151,7 +151,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
+@@ -153,7 +153,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
index 273e2efa1462..5c7d3a455163 100644
--- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
+++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display/skia_renderer.cc.orig 2024-01-30 07:53:34 UTC
+--- components/viz/service/display/skia_renderer.cc.orig 2024-02-23 21:04:38 UTC
+++ components/viz/service/display/skia_renderer.cc
-@@ -1340,7 +1340,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1346,7 +1346,7 @@ void SkiaRenderer::ClearFramebuffer() {
if (current_frame()->current_render_pass->has_transparent_background) {
ClearCanvas(SkColors::kTransparent);
} else {
diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc
index d6392cf0a6dd..db478fe22317 100644
--- a/www/chromium/files/patch-content_app_content__main.cc
+++ b/www/chromium/files/patch-content_app_content__main.cc
@@ -1,6 +1,6 @@
---- content/app/content_main.cc.orig 2023-11-03 10:09:45 UTC
+--- content/app/content_main.cc.orig 2024-02-23 21:04:38 UTC
+++ content/app/content_main.cc
-@@ -206,7 +206,7 @@ RunContentProcess(ContentMainParams params,
+@@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params,
#endif
base::EnableTerminationOnOutOfMemory();
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index 1e04b58c8130..aacc6ebb4a18 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,4 +1,4 @@
---- content/app/content_main_runner_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- content/app/content_main_runner_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ content/app/content_main_runner_impl.cc
@@ -143,13 +143,13 @@
#include "content/browser/posix_file_descriptor_info_impl.h"
@@ -64,7 +64,7 @@
#if BUILDFLAG(ENABLE_PPAPI)
// Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -832,11 +846,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -834,11 +848,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -78,7 +78,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -1029,8 +1042,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1031,8 +1044,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
process_type == switches::kZygoteProcess) {
PreSandboxInit();
}
@@ -99,7 +99,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE)
-@@ -1098,7 +1123,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1100,7 +1125,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
->ReconfigureAfterFeatureListInit(process_type);
}
@@ -108,7 +108,7 @@
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
// the child/zygote process, before any sandbox is initialized. The library
// is not fully initialized with IPC support until a ChildProcess is later
-@@ -1133,6 +1158,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1135,6 +1160,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
content_main_params_.reset();
RegisterMainThreadFactories();
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index e0a7d2ae1478..18c4b72e122c 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- content/browser/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ content/browser/BUILD.gn
-@@ -2453,6 +2453,13 @@ source_set("browser") {
+@@ -2457,6 +2457,13 @@ source_set("browser") {
deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
}
diff --git a/www/chromium/files/patch-content_browser_audio_audio__service.cc b/www/chromium/files/patch-content_browser_audio_audio__service.cc
index 9919a5f0ec93..933a4193a464 100644
--- a/www/chromium/files/patch-content_browser_audio_audio__service.cc
+++ b/www/chromium/files/patch-content_browser_audio_audio__service.cc
@@ -1,6 +1,6 @@
---- content/browser/audio/audio_service.cc.orig 2024-01-30 07:53:34 UTC
+--- content/browser/audio/audio_service.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/audio/audio_service.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
#if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
#include "ui/display/util/edid_parser.h"
@@ -9,7 +9,7 @@
#include "ui/display/display_util.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -196,7 +196,7 @@ audio::mojom::AudioService& GetAudioService() {
+@@ -202,7 +202,7 @@ audio::mojom::AudioService& GetAudioService() {
->PostTaskAndReplyWithResult(
FROM_HERE, base::BindOnce(&ScanEdidBitstreams),
base::BindOnce(&LaunchAudioService, std::move(receiver)));
diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
index 96a1c789b668..adcdeed1dd64 100644
--- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_child_process_host_impl.cc.orig 2023-12-10 06:10:27 UTC
+--- content/browser/browser_child_process_host_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/browser_child_process_host_impl.cc
-@@ -321,6 +321,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
+@@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
switches::kDisableBestEffortTasks,
switches::kDisableLogging,
switches::kEnableLogging,
@@ -8,7 +8,7 @@
switches::kIPCConnectionTimeout,
switches::kLogBestEffortTasks,
switches::kLogFile,
-@@ -630,7 +631,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched()
+@@ -635,7 +636,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched()
->child_process());
#endif
diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h
index f8115382bd97..b11fc9ac6cfa 100644
--- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/browser_child_process_host_impl.h.orig 2023-12-10 06:10:27 UTC
+--- content/browser/browser_child_process_host_impl.h.orig 2024-02-23 21:04:38 UTC
+++ content/browser/browser_child_process_host_impl.h
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
#include "base/win/object_watcher.h"
#endif
@@ -9,7 +9,7 @@
#include "content/browser/child_thread_type_switcher_linux.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -261,7 +261,7 @@ class BrowserChildProcessHostImpl
+@@ -264,7 +264,7 @@ class BrowserChildProcessHostImpl
std::unique_ptr<tracing::SystemTracingService> system_tracing_service_;
#endif
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index 5ad4b160c8c3..eeed6943712b 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2024-01-30 07:53:34 UTC
+--- content/browser/browser_main_loop.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/browser_main_loop.cc
-@@ -248,6 +248,12 @@
+@@ -249,6 +249,12 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
#endif
@@ -13,7 +13,7 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -553,6 +559,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -554,6 +560,12 @@ int BrowserMainLoop::EarlyInitialization() {
// by now since a thread to start the ServiceManager has been created
// before the browser main loop starts.
DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,7 +26,7 @@
#endif
// GLib's spawning of new processes is buggy, so it's important that at this
-@@ -590,7 +602,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -591,7 +603,7 @@ int BrowserMainLoop::EarlyInitialization() {
base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing);
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h
index b953724522e5..dc352d3f3b73 100644
--- a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h
+++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h
@@ -1,6 +1,6 @@
---- content/browser/child_process_launcher_helper.h.orig 2023-11-03 10:09:45 UTC
+--- content/browser/child_process_launcher_helper.h.orig 2024-02-23 21:04:38 UTC
+++ content/browser/child_process_launcher_helper.h
-@@ -262,7 +262,7 @@ class ChildProcessLauncherHelper
+@@ -269,7 +269,7 @@ class ChildProcessLauncherHelper
std::unique_ptr<SandboxedProcessLauncherDelegate> delegate_;
base::WeakPtr<ChildProcessLauncher> child_process_launcher_;
@@ -8,4 +8,4 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// The priority of the process. The state is stored to avoid changing the
// setting repeatedly.
- absl::optional<base::Process::Priority> priority_;
+ std::optional<base::Process::Priority> priority_;
diff --git a/www/chromium/files/patch-content_browser_download_save__package.cc b/www/chromium/files/patch-content_browser_download_save__package.cc
deleted file mode 100644
index 7a8958bcd900..000000000000
--- a/www/chromium/files/patch-content_browser_download_save__package.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- content/browser/download/save_package.cc.orig 2023-12-10 06:10:27 UTC
-+++ content/browser/download/save_package.cc
-@@ -767,8 +767,13 @@ void SavePackage::Finish() {
- if (download_) {
- std::vector<download::DownloadSaveItemData::ItemInfo> files;
- for (auto& item : saved_success_items_) {
-+#if defined(__clang__) && (__clang_major__ >= 16)
- files.emplace_back(item.second->full_path(), item.second->url(),
- item.second->referrer().url);
-+#else
-+ files.emplace_back(download::DownloadSaveItemData::ItemInfo{item.second->full_path(), item.second->url(),
-+ item.second->referrer().url});
-+#endif
- }
- download::DownloadSaveItemData::AttachItemData(download_, std::move(files));
- }
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
index d2d198460944..02b9cbae7b8f 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2023-04-28 17:01:32 UTC
+--- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
-@@ -53,7 +53,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun
+@@ -54,7 +54,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun
#endif
}
@@ -9,10 +9,10 @@
bool IsGpuMemoryBufferNV12Supported() {
static bool is_computed = false;
static bool supported = false;
-@@ -116,7 +116,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp
+@@ -117,7 +117,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp
SetNativeConfigurations(std::move(configs));
}
- #endif
+ #endif // BUILDFLAG(IS_OZONE_X11)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Dynamic check whether the NV12 format is supported as it may be
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
index 782c2f1566b6..6744d4521117 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_process_host.cc.orig 2023-12-10 06:10:27 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/gpu/gpu_process_host.cc
-@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = {
+@@ -256,6 +256,7 @@ static const char* const kSwitchNames[] = {
switches::kEnableGpuRasterization,
switches::kEnableSkiaGraphite,
switches::kEnableLogging,
@@ -8,9 +8,9 @@
switches::kDoubleBufferCompositing,
switches::kHeadless,
switches::kLoggingLevel,
-@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = {
+@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = {
+ switches::kDisableExplicitDmaFences,
switches::kOzoneDumpFile,
- switches::kDisableBufferBWCompression,
#endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc b/www/chromium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc
deleted file mode 100644
index 5a731e9c2032..000000000000
--- a/www/chromium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- content/browser/interest_group/header_direct_from_seller_signals.cc.orig 2024-01-30 07:53:34 UTC
-+++ content/browser/interest_group/header_direct_from_seller_signals.cc
-@@ -58,7 +58,11 @@ HeaderDirectFromSellerSignals::Result::Result(
-
- HeaderDirectFromSellerSignals::Result::~Result() = default;
-
-+#if defined(__clang__) && (__clang_major__ >= 16)
- HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() = default;
-+#else
-+HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() {}
-+#endif
-
- HeaderDirectFromSellerSignals::~HeaderDirectFromSellerSignals() {
- base::UmaHistogramCounts10000(
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 9c22f7de3b12..dd4cd366552d 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -222,7 +222,7 @@
+@@ -224,7 +224,7 @@
#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
#endif
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
-@@ -951,7 +951,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -966,7 +966,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
// to indicate failure and std::numeric_limits<size_t>::max() to indicate
// unlimited.
size_t GetPlatformProcessLimit() {
@@ -18,7 +18,16 @@
struct rlimit limit;
if (getrlimit(RLIMIT_NPROC, &limit) != 0)
return kUnknownPlatformProcessLimit;
-@@ -1156,7 +1156,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1154,7 +1154,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+ IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete;
+
+ void SetPid(base::ProcessId child_pid) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ child_thread_type_switcher_.SetPid(child_pid);
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ }
+@@ -1171,7 +1171,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
return;
}
@@ -27,7 +36,7 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
-@@ -1250,7 +1250,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1265,7 +1265,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
std::unique_ptr<service_manager::BinderRegistry> binders_;
mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
@@ -36,7 +45,7 @@
mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
video_encode_accelerator_factory_remote_;
ChildThreadTypeSwitcher child_thread_type_switcher_;
-@@ -3327,7 +3327,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3368,7 +3368,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
}
@@ -45,11 +54,11 @@
// Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
// for NV12 GPU memory buffer.
if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
-@@ -3387,6 +3387,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3428,6 +3428,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
+ switches::kDisableUnveil,
- switches::kDisableUseSharedImagesForPepperVideo,
switches::kDisableV8IdleTasks,
switches::kDisableVideoCaptureUseGpuMemoryBuffer,
+ switches::kDisableWebGLImageChromium,
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index b5c543d6c2ad..95c43d96de61 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-12-10 06:10:27 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-02-23 21:04:38 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -540,7 +540,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -543,7 +543,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Sets this RenderProcessHost to be guest only. For Testing only.
void SetForGuestsOnlyForTesting();
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index deb6b0879d11..d30979048522 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-12-10 06:10:27 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -271,7 +271,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
+@@ -270,7 +270,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 4f1d50883346..60633f68b228 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-01-30 07:53:34 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -121,7 +121,7 @@
+@@ -120,7 +120,7 @@
#include "ui/gfx/gdi_util.h"
#endif
@@ -9,7 +9,7 @@
#include "content/browser/accessibility/browser_accessibility_auralinux.h"
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/base/ime/text_input_flags.h"
-@@ -463,7 +463,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
+@@ -458,7 +458,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot())
->GetCOM();
@@ -18,7 +18,7 @@
BrowserAccessibilityManager* manager =
host()->GetOrCreateRootBrowserAccessibilityManager();
if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1724,7 +1724,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1696,7 +1696,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
return GetTextInputManager() && GetTextInputManager()->should_do_learning();
}
@@ -27,7 +27,7 @@
bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
const gfx::Range& range,
const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2568,7 +2568,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2540,7 +2540,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
return NeedsInputGrab();
#else
return false;
-@@ -2751,7 +2751,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2723,7 +2723,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
index a9844a1af64f..549fd19eaa1b 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-01-30 07:53:34 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-02-23 21:04:38 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -258,7 +258,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
+@@ -256,7 +256,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
ukm::SourceId GetClientSourceForMetrics() const override;
bool ShouldDoLearning() override;
diff --git a/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc b/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc
deleted file mode 100644
index 87718e4a3142..000000000000
--- a/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-12-13 12:27:17 UTC
-+++ content/browser/service_worker/service_worker_context_wrapper.cc
-@@ -1470,7 +1470,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW
- return;
- }
-
-+#if defined(__clang__) && (__clang_major__ >= 16)
- auto [document_url, key, callback] = std::move(*request);
-+#else
-+ auto [d_u, key, callback] = std::move(*request);
-+ auto document_url = d_u;
-+#endif
-
- DCHECK(document_url.is_valid());
- TRACE_EVENT1("ServiceWorker",
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc
index 1fb7a22a251e..bd4a044fd450 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_process_host.cc.orig 2023-12-10 06:10:27 UTC
+--- content/browser/utility_process_host.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/utility_process_host.cc
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
#include "content/browser/v8_snapshot_files.h"
#endif
@@ -9,16 +9,16 @@
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/pickle.h"
-@@ -70,7 +70,7 @@
- #include "media/capture/capture_switches.h"
+@@ -75,7 +75,7 @@
+ #include "services/network/public/mojom/network_service.mojom.h"
#endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "base/task/sequenced_task_runner.h"
#include "components/viz/host/gpu_client.h"
#include "media/capture/capture_switches.h"
-@@ -81,7 +81,7 @@ namespace content {
+@@ -86,7 +86,7 @@ namespace content {
namespace {
@@ -27,16 +27,16 @@
base::ScopedFD PassNetworkContextParentDirs(
std::vector<base::FilePath> network_context_parent_dirs) {
base::Pickle pickle;
-@@ -130,7 +130,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr
+@@ -150,7 +150,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr
started_(false),
name_(u"utility process"),
file_data_(std::make_unique<ChildProcessLauncherFileData>()),
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)),
#endif
client_(std::move(client)) {
-@@ -417,7 +417,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -432,7 +432,7 @@ bool UtilityProcessHost::StartProcess() {
file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload());
#endif // BUILDFLAG(IS_POSIX)
@@ -45,12 +45,19 @@
// The network service should have access to the parent directories
// necessary for its usage.
if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
-@@ -428,7 +428,7 @@ bool UtilityProcessHost::StartProcess() {
+@@ -443,13 +443,13 @@ bool UtilityProcessHost::StartProcess() {
}
#endif // BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only
+ // when the video capture use GPU memory buffer enabled.
+ if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
+ bool pass_gpu_buffer_flag =
+ switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only
- // when the video capture use GPU memory buffer enabled and NV12 GPU memory
- // buffer supported.
+ // Check if NV12 GPU memory buffer supported at the same time.
+ pass_gpu_buffer_flag =
+ pass_gpu_buffer_flag &&
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.h b/www/chromium/files/patch-content_browser_utility__process__host.h
index ee3a930b43fa..34cc52d1338e 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host.h
+++ b/www/chromium/files/patch-content_browser_utility__process__host.h
@@ -1,11 +1,11 @@
---- content/browser/utility_process_host.h.orig 2023-09-13 12:11:42 UTC
+--- content/browser/utility_process_host.h.orig 2024-02-23 21:04:38 UTC
+++ content/browser/utility_process_host.h
@@ -39,7 +39,7 @@ namespace base {
class Thread;
} // namespace base
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
namespace viz {
class GpuClient;
} // namespace viz
@@ -13,8 +13,8 @@
std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_;
#endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_;
#endif
diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
index 5b46d1809541..48ff081a2245 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
@@ -1,4 +1,4 @@
---- content/browser/utility_process_host_receiver_bindings.cc.orig 2023-09-13 12:11:42 UTC
+--- content/browser/utility_process_host_receiver_bindings.cc.orig 2024-02-23 21:04:38 UTC
+++ content/browser/utility_process_host_receiver_bindings.cc
@@ -10,12 +10,12 @@
#include "content/public/browser/content_browser_client.h"
@@ -10,8 +10,8 @@
#include "content/browser/font_service.h" // nogncheck
#endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "components/viz/host/gpu_client.h"
#include "content/public/browser/gpu_client.h"
#endif
@@ -26,8 +26,8 @@
return;
}
#endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) {
gpu_client_ =
content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing());
diff --git a/www/chromium/files/patch-content_child_BUILD.gn b/www/chromium/files/patch-content_child_BUILD.gn
index 70b9784616f3..0d85489d1809 100644
--- a/www/chromium/files/patch-content_child_BUILD.gn
+++ b/www/chromium/files/patch-content_child_BUILD.gn
@@ -1,6 +1,6 @@
---- content/child/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- content/child/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ content/child/BUILD.gn
-@@ -130,6 +130,13 @@ target(link_target_type, "child") {
+@@ -131,6 +131,13 @@ target(link_target_type, "child") {
]
}
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index 8bbc18b1f071..eed48a2848c3 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- content/common/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ content/common/BUILD.gn
-@@ -404,20 +404,29 @@ source_set("common") {
+@@ -442,20 +442,29 @@ source_set("common") {
}
if (is_linux || is_chromeos) {
@@ -35,7 +35,7 @@
if (use_v4l2_codec) {
deps += [ "//media/gpu/v4l2" ]
}
-@@ -487,6 +496,9 @@ if (is_linux || is_chromeos) {
+@@ -525,6 +534,9 @@ if (is_linux || is_chromeos) {
public = [ "set_process_title_linux.h" ]
sources = [ "set_process_title_linux.cc" ]
deps = [ "//base" ]
diff --git a/www/chromium/files/patch-content_common_features.cc b/www/chromium/files/patch-content_common_features.cc
index d27a9f685789..62bdfb692a0b 100644
--- a/www/chromium/files/patch-content_common_features.cc
+++ b/www/chromium/files/patch-content_common_features.cc
@@ -1,7 +1,7 @@
---- content/common/features.cc.orig 2024-01-30 07:53:34 UTC
+--- content/common/features.cc.orig 2024-02-23 21:04:38 UTC
+++ content/common/features.cc
-@@ -174,7 +174,7 @@ BASE_FEATURE(kEnableBackForwardCacheForScreenReader,
- base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -166,7 +166,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe
+ base::FEATURE_DISABLED_BY_DEFAULT);
// Enables error reporting for JS errors inside DevTools frontend host
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -9,7 +9,7 @@
BASE_FEATURE(kEnableDevToolsJsErrorReporting,
"EnableDevToolsJsErrorReporting",
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -256,7 +256,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin,
+@@ -254,7 +254,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin,
// process and having browser process handle adjusting thread properties (nice
// value, c-group, latency sensitivity...) for children which have sandbox
// restrictions.
diff --git a/www/chromium/files/patch-content_common_features.h b/www/chromium/files/patch-content_common_features.h
index 4ff3b610d190..70ccff7b94c3 100644
--- a/www/chromium/files/patch-content_common_features.h
+++ b/www/chromium/files/patch-content_common_features.h
@@ -1,9 +1,9 @@
---- content/common/features.h.orig 2024-01-30 07:53:34 UTC
+--- content/common/features.h.orig 2024-02-23 21:04:38 UTC
+++ content/common/features.h
-@@ -38,7 +38,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDeviceMonitorMac)
- #endif
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation);
+@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg
CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(
+ kEnableBackForwardCacheForOngoingSubframeNavigation);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting);
diff --git a/www/chromium/files/patch-content_common_mojo__core__library__support.cc b/www/chromium/files/patch-content_common_mojo__core__library__support.cc
index 06c2981025ca..c6003a4713a4 100644
--- a/www/chromium/files/patch-content_common_mojo__core__library__support.cc
+++ b/www/chromium/files/patch-content_common_mojo__core__library__support.cc
@@ -1,9 +1,9 @@
---- content/common/mojo_core_library_support.cc.orig 2022-02-28 16:54:41 UTC
+--- content/common/mojo_core_library_support.cc.orig 2024-02-23 21:04:38 UTC
+++ content/common/mojo_core_library_support.cc
@@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() {
}
- absl::optional<base::FilePath> GetMojoCoreSharedLibraryPath() {
+ std::optional<base::FilePath> GetMojoCoreSharedLibraryPath() {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const base::CommandLine& command_line =
diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
index 2f4f1418d1fd..5282341d40c8 100644
--- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2023-05-31 08:12:17 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
#if BUILDFLAG(IS_MAC)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#endif
-@@ -35,7 +35,7 @@ typedef struct CGFont* CGFontRef;
+@@ -36,7 +36,7 @@ typedef struct CGFont* CGFontRef;
namespace content {
PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
ChildThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -54,7 +54,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
+@@ -55,7 +55,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
void PpapiBlinkPlatformImpl::Shutdown() {}
blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
index e6e8118a3307..cd0f7746c10c 100644
--- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
@@ -1,6 +1,6 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2023-05-31 08:12:17 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2024-02-23 21:04:38 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
-@@ -33,7 +33,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
+@@ -34,7 +34,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
blink::WebString DefaultLocale() override;
private:
diff --git a/www/chromium/files/patch-content_public_browser_content__browser__client.cc b/www/chromium/files/patch-content_public_browser_content__browser__client.cc
index d28e8d85e311..1e113e19f2ab 100644
--- a/www/chromium/files/patch-content_public_browser_content__browser__client.cc
+++ b/www/chromium/files/patch-content_public_browser_content__browser__client.cc
@@ -1,6 +1,6 @@
---- content/public/browser/content_browser_client.cc.orig 2024-01-30 07:53:34 UTC
+--- content/public/browser/content_browser_client.cc.orig 2024-02-23 21:04:38 UTC
+++ content/public/browser/content_browser_client.cc
-@@ -1286,7 +1286,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
+@@ -1273,7 +1273,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
// that can be adequately sandboxed.
// Currently Android's network service will not run out of process or sandboxed,
// so OutOfProcessSystemDnsResolution is not currently enabled on Android.
diff --git a/www/chromium/files/patch-content_public_browser_web__ui__browser__interface__broker__registry.h b/www/chromium/files/patch-content_public_browser_web__ui__browser__interface__broker__registry.h
deleted file mode 100644
index b3a3ed2eba35..000000000000
--- a/www/chromium/files/patch-content_public_browser_web__ui__browser__interface__broker__registry.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- content/public/browser/web_ui_browser_interface_broker_registry.h.orig 2023-08-17 07:33:31 UTC
-+++ content/public/browser/web_ui_browser_interface_broker_registry.h
-@@ -127,10 +127,10 @@ class CONTENT_EXPORT WebUIBrowserInterfaceBrokerRegist
- //
- // TODO(crbug.com/1407936): Point to WebUIJsBridge documentation.
- template <typename ControllerType>
-- JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
-+ typename JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
- using Traits = JsBridgeTraits<ControllerType>;
-- using Interface = Traits::Interface;
-- using JsBridgeBinderInitializer = Traits::BinderInitializer;
-+ using Interface = typename Traits::Interface;
-+ using JsBridgeBinderInitializer = typename Traits::BinderInitializer;
-
- // WebUIController::GetType() requires an instantiated WebUIController
- // (because it's a virtual method and can't be static). Here we only have
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index 2de449519e52..35a1f2b35c92 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig 2024-02-02 06:47:16 UTC
+--- content/public/common/content_features.cc.orig 2024-02-23 21:04:38 UTC
+++ content/public/common/content_features.cc
@@ -40,7 +40,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
"AudioServiceOutOfProcess",
@@ -18,7 +18,16 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1190,7 +1190,7 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -664,7 +664,7 @@ BASE_FEATURE(kOverscrollHistoryNavigation,
+ // Setting to control overscroll history navigation.
+ BASE_FEATURE(kOverscrollHistoryNavigationSetting,
+ "OverscrollHistoryNavigationSetting",
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT
+@@ -1208,7 +1208,7 @@ BASE_FEATURE(kWebAssemblyTiering,
BASE_FEATURE(kWebAssemblyTrapHandler,
"WebAssemblyTrapHandler",
#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -27,7 +36,7 @@
defined(ARCH_CPU_X86_64)) || \
(BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
base::FEATURE_ENABLED_BY_DEFAULT
-@@ -1232,7 +1232,11 @@ BASE_FEATURE(kWebUICodeCache,
+@@ -1250,7 +1250,11 @@ BASE_FEATURE(kWebUICodeCache,
// Controls whether the WebUSB API is enabled:
// https://wicg.github.io/webusb
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index 830f0080e7bc..e0f4925eec2a 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig 2024-01-30 07:53:34 UTC
+--- content/public/common/content_switches.cc.orig 2024-02-23 21:04:38 UTC
+++ content/public/common/content_switches.cc
-@@ -364,6 +364,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
+@@ -366,6 +366,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
// builds.
const char kEnableLogging[] = "enable-logging";
@@ -9,7 +9,7 @@
// Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
// triggering of change attribute of the NetInfo API when there is a change in
// the connection type.
-@@ -1007,7 +1009,7 @@ const char kPreventResizingContentsForTesting[] =
+@@ -1009,7 +1011,7 @@ const char kPreventResizingContentsForTesting[] =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index 00394bf97615..181a636db478 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- content/renderer/render_thread_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -206,6 +206,8 @@
+@@ -203,6 +203,8 @@
#if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -1013,7 +1015,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -942,7 +944,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
kGpuStreamIdMedia, kGpuStreamPriorityMedia);
const bool enable_video_decode_accelerator =
@@ -18,7 +18,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
#endif // BUILDFLAG(IS_LINUX)
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1022,7 +1024,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -951,7 +953,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
gpu::kGpuFeatureStatusEnabled);
const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) &&
#else
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1797,7 +1799,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
+@@ -1740,7 +1742,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
bool enable_video_encode_accelerator) {
mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
vea_provider;
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index a820d3296962..74fc3c2f5231 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -113,7 +113,7 @@
+@@ -114,7 +114,7 @@
#if BUILDFLAG(IS_MAC)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#include "content/child/sandboxed_process_thread_type_handler.h"
#endif
-@@ -183,13 +183,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -184,13 +184,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
is_locked_to_site_(false),
main_thread_scheduler_(main_thread_scheduler),
next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -25,7 +25,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -198,7 +198,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -199,7 +199,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
}
@@ -34,7 +34,7 @@
if (sandboxEnabled()) {
#if BUILDFLAG(IS_MAC)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -259,7 +259,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -260,7 +260,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
#endif
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index 130a6a8c43f8..4588d483eb6f 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2024-01-30 07:53:34 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2024-02-23 21:04:38 UTC
+++ content/renderer/renderer_blink_platform_impl.h
-@@ -244,7 +244,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -246,7 +246,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
const gpu::GPUInfo& gpu_info) const;
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index 81be5f7b3745..462858df56c0 100644
--- a/www/chromium/files/patch-content_test_BUILD.gn
+++ b/www/chromium/files/patch-content_test_BUILD.gn
@@ -1,6 +1,6 @@
---- content/test/BUILD.gn.orig 2024-01-30 07:53:34 UTC
+--- content/test/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ content/test/BUILD.gn
-@@ -2265,7 +2265,7 @@ static_library("run_all_unittests") {
+@@ -2262,7 +2262,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
@@ -9,7 +9,7 @@
deps += [ "//content/common:set_process_title_linux" ]
}
}
-@@ -3367,7 +3367,7 @@ test("content_unittests") {
+@@ -3373,7 +3373,7 @@ test("content_unittests") {
deps += [ "//third_party/boringssl" ]
}
diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc
index 197ff99b753d..ff1a6eb5e3b8 100644
--- a/www/chromium/files/patch-content_utility_services.cc
+++ b/www/chromium/files/patch-content_utility_services.cc
@@ -1,4 +1,4 @@
---- content/utility/services.cc.orig 2024-01-30 07:53:34 UTC
+--- content/utility/services.cc.orig 2024-02-23 21:04:38 UTC
+++ content/utility/services.cc
@@ -67,7 +67,7 @@
extern sandbox::TargetServices* g_utility_target_services;
@@ -22,12 +22,12 @@
#include "ui/accessibility/accessibility_features.h"
#endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "media/capture/capture_switches.h"
#include "services/viz/public/cpp/gpu/gpu.h"
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-@@ -225,7 +225,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+@@ -226,7 +226,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
<< "task_policy_set TASK_QOS_POLICY";
#endif
@@ -36,16 +36,16 @@
auto* command_line = base::CommandLine::ForCurrentProcess();
if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
sandbox::mojom::Sandbox::kNoSandbox) {
-@@ -307,7 +307,7 @@ auto RunVideoCapture(
+@@ -308,7 +308,7 @@ auto RunVideoCapture(
mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) {
auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>(
std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
- mojo::PendingRemote<viz::mojom::Gpu> remote_gpu;
- content::UtilityThread::Get()->BindHostReceiver(
-@@ -346,7 +346,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+ {
+ #else
+@@ -352,7 +352,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
@@ -54,7 +54,7 @@
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
auto RunStableVideoDecoderFactoryProcessService(
mojo::PendingReceiver<
-@@ -357,7 +357,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+@@ -363,7 +363,7 @@ auto RunStableVideoDecoderFactoryProcessService(
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
// (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
@@ -63,7 +63,7 @@
auto RunVideoEncodeAcceleratorProviderFactory(
mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
receiver) {
-@@ -380,7 +380,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
+@@ -386,7 +386,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
// loop of type IO that can get notified when pipes have data.
services.Add(RunNetworkService);
@@ -72,7 +72,7 @@
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
if (base::FeatureList::IsEnabled(
features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) {
-@@ -428,7 +428,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -434,7 +434,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
@@ -81,7 +81,7 @@
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
if (!base::FeatureList::IsEnabled(
features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) {
-@@ -437,7 +437,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -443,7 +443,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
// (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc
index 11420bb747c0..5d968ce3283f 100644
--- a/www/chromium/files/patch-content_utility_utility__main.cc
+++ b/www/chromium/files/patch-content_utility_utility__main.cc
@@ -1,6 +1,6 @@
---- content/utility/utility_main.cc.orig 2024-01-30 07:53:34 UTC
+--- content/utility/utility_main.cc.orig 2024-02-23 21:04:38 UTC
+++ content/utility/utility_main.cc
-@@ -36,17 +36,21 @@
+@@ -37,17 +37,21 @@
#include "third_party/icu/source/common/unicode/unistr.h"
#include "third_party/icu/source/i18n/unicode/timezone.h"
@@ -23,7 +23,7 @@
#include "services/audio/audio_sandbox_hook_linux.h"
#include "services/network/network_sandbox_hook_linux.h"
// gn check is not smart enough to realize that this include only applies to
-@@ -58,10 +62,15 @@
+@@ -59,10 +63,15 @@
#endif
#endif
@@ -40,7 +40,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chromeos/ash/components/assistant/buildflags.h"
#include "chromeos/ash/services/ime/ime_sandbox_hook.h"
-@@ -73,7 +82,7 @@
+@@ -74,7 +83,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
@@ -49,7 +49,7 @@
#include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck
#endif
-@@ -99,7 +108,7 @@ namespace content {
+@@ -100,7 +109,7 @@ namespace content {
namespace {
@@ -58,7 +58,7 @@
std::vector<std::string> GetNetworkContextsParentDirectories() {
base::MemoryMappedFile::Region region;
base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
-@@ -127,7 +136,7 @@ std::vector<std::string> GetNetworkContextsParentDirec
+@@ -128,7 +137,7 @@ std::vector<std::string> GetNetworkContextsParentDirec
bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) {
const bool obtain_gpu_info =
@@ -67,7 +67,7 @@
sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding;
-@@ -250,7 +259,8 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -251,7 +260,8 @@ int UtilityMain(MainFunctionParams parameters) {
}
}
@@ -77,7 +77,7 @@
// Thread type delegate of the process should be registered before
// first thread type change in ChildProcess constructor.
// It also needs to be registered before the process has multiple threads,
-@@ -261,7 +271,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -262,7 +272,7 @@ int UtilityMain(MainFunctionParams parameters) {
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -86,7 +86,7 @@
// Initializes the sandbox before any threads are created.
// TODO(jorgelo): move this after GTK initialization when we enable a strict
// Seccomp-BPF policy.
-@@ -296,7 +306,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -297,7 +307,7 @@ int UtilityMain(MainFunctionParams parameters) {
pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook);
break;
#endif
@@ -95,7 +95,7 @@
case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
pre_sandbox_hook =
base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -323,6 +333,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -324,6 +334,7 @@ int UtilityMain(MainFunctionParams parameters) {
default:
break;
}
@@ -103,7 +103,7 @@
if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
(parameters.zygote_child || !pre_sandbox_hook.is_null())) {
sandbox_options.use_amd_specific_policies =
-@@ -330,6 +341,11 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -331,6 +342,11 @@ int UtilityMain(MainFunctionParams parameters) {
sandbox::policy::Sandbox::Initialize(
sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
}
diff --git a/www/chromium/files/patch-content_utility_utility__thread__impl.cc b/www/chromium/files/patch-content_utility_utility__thread__impl.cc
index 32c902cf300a..508558300978 100644
--- a/www/chromium/files/patch-content_utility_utility__thread__impl.cc
+++ b/www/chromium/files/patch-content_utility_utility__thread__impl.cc
@@ -1,8 +1,8 @@
---- content/utility/utility_thread_impl.cc.orig 2023-12-10 06:10:27 UTC
+--- content/utility/utility_thread_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ content/utility/utility_thread_impl.cc
@@ -32,7 +32,7 @@
+ #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/service_factory.h"
- #include "third_party/abseil-cpp/absl/types/optional.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc
index a8f93d1ec5e9..83c8938e2c5b 100644
--- a/www/chromium/files/patch-content_zygote_zygote__linux.cc
+++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_linux.cc.orig 2023-09-13 12:11:42 UTC
+--- content/zygote/zygote_linux.cc.orig 2024-02-23 21:04:38 UTC
+++ content/zygote/zygote_linux.cc
@@ -1,6 +1,7 @@
// Copyright 2012 The Chromium Authors
@@ -8,7 +8,7 @@
#include "content/zygote/zygote_linux.h"
-@@ -707,3 +708,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
+@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
}
} // namespace content
diff --git a/www/chromium/files/patch-extensions_browser_api_management_management__api.cc b/www/chromium/files/patch-extensions_browser_api_management_management__api.cc
index 71e280ab976a..daa0b3622e52 100644
--- a/www/chromium/files/patch-extensions_browser_api_management_management__api.cc
+++ b/www/chromium/files/patch-extensions_browser_api_management_management__api.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/management/management_api.cc.orig 2023-12-10 06:10:27 UTC
+--- extensions/browser/api/management/management_api.cc.orig 2024-02-23 21:04:38 UTC
+++ extensions/browser/api/management/management_api.cc
-@@ -278,7 +278,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
+@@ -279,7 +279,7 @@ bool PlatformSupportsApprovalFlowForExtensions() {
#if BUILDFLAG(IS_CHROMEOS)
// ChromeOS devices have this feature already shipped.
return true;
diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index 7e54f1b396a9..b1f943f2ee61 100644
--- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2023-12-10 06:10:27 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig 2024-02-23 21:04:38 UTC
+++ extensions/browser/api/messaging/message_service.cc
@@ -70,7 +70,7 @@ namespace {
const char kReceivingEndDoesntExistError[] =
@@ -9,7 +9,7 @@
const char kMissingPermissionError[] =
"Access to native messaging requires nativeMessaging permission.";
const char kProhibitedByPoliciesError[] =
-@@ -541,7 +541,7 @@ void MessageService::OpenChannelToNativeAppImpl(
+@@ -540,7 +540,7 @@ void MessageService::OpenChannelToNativeAppImpl(
return;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-extensions_common_command.cc b/www/chromium/files/patch-extensions_common_command.cc
index c19d238128d3..56b79dc1654b 100644
--- a/www/chromium/files/patch-extensions_common_command.cc
+++ b/www/chromium/files/patch-extensions_common_command.cc
@@ -1,6 +1,6 @@
---- extensions/common/command.cc.orig 2023-10-11 18:22:24 UTC
+--- extensions/common/command.cc.orig 2024-02-23 21:04:38 UTC
+++ extensions/common/command.cc
-@@ -282,7 +282,7 @@ std::string Command::CommandPlatform() {
+@@ -283,7 +283,7 @@ std::string Command::CommandPlatform() {
return values::kKeybindingPlatformMac;
#elif BUILDFLAG(IS_CHROMEOS)
return values::kKeybindingPlatformChromeOs;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
index e0171714aeab..373c63d6f2fb 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-04-28 17:01:32 UTC
+--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
@@ -21,7 +21,7 @@ namespace {
// TODO(penghuang): verify the scanout is the right usage for video playback.
@@ -8,4 +8,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
SHARED_IMAGE_USAGE_SCANOUT |
#endif
- SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT |
+ SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE |
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
index 9875f06564e5..734e3efc508f 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-01-30 07:53:34 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
-@@ -47,7 +47,7 @@
+@@ -49,7 +49,7 @@
#include "ui/gl/gl_version_info.h"
#include "ui/gl/scoped_binders.h"
@@ -9,10 +9,10 @@
#include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
#if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES)
#include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h"
-@@ -682,7 +682,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
- const wgpu::Device& wgpuDevice,
+@@ -679,7 +679,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
wgpu::BackendType backend_type,
- std::vector<wgpu::TextureFormat> view_formats) {
+ std::vector<wgpu::TextureFormat> view_formats,
+ scoped_refptr<SharedContextState> context_state) {
-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
auto wgpu_format = ToDawnFormat(format());
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
index f8fb3d2653da..5198fb607a29 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-01-30 07:53:34 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
-@@ -139,7 +139,7 @@ bool IsFormatSupported(viz::SharedImageFormat format,
+@@ -147,7 +147,7 @@ bool IsFormatSupported(viz::SharedImageFormat format,
} // namespace
constexpr uint32_t kSupportedUsage =
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_ozone__image__gl__textures__holder.h b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_ozone__image__gl__textures__holder.h
deleted file mode 100644
index 20ddeae1a669..000000000000
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_ozone__image__gl__textures__holder.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gpu/command_buffer/service/shared_image/ozone_image_gl_textures_holder.h.orig 2023-12-10 06:10:27 UTC
-+++ gpu/command_buffer/service/shared_image/ozone_image_gl_textures_holder.h
-@@ -6,6 +6,7 @@
- #define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_OZONE_IMAGE_GL_TEXTURES_HOLDER_H_
-
- #include <memory>
-+#include <vector>
-
- #include "base/memory/raw_ptr.h"
- #include "base/memory/ref_counted.h"
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
index f90a5ce60990..c92e85b32b73 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2023-09-13 12:11:42 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/command_buffer/service/shared_image/shared_image_factory.cc
-@@ -142,7 +142,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
+@@ -143,7 +143,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER;
#elif BUILDFLAG(IS_ANDROID)
return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
index 2b9f93b1021d..aab6383e94d9 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-01-30 07:53:34 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/command_buffer/service/shared_image/shared_image_manager.cc
-@@ -548,7 +548,7 @@ bool SharedImageManager::SupportsScanoutImages() {
+@@ -550,7 +550,7 @@ bool SharedImageManager::SupportsScanoutImages() {
return true;
#elif BUILDFLAG(IS_ANDROID)
return base::AndroidHardwareBufferCompat::IsSupportAvailable();
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index 387e6025db0d..fcb777019171 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-01-30 07:53:34 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1252,7 +1252,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+@@ -1243,7 +1243,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
force_fallback_adapter = true;
}
@@ -9,7 +9,7 @@
if (!shared_context_state_->GrContextIsVulkan() &&
!shared_context_state_->IsGraphiteDawnVulkan() &&
use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) {
-@@ -1889,7 +1889,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
+@@ -1895,7 +1895,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
}
#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
index c3e9ab060f1a..e0db757af438 100644
--- a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_info_collector.cc.orig 2024-01-30 07:53:34 UTC
+--- gpu/config/gpu_info_collector.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/config/gpu_info_collector.cc
-@@ -362,7 +362,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
+@@ -364,7 +364,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance
void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) {
static BASE_FEATURE(kCollectWebGPUSupportMetrics,
"CollectWebGPUSupportMetrics",
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 8512b3400c90..c539736175cf 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig 2024-01-30 07:53:34 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -354,7 +354,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
enable_watchdog = false;
#endif
@@ -9,7 +9,7 @@
bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
#else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
// For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -394,7 +394,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -391,7 +391,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
bool attempted_startsandbox = false;
@@ -18,7 +18,7 @@
// On Chrome OS ARM Mali, GPU driver userspace creates threads when
// initializing a GL context, so start the sandbox early.
// TODO(zmo): Need to collect OS version before this.
-@@ -495,7 +495,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -492,7 +492,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
gpu_preferences_.gr_context_type = GrContextType::kGL;
}
@@ -27,7 +27,7 @@
// The ContentSandboxHelper is currently the only one implementation of
// GpuSandboxHelper and it has no dependency. Except on Linux where
// VaapiWrapper checks the GL implementation to determine which display
-@@ -577,7 +577,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -574,7 +574,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
command_line, gpu_feature_info_,
gpu_preferences_.disable_software_rasterizer, false);
if (gl_use_swiftshader_) {
@@ -36,7 +36,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -733,7 +733,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -731,7 +731,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
@@ -45,7 +45,7 @@
// Driver may create a compatibility profile context when collect graphics
// information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions.
-@@ -788,7 +788,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -786,7 +786,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
}
}
@@ -54,7 +54,7 @@
(BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
// https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -941,7 +941,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -940,7 +940,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
@@ -63,7 +63,7 @@
(BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
// https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1011,7 +1011,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1010,7 +1010,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
}
diff --git a/www/chromium/files/patch-gpu_ipc_service_x__util.h b/www/chromium/files/patch-gpu_ipc_service_x__util.h
index 610c08c17125..43a924bdc97c 100644
--- a/www/chromium/files/patch-gpu_ipc_service_x__util.h
+++ b/www/chromium/files/patch-gpu_ipc_service_x__util.h
@@ -1,16 +1,11 @@
---- gpu/ipc/service/x_util.h.orig 2022-02-28 16:54:41 UTC
+--- gpu/ipc/service/x_util.h.orig 2024-02-23 21:04:38 UTC
+++ gpu/ipc/service/x_util.h
-@@ -11,11 +11,11 @@
- #include "build/build_config.h"
+@@ -12,7 +12,7 @@
#include "gpu/ipc/service/gpu_config.h"
+ #include "ui/base/ozone_buildflags.h"
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/ozone/buildflags.h"
- #endif
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #if BUILDFLAG(OZONE_PLATFORM_X11)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
namespace gpu {
+
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc
index 1e5f452972f6..b309b71f35b2 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc
@@ -1,4 +1,4 @@
---- gpu/vulkan/vulkan_device_queue.cc.orig 2023-09-13 12:11:42 UTC
+--- gpu/vulkan/vulkan_device_queue.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/vulkan/vulkan_device_queue.cc
@@ -121,7 +121,7 @@ bool VulkanDeviceQueue::Initialize(
@@ -9,7 +9,7 @@
// If gpu_info is provided, the device should match it.
if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id ||
device_properties.deviceID != gpu_info->gpu.device_id)) {
-@@ -263,7 +263,7 @@ bool VulkanDeviceQueue::Initialize(
+@@ -264,7 +264,7 @@ bool VulkanDeviceQueue::Initialize(
// Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler
// support.
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h
index ab36cc633aa4..c50d6fe2c19f 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_device_queue.h.orig 2023-09-13 12:11:42 UTC
+--- gpu/vulkan/vulkan_device_queue.h.orig 2024-02-23 21:04:38 UTC
+++ gpu/vulkan/vulkan_device_queue.h
-@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue
+@@ -169,7 +169,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue
bool allow_protected_memory_ = false;
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
index ff4d6ae71075..b90a4fa036e9 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.cc.orig 2024-01-30 07:53:34 UTC
+--- gpu/vulkan/vulkan_function_pointers.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/vulkan/vulkan_function_pointers.cc
-@@ -1215,7 +1215,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -1289,7 +1289,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
}
}
@@ -8,8 +8,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (gfx::HasExtension(enabled_extensions,
VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) {
- vkGetImageDrmFormatModifierPropertiesEXT =
-@@ -1414,7 +1414,7 @@ void VulkanFunctionPointers::ResetForTesting() {
+ constexpr char kvkGetImageDrmFormatModifierPropertiesEXT[] =
+@@ -1489,7 +1489,7 @@ void VulkanFunctionPointers::ResetForTesting() {
vkGetSwapchainImagesKHR = nullptr;
vkQueuePresentKHR = nullptr;
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc
index 192c521820fe..ffc74d30158f 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_util.cc.orig 2023-12-10 06:10:27 UTC
+--- gpu/vulkan/vulkan_util.cc.orig 2024-02-23 21:04:38 UTC
+++ gpu/vulkan/vulkan_util.cc
-@@ -433,7 +433,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan
+@@ -443,7 +443,7 @@ bool CheckVulkanCompatibilities(const VulkanInfo& vulk
}
}
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
index 244ad62eab49..dcfc79b50d6d 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_request_context_manager.cc.orig 2022-06-17 14:20:10 UTC
+--- headless/lib/browser/headless_request_context_manager.cc.orig 2024-02-23 21:04:38 UTC
+++ headless/lib/browser/headless_request_context_manager.cc
-@@ -65,7 +65,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
+@@ -64,7 +64,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
return;
done_once = true;
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc
index 46903fa1a835..f8def4a866b3 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.cc
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.cc.orig 2023-09-13 12:11:42 UTC
+--- ipc/ipc_message_utils.cc.orig 2024-02-23 21:04:38 UTC
+++ ipc/ipc_message_utils.cc
-@@ -393,7 +393,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
+@@ -394,7 +394,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn
index 0fa3e974884b..7265ccead9c3 100644
--- a/www/chromium/files/patch-media_BUILD.gn
+++ b/www/chromium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig 2023-12-10 06:10:27 UTC
+--- media/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ media/BUILD.gn
-@@ -95,6 +95,9 @@ config("media_config") {
+@@ -96,6 +96,9 @@ config("media_config") {
defines += [ "DLOPEN_PULSEAUDIO" ]
}
}
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index 11693776b6b1..724df812a7e7 100644
--- a/www/chromium/files/patch-media_audio_BUILD.gn
+++ b/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,7 +1,7 @@
---- media/audio/BUILD.gn.orig 2023-11-03 10:09:45 UTC
+--- media/audio/BUILD.gn.orig 2024-02-23 21:04:38 UTC
+++ media/audio/BUILD.gn
-@@ -286,9 +286,20 @@ source_set("audio") {
- ]
+@@ -270,9 +270,20 @@ source_set("audio") {
+ deps += [ "//media/base/android:media_jni_headers" ]
}
- if (is_linux || is_chromeos) {
diff --git a/www/chromium/files/patch-media_base_cdm__promise__adapter.cc b/www/chromium/files/patch-media_base_cdm__promise__adapter.cc
deleted file mode 100644
index cd90d83d759c..000000000000
--- a/www/chromium/files/patch-media_base_cdm__promise__adapter.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- media/base/cdm_promise_adapter.cc.orig 2023-08-17 07:33:31 UTC
-+++ media/base/cdm_promise_adapter.cc
-@@ -94,7 +94,13 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise
- void CdmPromiseAdapter::Clear(ClearReason reason) {
- // Reject all outstanding promises.
- DCHECK(thread_checker_.CalledOnValidThread());
-+#if defined(__clang__) && (__clang_major__ >= 16)
- for (auto& [promise_id, promise] : promises_) {
-+#else
-+ for (auto& [p_i, p_e] : promises_) {
-+ auto& promise_id = p_i;
-+ auto& promise = p_e;
-+#endif
- TRACE_EVENT_NESTABLE_ASYNC_END1(
- "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
- "status", "cleared");
diff --git a/www/chromium/files/patch-media_base_libvpx__thread__wrapper.cc b/www/chromium/files/patch-media_base_libvpx__thread__wrapper.cc
new file mode 100644
index 000000000000..789d0b6eff9a
--- /dev/null
+++ b/www/chromium/files/patch-media_base_libvpx__thread__wrapper.cc
@@ -0,0 +1,24 @@
+--- media/base/libvpx_thread_wrapper.cc.orig 2024-02-23 21:04:38 UTC
++++ media/base/libvpx_thread_wrapper.cc
+@@ -5,17 +5,21 @@
+ #include "media/base/libvpx_thread_wrapper.h"
+
+ #include "media/base/codec_worker_impl.h"
++#if !BUILDFLAG(IS_BSD)
+ #include "third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h"
++#endif
+
+ namespace media {
+
+ void InitLibVpxThreadWrapper() {
++#if !BUILDFLAG(IS_BSD)
+ const VPxWorkerInterface interface =
+ CodecWorkerImpl<VPxWorkerInterface, VPxWorkerImpl, VPxWorker,
+ VPxWorkerStatus, NOT_OK, OK,
+ WORK>::GetCodecWorkerInterface();
+
+ CHECK(vpx_set_worker_interface(&interface));
++#endif
+ }
+
+ } // namespace media
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index af2eb75b18df..a4ebc3ae43c5 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig 2024-01-30 07:53:34 UTC
+--- media/base/media_switches.cc.orig 2024-02-23 21:04:38 UTC
+++ media/base/media_switches.cc
@@ -21,7 +21,7 @@
#include "ui/gl/gl_features.h"
@@ -9,7 +9,27 @@
#include "base/cpu.h"
#endif
-@@ -708,7 +708,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
+@@ -368,8 +368,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare,
+ "MacLoopbackAudioForScreenShare",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif // BUILDFLAG(IS_MAC)
+-
+-#if BUILDFLAG(IS_LINUX)
++
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables system audio mirroring using pulseaudio.
+ BASE_FEATURE(kPulseaudioLoopbackForCast,
+ "PulseaudioLoopbackForCast",
+@@ -605,7 +605,7 @@ BASE_FEATURE(kUseWritePixelsYUV,
+ BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo,
+ "UseMultiPlaneFormatForHardwareVideo",
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \
+- BUILDFLAG(IS_LINUX)
++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT
+@@ -710,7 +710,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
// Show toolbar button that opens dialog for controlling media sessions.
BASE_FEATURE(kGlobalMediaControls,
"GlobalMediaControls",
@@ -18,7 +38,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -731,7 +731,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI,
+@@ -733,7 +733,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI,
// If enabled, users can request Media Remoting without fullscreen-in-tab.
BASE_FEATURE(kMediaRemotingWithoutFullscreen,
"MediaRemotingWithoutFullscreen",
@@ -27,7 +47,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -743,7 +743,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+@@ -745,7 +745,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
"GlobalMediaControlsPictureInPicture",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +56,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -777,7 +777,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -774,7 +774,7 @@ BASE_FEATURE(kUnifiedAutoplay,
"UnifiedAutoplay",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -45,7 +65,7 @@
// Enable vaapi video decoding on linux. This is already enabled by default on
// chromeos, but needs an experiment on linux.
BASE_FEATURE(kVaapiVideoDecodeLinux,
-@@ -863,7 +863,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding,
+@@ -860,7 +860,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding,
"VaapiVp9SModeHWEncoding",
base::FEATURE_DISABLED_BY_DEFAULT);
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -54,7 +74,7 @@
// Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder.
BASE_FEATURE(kV4L2FlatStatelessVideoDecoder,
"V4L2FlatStatelessVideoDecoder",
-@@ -967,7 +967,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK,
+@@ -969,7 +969,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK,
// Live Caption can be used in multiple languages, as opposed to just English.
BASE_FEATURE(kLiveCaptionMultiLanguage,
"LiveCaptionMultiLanguage",
@@ -63,12 +83,12 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1402,7 +1402,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo
- };
+@@ -1437,7 +1437,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding,
+ );
#endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Spawn utility processes to perform hardware encode acceleration instead of
// using the GPU process.
- const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoEncoding{
+ BASE_FEATURE(kUseOutOfProcessVideoEncoding,
diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h
index 763579a910f7..1e9ed766838c 100644
--- a/www/chromium/files/patch-media_base_media__switches.h
+++ b/www/chromium/files/patch-media_base_media__switches.h
@@ -1,6 +1,15 @@
---- media/base/media_switches.h.orig 2024-01-30 07:53:34 UTC
+--- media/base/media_switches.h.orig 2024-02-23 21:04:38 UTC
+++ media/base/media_switches.h
-@@ -323,7 +323,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
+@@ -307,7 +307,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend);
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare);
+ #endif // BUILDFLAG(IS_LINUX)
+@@ -325,7 +325,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
@@ -9,7 +18,7 @@
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux);
-@@ -342,7 +342,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa
+@@ -344,7 +344,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -18,7 +27,7 @@
MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder);
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -463,7 +463,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV
+@@ -471,7 +471,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
#endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
diff --git a/www/chromium/files/patch-media_base_scopedfd__helper.h b/www/chromium/files/patch-media_base_scopedfd__helper.h
deleted file mode 100644
index 8bf62e4233ce..000000000000
--- a/www/chromium/files/patch-media_base_scopedfd__helper.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/base/scopedfd_helper.h.orig 2022-02-28 16:54:41 UTC
-+++ media/base/scopedfd_helper.h
-@@ -15,7 +15,7 @@ namespace media {
- // but since the only current user is V4L2 we are limiting the scope to OS_LINUX
- // so the binary size does not inflate on non-using systems. Feel free to adapt
- // this and BUILD.gn as our needs evolve.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-
- // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an
- // error.
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index 178dd0ddfcfb..22a21c9deb49 100644
--- a/www/chromium/files/patch-media_base_video__frame.cc
+++ b/www/chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig 2024-01-30 07:53:34 UTC
+--- media/base/video_frame.cc.orig 2024-02-23 21:04:38 UTC
+++ media/base/video_frame.cc
@@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString(
return "OWNED_MEMORY";
@@ -60,10 +60,10 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
- DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
-
-@@ -1425,7 +1425,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+ size_t VideoFrame::NumDmabufFds() const {
+ return dmabuf_fds_->size();
+ }
+@@ -1429,7 +1429,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
storage_type_(storage_type),
visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
natural_size_(natural_size),
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index 8cf14a246255..9b51b20061e4 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,4 +1,4 @@
---- media/base/video_frame.h.orig 2023-10-11 18:22:24 UTC
+--- media/base/video_frame.h.orig 2024-02-23 21:04:38 UTC
+++ media/base/video_frame.h
@@ -44,7 +44,7 @@
#include "base/apple/scoped_cftyperef.h"
@@ -33,9 +33,9 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Returns a vector containing the backing DmaBufs for this frame. The number
- // of returned DmaBufs will be equal or less than the number of planes of
+ // The number of DmaBufs will be equal or less than the number of planes of
// the frame. If there are less, this means that the last FD contains the
+ // remaining planes. Should be > 0 for STORAGE_DMABUFS.
@@ -811,7 +811,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
diff --git a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
index 253650b0a80b..ace05c1bb66f 100644
--- a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
@@ -1,6 +1,6 @@
---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-09-13 12:11:42 UTC
+--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2024-02-23 21:04:38 UTC
+++ media/capture/video/linux/fake_v4l2_impl.cc
-@@ -560,7 +560,7 @@ int FakeV4L2Impl::close(int fd) {
+@@ -561,7 +561,7 @@ int FakeV4L2Impl::close(int fd) {
return kSuccessReturnValue;
}
diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
index 438845fe1d4e..21a637af00b0 100644
--- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2024-01-30 07:53:34 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2024-02-23 21:04:38 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.cc
@@ -5,8 +5,10 @@
#include "media/capture/video/linux/v4l2_capture_delegate.h"
@@ -47,7 +47,7 @@
namespace media {
namespace {
-@@ -265,7 +277,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control
+@@ -264,7 +276,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control
// static
bool V4L2CaptureDelegate::IsControllableControl(
int control_id,
@@ -56,7 +56,7 @@
const int special_control_id = GetControllingSpecialControl(control_id);
if (!special_control_id) {
// The control is not controlled by a special control thus the control is
-@@ -321,7 +333,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate(
+@@ -320,7 +332,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate(
is_capturing_(false),
timeout_count_(0),
rotation_(rotation) {
@@ -65,7 +65,7 @@
use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
#endif // BUILDFLAG(IS_LINUX)
}
-@@ -448,7 +460,7 @@ void V4L2CaptureDelegate::AllocateAndStart(
+@@ -447,7 +459,7 @@ void V4L2CaptureDelegate::AllocateAndStart(
client_->OnStarted();
@@ -74,7 +74,7 @@
if (use_gpu_buffer_) {
v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(
std::move(gmb_support_test_));
-@@ -798,7 +810,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting(
+@@ -797,7 +809,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting(
V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;
@@ -83,7 +83,7 @@
int num_retries = 0;
for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
++num_retries) {
-@@ -808,7 +820,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
+@@ -807,7 +819,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
return num_retries != kMaxIOCtrlRetries;
}
@@ -92,7 +92,7 @@
return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp));
}
-@@ -819,6 +831,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
+@@ -818,6 +830,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
}
void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() {
@@ -100,7 +100,7 @@
constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS,
V4L2_CID_AUTO_WHITE_BALANCE,
V4L2_CID_BRIGHTNESS,
-@@ -846,6 +859,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
+@@ -845,6 +858,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
<< ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}";
}
}
@@ -108,7 +108,7 @@
}
mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) {
-@@ -1026,7 +1040,11 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1025,7 +1039,11 @@ void V4L2CaptureDelegate::DoCapture() {
pollfd device_pfd = {};
device_pfd.fd = device_fd_.get();
@@ -120,7 +120,7 @@
const int result =
HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs));
-@@ -1064,6 +1082,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1063,6 +1081,7 @@ void V4L2CaptureDelegate::DoCapture() {
timeout_count_ = 0;
}
@@ -128,7 +128,7 @@
// Dequeue events if the driver has filled in some.
if (device_pfd.revents & POLLPRI) {
bool controls_changed = false;
-@@ -1098,6 +1117,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1097,6 +1116,7 @@ void V4L2CaptureDelegate::DoCapture() {
client_->OnCaptureConfigurationChanged();
}
}
@@ -136,7 +136,7 @@
// Deenqueue, send and reenqueue a buffer if the driver has filled one in.
if (device_pfd.revents & POLLIN) {
-@@ -1151,7 +1171,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1150,7 +1170,7 @@ void V4L2CaptureDelegate::DoCapture() {
// workable on Linux.
// See http://crbug.com/959919.
@@ -145,7 +145,7 @@
if (use_gpu_buffer_) {
v4l2_gpu_helper_->OnIncomingCapturedData(
client_.get(), buffer_tracker->start(),
-@@ -1224,7 +1244,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr
+@@ -1223,7 +1243,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr
client_->OnError(error, from_here, reason);
}
diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc
index 7b6cdf53bac8..e88c78e3363e 100644
--- a/www/chromium/files/patch-media_gpu_buffer__validation.cc
+++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc
@@ -1,29 +1,46 @@
---- media/gpu/buffer_validation.cc.orig 2023-11-03 10:09:45 UTC
+--- media/gpu/buffer_validation.cc.orig 2024-02-23 21:04:38 UTC
+++ media/gpu/buffer_validation.cc
-@@ -15,7 +15,7 @@
+@@ -16,7 +16,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/gpu_memory_buffer.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <drm_fourcc.h>
#include <sys/types.h>
#include <unistd.h>
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -23,7 +23,7 @@
+@@ -29,7 +29,7 @@
namespace media {
+ namespace {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #ifndef I915_FORMAT_MOD_4_TILED_MTL_MC_CCS
+ // TODO(b/271455200): Remove this definition once drm_fourcc.h contains it.
+ /*
+@@ -55,7 +55,7 @@ bool IsIntelMediaCompressedModifier(uint64_t modifier)
+ } // namespace
+
bool GetFileSize(const int fd, size_t* size) {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (fd < 0) {
VLOG(1) << "Invalid file descriptor";
return false;
-@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle(
+@@ -109,14 +109,14 @@ bool VerifyGpuMemoryBufferHandle(
VLOG(1) << "Unsupported: " << pixel_format;
return false;
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
- if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
- num_planes == 0) {
+ const uint64_t modifier = gmb_handle.native_pixmap_handle.modifier;
+ const bool is_intel_media_compressed_buffer =
+ IsIntelMediaCompressedModifier(modifier);
+ const bool is_intel_media_compression_enabled =
+ #if BUILDFLAG(IS_CHROMEOS)
+ base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)