From e0eb878be532f268d77fc5715d45e22bf1fa343e Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Wed, 31 May 2023 13:52:59 +0200 Subject: [PATCH] www/chromium: update to 114.0.5735.90 Approved by: rene (mentor, implicit) Security: https://vuxml.freebsd.org/freebsd/fd87a250-ff78-11ed-8290-a8a1599412c6.html --- www/chromium/Makefile | 45 +- www/chromium/distinfo | 14 +- www/chromium/files/patch-BUILD.gn | 82 +- ...-ash_display_mirror__window__controller.cc | 4 +- www/chromium/files/patch-base_BUILD.gn | 22 +- .../patch-base_allocator_dispatcher_tls.h | 4 +- ...tor_partition__allocator_page__allocator.h | 4 +- ...ocator_page__allocator__internals__posix.h | 4 +- ..._partition__allocator_partition__alloc.gni | 4 +- ...or_partition__allocator_partition__root.cc | 10 +- ...ase_files_file__path__watcher__unittest.cc | 8 +- .../patch-base_files_file__util__unittest.cc | 6 +- ..._madv__free__discardable__memory__posix.cc | 6 +- .../patch-base_process_process__metrics.cc | 8 +- ...ch-base_process_process__metrics__posix.cc | 4 +- www/chromium/files/patch-base_rand__util.h | 4 +- .../files/patch-base_system_sys__info.cc | 4 +- .../files/patch-base_system_sys__info.h | 6 +- ...patch-base_test_launcher_test__launcher.cc | 4 +- .../patch-build_config_compiler_BUILD.gn | 31 +- .../files/patch-build_config_rust.gni | 4 +- .../patch-build_toolchain_gcc__toolchain.gni | 4 +- www/chromium/files/patch-cc_BUILD.gn | 6 +- ...h-chrome_app_app__management__strings.grdp | 4 +- .../files/patch-chrome_app_chrome__main.cc | 8 +- ...patch-chrome_app_chrome__main__delegate.cc | 24 +- .../patch-chrome_app_generated__resources.grd | 16 +- .../patch-chrome_app_profiles__strings.grdp | 4 +- .../patch-chrome_app_settings__strings.grdp | 6 +- ..._app_theme_chrome__unscaled__resources.grd | 6 +- .../patch-chrome_browser_about__flags.cc | 56 +- ...app__service_publishers_extension__apps.cc | 11 + ...ps_platform__apps_platform__app__launch.cc | 4 +- ...pps_platform__apps_platform__app__launch.h | 10 +- ...er_background_background__mode__manager.cc | 4 +- .../patch-chrome_browser_browser__features.cc | 10 +- ...h-chrome_browser_browser__process__impl.cc | 6 +- ...ser_chrome__browser__interface__binders.cc | 16 +- ...ch-chrome_browser_chrome__browser__main.cc | 10 +- ...rowser_chrome__content__browser__client.cc | 34 +- ...browser_chrome__content__browser__client.h | 4 +- ...me_browser_dev__ui__browser__resources.grd | 4 +- ..._browser_download_download__item__model.cc | 4 +- ...chrome_browser_download_download__prefs.cc | 12 +- ...trust_signals_signals__service__factory.cc | 8 +- .../patch-chrome_browser_extensions_BUILD.gn | 4 +- ...vate_passwords__private__delegate__impl.cc | 4 +- ...sions_api_settings__private_prefs__util.cc | 6 +- ...patch-chrome_browser_flag__descriptions.cc | 49 +- .../patch-chrome_browser_flag__descriptions.h | 47 +- ...ser_media_webrtc_capture__policy__utils.cc | 8 +- ...media_webrtc_chrome__screen__enumerator.cc | 16 +- ...e__browser__main__extra__parts__metrics.cc | 10 +- ...etrics_chrome__metrics__service__client.cc | 16 +- ...r_net_system__network__context__manager.cc | 14 +- ...er_net_system__network__context__manager.h | 6 +- ...uration__policy__handler__list__factory.cc | 43 +- ..._policy__value__and__status__aggregator.cc | 20 + ...tch-chrome_browser_prefs_browser__prefs.cc | 18 +- ...inting_print__backend__service__manager.cc | 17 +- ...rinting_print__backend__service__manager.h | 11 + ...-chrome_browser_printing_printer__query.cc | 4 +- ...__browser__main__extra__parts__profiles.cc | 16 +- ...h-chrome_browser_profiles_profile__impl.cc | 15 +- ...chrome_browser_profiles_profiles__state.cc | 4 +- ...ngs_appearance__page_appearance__page.html | 10 +- ...chrome_browser_resources_settings_route.ts | 4 +- ...ntent__scanning_binary__upload__service.cc | 4 +- ..._supervised__user__navigation__observer.cc | 20 + ...hrome_browser_sync_chrome__sync__client.cc | 8 +- ...ome_browser_sync_sync__service__factory.cc | 8 +- ...owser_task__manager_sampling_task__group.h | 10 +- ...ch-chrome_browser_themes_theme__service.cc | 6 +- ...browser_ui_browser__command__controller.cc | 10 +- .../patch-chrome_browser_ui_chrome__pages.cc | 4 +- .../patch-chrome_browser_ui_chrome__pages.h | 4 +- ...omnibox_omnibox__pedal__implementations.cc | 11 + ...ome_browser_ui_signin__view__controller.cc | 4 +- ...e_browser_ui_startup_bad__flags__prompt.cc | 4 +- ...er_ui_startup_startup__browser__creator.cc | 8 +- .../patch-chrome_browser_ui_tab__helpers.cc | 6 +- .../patch-chrome_browser_ui_ui__features.cc | 11 + .../patch-chrome_browser_ui_ui__features.h | 11 + ...e_browser_ui_views_frame_browser__frame.cc | 8 +- ...me_browser_ui_views_frame_browser__frame.h | 4 +- ...me_browser_ui_views_frame_browser__view.cc | 4 +- ...ture__in__picture__browser__frame__view.cc | 24 +- ...cture__in__picture__browser__frame__view.h | 6 +- ..._browser_ui_views_tabs_new__tab__button.cc | 4 +- .../patch-chrome_browser_ui_views_tabs_tab.cc | 4 +- ...ser_ui_views_tabs_tab__drag__controller.cc | 14 +- ...ews_tabs_tab__hover__card__bubble__view.cc | 4 +- ...pps_web__app__integration__test__driver.cc | 20 +- ...patch-chrome_browser_ui_webui_about__ui.cc | 6 +- ...ebui_app__home_app__home__page__handler.cc | 6 +- ...ui_chrome__web__ui__controller__factory.cc | 14 +- ...ebui_management_management__ui__handler.cc | 6 +- ..._settings__localized__strings__provider.cc | 21 +- ...b__applications_extension__status__utils.h | 4 +- ...ons_extensions_extension__status__utils.cc | 6 +- ...gration_os__integration__test__override.cc | 92 - ...egration_os__integration__test__override.h | 34 +- ..._os__integration_shortcut__sub__manager.cc | 4 +- ...on_web__app__file__handler__registration.h | 8 +- ...t_os__integration__test__override__impl.cc | 128 + ...st_os__integration__test__override__impl.h | 38 + ...hrome__authenticator__request__delegate.cc | 4 +- .../patch-chrome_common_chrome__features.cc | 12 +- .../patch-chrome_common_chrome__features.h | 8 +- ...ch-chrome_common_chrome__paths__internal.h | 4 +- .../patch-chrome_common_chrome__switches.cc | 4 +- .../patch-chrome_common_chrome__switches.h | 4 +- .../files/patch-chrome_common_pref__names.cc | 16 +- .../files/patch-chrome_common_pref__names.h | 18 +- .../patch-chrome_common_url__constants.cc | 4 +- .../patch-chrome_common_url__constants.h | 4 +- ...tch-chrome_common_webui__url__constants.cc | 12 +- ...atch-chrome_common_webui__url__constants.h | 8 +- ...enderer_chrome__render__frame__observer.cc | 4 +- ..._printing_print__backend__service__impl.cc | 10 +- www/chromium/files/patch-chrome_test_BUILD.gn | 4 +- ...patch-chrome_updater_app_app__uninstall.cc | 20 + .../files/patch-chrome_utility_services.cc | 6 +- ...ll_core_browser_personal__data__manager.cc | 4 +- ...ore_common_autofill__payments__features.cc | 4 +- ...atch-components_crash_core_common_BUILD.gn | 4 +- ...r__support_user__agent__utils__unittest.cc | 6 +- ...gagement_public_feature__configurations.cc | 10 +- ...e__engagement_public_feature__constants.cc | 16 +- ...re__engagement_public_feature__constants.h | 8 +- ...eature__engagement_public_feature__list.cc | 12 +- ...feature__engagement_public_feature__list.h | 24 +- ...patch-components_flags__ui_flags__state.cc | 4 +- ...wp__asan_crash__handler_crash__analyzer.cc | 4 +- .../patch-components_metrics_metrics__log.cc | 6 +- ...ts_omnibox_browser_omnibox__edit__model.cc | 10 + ...d__manager_core_browser_login__database.cc | 8 +- ..._core_browser_login__database__unittest.cc | 8 +- ...core_common_password__manager__features.cc | 6 +- ..._core_common_password__manager__features.h | 8 +- ...core_common_cloud_cloud__policy__client.cc | 4 +- ...ower__metrics_energy__metrics__provider.cc | 20 + ...__preview__compositor__collection__impl.cc | 6 +- ...t__preview__compositor__collection__impl.h | 20 - ...ts_update__client_update__query__params.cc | 4 +- ..._variations_service_variations__service.cc | 4 +- ...h-components_version__info_version__info.h | 14 +- ..._viz_common_gpu_dawn__context__provider.cc | 8 +- ...y__embedder_skia__output__surface__impl.cc | 4 +- ...ents_viz_service_display_skia__renderer.cc | 4 +- ...nks_root__compositor__frame__sink__impl.cc | 6 +- ...inks_root__compositor__frame__sink__impl.h | 4 +- ...content_app_content__main__runner__impl.cc | 20 +- .../files/patch-content_browser_BUILD.gn | 4 +- ...tch-content_browser_browser__main__loop.cc | 6 +- ...r_gpu_gpu__data__manager__impl__private.cc | 4 +- ...edia_frameless__media__interface__proxy.cc | 20 - ...t_browser_media_media__interface__proxy.cc | 20 - ...rowser_network__service__instance__impl.cc | 6 +- ...nderer__host_back__forward__cache__impl.cc | 4 +- ...r_renderer__host_delegated__frame__host.cc | 4 +- ...derer__host_render__process__host__impl.cc | 14 +- ...nderer__host_render__process__host__impl.h | 10 +- ...renderer__host_render__view__host__impl.cc | 4 +- ...__host_render__widget__host__view__aura.cc | 12 +- ...r__host_render__widget__host__view__aura.h | 4 +- ...-content_browser_utility__process__host.cc | 56 + ...h-content_browser_utility__process__host.h | 20 + ...lity__process__host__receiver__bindings.cc | 19 +- ...tent_browser_utility__sandbox__delegate.cc | 4 +- ...er_webui_web__ui__main__frame__observer.cc | 4 +- .../files/patch-content_common_BUILD.gn | 6 +- www/chromium/files/patch-content_gpu_BUILD.gn | 4 +- .../files/patch-content_gpu_gpu__main.cc | 12 +- ...pi__plugin_ppapi__blink__platform__impl.cc | 4 +- ...api__plugin_ppapi__blink__platform__impl.h | 18 +- ...ent_public_browser_render__process__host.h | 4 +- ...content_public_common_content__features.cc | 12 +- ...-content_public_common_content__features.h | 4 +- ...content_public_common_content__switches.cc | 6 +- ...-content_public_common_content__switches.h | 6 +- ...-content_renderer_render__process__impl.cc | 6 +- ...h-content_renderer_render__thread__impl.cc | 8 +- ...enderer_renderer__blink__platform__impl.cc | 15 +- ...renderer_renderer__blink__platform__impl.h | 22 +- .../files/patch-content_shell_BUILD.gn | 4 +- .../files/patch-content_test_BUILD.gn | 6 +- .../files/patch-content_utility_services.cc | 28 +- ..._platform__with__sandbox__support__impl.cc | 4 +- ...__platform__with__sandbox__support__impl.h | 17 +- .../patch-content_utility_utility__main.cc | 30 +- ..._browser_api_messaging_message__service.cc | 6 +- ..._networking__private__delegate__factory.cc | 4 +- ...tch-extensions_browser_extension__prefs.cc | 11 - .../patch-extensions_browser_pref__names.cc | 11 - .../patch-extensions_browser_pref__names.h | 11 - .../patch-extensions_common_api_runtime.json | 4 +- ...i_runtime_shell__runtime__api__delegate.cc | 6 +- ...and__buffer_service_gles2__cmd__decoder.cc | 4 +- ...red__image_external__vk__image__backing.cc | 6 +- ...e_external__vk__image__backing__factory.cc | 14 +- ...ared__image_wrapped__sk__image__backing.cc | 4 +- ...d__buffer_service_webgpu__decoder__impl.cc | 4 +- .../files/patch-gpu_ipc_service_gpu__init.cc | 22 +- ...b_browser_headless__web__contents__impl.cc | 4 +- www/chromium/files/patch-media_BUILD.gn | 4 +- www/chromium/files/patch-media_audio_BUILD.gn | 4 +- .../patch-media_base_cdm__promise__adapter.cc | 14 + .../files/patch-media_base_media__switches.cc | 24 +- .../files/patch-media_base_media__switches.h | 13 +- .../files/patch-media_base_video__frame.cc | 6 +- .../files/patch-media_base_video__frame.h | 8 +- .../patch-media_gpu_buffer__validation.cc | 4 +- ...a_gpu_chromeos_video__decoder__pipeline.cc | 8 +- ...h-media_gpu_vaapi_vaapi__video__decoder.cc | 4 +- .../patch-media_gpu_vaapi_vaapi__wrapper.cc | 8 +- .../files/patch-media_media__options.gni | 6 +- ...e__video__decoder__types__mojom__traits.cc | 15 +- ...le__video__decoder__types__mojom__traits.h | 4 +- ...gpu__memory__buffer__video__frame__pool.cc | 8 +- ...patch-mojo_public_tools_bindings_mojom.gni | 4 +- www/chromium/files/patch-net_BUILD.gn | 29 +- ...atch-net_base_network__change__notifier.cc | 6 +- ...ase_network__change__notifier__passive.cc} | 8 +- .../files/patch-net_cert_cert__verifier.cc | 14 +- .../patch-net_cert_cert__verify__proc.cc | 4 +- .../files/patch-net_cert_cert__verify__proc.h | 4 +- ...h-net_cert_cert__verify__proc__unittest.cc | 16 +- ...ch-net_cert_test__root__certs__unittest.cc | 12 +- ...esolution_proxy__config__service__linux.cc | 12 +- .../patch-net_socket_tcp__socket__posix.cc | 4 +- .../patch-net_socket_udp__socket__posix.cc | 8 +- ...y__tool_cert__verify__comparision__tool.cc | 4 +- ...s_cert__verify__tool_cert__verify__tool.cc | 8 +- ...oting_codec_webrtc__video__encoder__vpx.cc | 4 +- ...host_chromoting__host__services__client.cc | 6 +- ...emoting_host_desktop__capturer__wrapper.cc | 13 +- .../patch-remoting_host_host__attributes.cc | 6 +- .../patch-remoting_host_it2me_it2me__host.cc | 8 +- .../files/patch-sandbox_linux_BUILD.gn | 4 +- .../files/patch-sandbox_policy_features.cc | 8 +- .../files/patch-sandbox_policy_switches.cc | 4 +- .../files/patch-sandbox_policy_switches.h | 4 +- ...cert__verifier_cert__verifier__creation.cc | 12 +- ...device_geolocation_location__arbitrator.cc | 4 +- ...atch-services_device_public_mojom_BUILD.gn | 4 +- .../files/patch-services_network_BUILD.gn | 4 +- ...s_network_network__sandbox__hook__linux.cc | 37 +- ...patch-services_network_network__service.cc | 4 +- ...patch-services_network_public_cpp_BUILD.gn | 11 + ...tch-services_network_public_mojom_BUILD.gn | 25 + ...y_shared__dictionary__writer__in__memory.h | 11 + ...ublic_cpp_memory__instrumentation_BUILD.gn | 4 +- ...__capture_video__capture__service__impl.cc | 38 + ...o__capture_video__capture__service__impl.h | 29 + .../files/patch-third__party_angle_BUILD.gn | 8 +- ...src_gpu__info__util_SystemInfo__internal.h | 4 +- ...hird__party_angle_src_libANGLE_Display.cpp | 20 +- ...__party_angle_src_libANGLE_formatutils.cpp | 4 +- .../patch-third__party_angle_util_BUILD.gn | 4 +- ...rd__party_blink_public_platform_platform.h | 4 +- ..._renderer_controller_blink__initializer.cc | 10 +- ...nk_renderer_core_frame_web__frame__test.cc | 6 +- ...core_inspector_inspector__memory__agent.cc | 4 +- ...blink_renderer_core_layout_layout__view.cc | 10 +- ...out_ng_grid_ng__grid__layout__algorithm.cc | 33 +- ...ink_renderer_modules_ml_webnn_features.gni | 8 +- ...rer_modules_ml_webnn_ml__graph__xnnpack.cc | 4 +- ...s_webgl_webgl__rendering__context__base.cc | 4 +- ...link_renderer_modules_webgpu_gpu__queue.cc | 14 +- ...rd__party_blink_renderer_platform_BUILD.gn | 4 +- ...atform_graphics_video__frame__submitter.cc | 4 +- ..._platform_runtime__enabled__features.json5 | 21 +- ...orm_video__capture_video__capture__impl.cc | 11 + ...nk__categorized__worker__pool__delegate.cc | 11 + ...t_compositing_categorized__worker__pool.cc | 11 - .../patch-third__party_boringssl_BUILD.gn | 4 +- ...y_dawn_include_dawn_native_VulkanBackend.h | 4 +- ...omium_config_Chrome_openbsd_arm64_config.h | 751 ------ ..._Chrome_openbsd_arm64_config__components.h | 2128 ---------------- ...mium_config_Chrome_openbsd_ia32_config.asm | 735 ------ ...romium_config_Chrome_openbsd_ia32_config.h | 752 ------ ...g_Chrome_openbsd_ia32_config__components.h | 2149 ----------------- ...omium_config_Chrome_openbsd_x64_config.asm | 735 ------ ...hromium_config_Chrome_openbsd_x64_config.h | 752 ------ ...ig_Chrome_openbsd_x64_config__components.h | 2149 ----------------- ...y_ffmpeg_chromium_scripts_build__ffmpeg.py | 121 + .../files/patch-third__party_opus_BUILD.gn | 10 - ...ium_third__party_base_compiler__specific.h | 11 + ...src_tracing_core_tracing__service__impl.cc | 4 +- ...third__party_perfetto_src_tracing_track.cc | 4 +- ...n-loader_src_loader_vk__loader__platform.h | 4 +- ...s_src_layers_external_vma_vk__mem__alloc.h | 10 +- ...arty_webrtc_modules_audio__device_BUILD.gn | 4 +- ...h-third__party_webrtc_rtc__base_network.cc | 4 +- ...son__schema__compiler_feature__compiler.py | 4 +- ...ols_perf_chrome__telemetry__build_BUILD.gn | 6 +- .../patch-ui_base_ime_text__input__client.h | 4 +- ...patch-ui_base_resource_resource__bundle.cc | 4 +- ...ch-ui_base_test_skia__gold__pixel__diff.cc | 4 +- .../files/patch-ui_base_ui__base__features.cc | 15 +- .../files/patch-ui_base_ui__base__features.h | 11 + .../patch-ui_base_webui_web__ui__util.cc | 13 +- www/chromium/files/patch-ui_color_color__id.h | 4 +- .../files/patch-ui_compositor_compositor.cc | 4 +- .../files/patch-ui_compositor_compositor.h | 4 +- www/chromium/files/patch-ui_events_event.cc | 8 +- www/chromium/files/patch-ui_gfx_BUILD.gn | 4 +- .../files/patch-ui_gfx_codec_png__codec.cc | 6 +- www/chromium/files/patch-ui_gfx_font__list.cc | 11 - .../patch-ui_gfx_native__widget__types.h | 12 +- .../patch-ui_native__theme_native__theme.h | 4 +- .../files/patch-ui_ozone_common_features.cc | 11 + ..._wayland_host_wayland__toplevel__window.cc | 4 +- ...m_wayland_host_wayland__toplevel__window.h | 4 +- ...yland_host_xdg__toplevel__wrapper__impl.cc | 4 +- ...atform_wayland_ozone__platform__wayland.cc | 4 +- ...form__window_platform__window__delegate.cc | 4 +- ...tform__window_platform__window__delegate.h | 4 +- ...h-ui_views_controls_textfield_textfield.cc | 10 +- ...ch-ui_views_controls_textfield_textfield.h | 4 +- ...a_desktop__window__tree__host__platform.cc | 4 +- .../files/patch-ui_views_widget_widget.cc | 4 +- www/chromium/files/patch-v8_BUILD.gn | 8 +- www/chromium/files/patch-v8_src_api_api.cc | 6 +- ...tch-v8_src_base_platform_platform-posix.cc | 6 +- .../files/patch-v8_src_execution_isolate.cc | 4 +- ...d_platform-embedded-file-writer-generic.cc | 4 +- ...8_src_trap-handler_handler-inside-posix.cc | 6 +- .../patch-v8_src_trap-handler_trap-handler.h | 6 +- 330 files changed, 2040 insertions(+), 11631 deletions(-) create mode 100644 www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc create mode 100644 www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc create mode 100644 www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h create mode 100644 www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc create mode 100644 www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc create mode 100644 www/chromium/files/patch-chrome_browser_ui_ui__features.cc create mode 100644 www/chromium/files/patch-chrome_browser_ui_ui__features.h delete mode 100644 www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc create mode 100644 www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc create mode 100644 www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h create mode 100644 www/chromium/files/patch-chrome_updater_app_app__uninstall.cc create mode 100644 www/chromium/files/patch-components_omnibox_browser_omnibox__edit__model.cc create mode 100644 www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc delete mode 100644 www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h delete mode 100644 www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc delete mode 100644 www/chromium/files/patch-content_browser_media_media__interface__proxy.cc create mode 100644 www/chromium/files/patch-content_browser_utility__process__host.cc create mode 100644 www/chromium/files/patch-content_browser_utility__process__host.h delete mode 100644 www/chromium/files/patch-extensions_browser_extension__prefs.cc delete mode 100644 www/chromium/files/patch-extensions_browser_pref__names.cc delete mode 100644 www/chromium/files/patch-extensions_browser_pref__names.h create mode 100644 www/chromium/files/patch-media_base_cdm__promise__adapter.cc rename www/chromium/files/{patch-net_base_network__change__notifier__posix.cc => patch-net_base_network__change__notifier__passive.cc} (58%) create mode 100644 www/chromium/files/patch-services_network_public_cpp_BUILD.gn create mode 100644 www/chromium/files/patch-services_network_public_mojom_BUILD.gn create mode 100644 www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h create mode 100644 www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc create mode 100644 www/chromium/files/patch-services_video__capture_video__capture__service__impl.h create mode 100644 www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc create mode 100644 www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc delete mode 100644 www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc delete mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h delete mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h delete mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm delete mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h delete mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h delete mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm delete mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h delete mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h create mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py delete mode 100644 www/chromium/files/patch-third__party_opus_BUILD.gn create mode 100644 www/chromium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h create mode 100644 www/chromium/files/patch-ui_base_ui__base__features.h delete mode 100644 www/chromium/files/patch-ui_gfx_font__list.cc create mode 100644 www/chromium/files/patch-ui_ozone_common_features.cc diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 51f600b6fcdb..d6b5e0e99493 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 113.0.5672.126 +PORTVERSION= 114.0.5735.90 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external @@ -69,9 +69,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv:wchar_t jpeg \ - localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \ - tar:xz xorg +USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \ + iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \ + python:3.7+,build qt:5 shebangfix tar:xz xorg CPE_VENDOR= google CPE_PRODUCT= chrome @@ -121,7 +121,8 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_libjpeg=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS}" \ - extra_ldflags="${LDFLAGS}" + extra_ldflags="${LDFLAGS}" \ + ffmpeg_branding="${FFMPEG_BRAND}" # TODO: investigate building with these options: # use_system_minigbm @@ -156,10 +157,10 @@ ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/al ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false -CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ - GN_ARGS+=proprietary_codecs=true -CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ - GN_ARGS+=proprietary_codecs=false +CODECS_VARS= GN_ARGS+=proprietary_codecs=true \ + FFMPEG_BRAND="Chrome" +CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \ + FFMPEG_BRAND="Chromium" CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true @@ -229,13 +230,24 @@ BINARY_ALIAS+= ar=/usr/bin/llvm-ar \ nm=/usr/bin/llvm-nm .endif -# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only +# - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only +# - map ffmpeg target to ${ARCH} .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " -.else +FFMPEG_TARGET= arm64 +.elif ${ARCH} == amd64 +BUILD_DEPENDS+= nasm:devel/nasm PLIST_SUB+= NOT_AARCH64="" +FFMPEG_TARGET= x64 +.elif ${ARCH} == i386 +BUILD_DEPENDS+= nasm:devel/nasm +PLIST_SUB+= NOT_AARCH64="" +FFMPEG_TARGET= ia32 .endif +FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND} +FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET} + # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext @@ -264,10 +276,13 @@ pre-configure: dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \ libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE} # Chromium uses an unreleased version of FFmpeg, so configure it -.for brand in Chrome Chromium - ${CP} -R \ - ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \ - ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd + cd ${WRKSRC}/third_party/ffmpeg && \ + ${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \ + --config-only --branding=${FFMPEG_BRAND} + cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h + ${MKDIR} ${FFMPEG_CDIR} +.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil + -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR} .endfor do-configure: diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 3e8a5d67e451..7cb18604147f 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1684318714 -SHA256 (chromium-113.0.5672.126.tar.xz) = 0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93 -SIZE (chromium-113.0.5672.126.tar.xz) = 1556790928 -SHA256 (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 401df2b0b0452bcb0841b52383a98649e15ad4f6baea47dc99e913a35ae40111 -SIZE (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 27020448 -SHA256 (chromium-113.0.5672.126-testdata.tar.xz) = 89088e4cdc494ad5c468c7cf7e7ed26c4f76244d42ec74dac0ee141ead0fd6e6 -SIZE (chromium-113.0.5672.126-testdata.tar.xz) = 262980780 +TIMESTAMP = 1685521034 +SHA256 (chromium-114.0.5735.90.tar.xz) = 071a8620b6175923f91f0ce0e3a0b2b20bf350a7d1a0f5513c160df7c17526d8 +SIZE (chromium-114.0.5735.90.tar.xz) = 1570683592 +SHA256 (chrome-linux-114.0.5735.90-llvm13.profdata.tar.xz) = 2a7f6a89475266193420ba70c00858093d7cd3ed0eda2a34ded2f3a6006b1526 +SIZE (chrome-linux-114.0.5735.90-llvm13.profdata.tar.xz) = 27343652 +SHA256 (chromium-114.0.5735.90-testdata.tar.xz) = 9ce66f3d7b60e5f74d0f4e4290b1e159b3346e4afb85373c745ac44fc1d14994 +SIZE (chromium-114.0.5735.90-testdata.tar.xz) = 256217488 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 2eac54a44e3a..dafde345f6b8 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2023-04-28 17:01:32 UTC +--- BUILD.gn.orig 2023-05-31 08:12:17 UTC +++ BUILD.gn -@@ -60,7 +60,7 @@ declare_args() { +@@ -61,7 +61,7 @@ declare_args() { root_extra_deps = [] } @@ -9,49 +9,49 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -85,7 +85,6 @@ group("gn_all") { - "//codelabs", - "//components:components_unittests", - "//components/gwp_asan:gwp_asan_unittests", -- "//infra/orchestrator:orchestrator_all", - "//net:net_unittests", - "//sandbox:sandbox_unittests", - "//services:services_unittests", -@@ -426,7 +425,7 @@ group("gn_all") { +@@ -95,7 +95,6 @@ group("gn_all") { + "//codelabs", + "//components:components_unittests", + "//components/gwp_asan:gwp_asan_unittests", +- "//infra/orchestrator:orchestrator_all", + "//net:net_unittests", + "//sandbox:sandbox_unittests", + "//services:services_unittests", +@@ -419,7 +418,7 @@ group("gn_all") { + } } - } -- if (is_linux || is_chromeos || is_android) { -+ if ((is_linux && !is_bsd) || is_chromeos || is_android) { - deps += [ - "//third_party/breakpad:breakpad_unittests", - "//third_party/breakpad:core-2-minidump", -@@ -630,6 +629,15 @@ group("gn_all") { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux && !is_bsd) || is_chromeos || is_android) { + deps += [ + "//third_party/breakpad:breakpad_unittests", + "//third_party/breakpad:core-2-minidump", +@@ -619,6 +618,15 @@ group("gn_all") { + } } - } -+ if (is_bsd) { -+ deps -= [ -+ "//third_party/breakpad:dump_syms($host_toolchain)", -+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)", -+ "//third_party/breakpad:minidump_dump($host_toolchain)", -+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)", -+ ] -+ } ++ if (is_bsd) { ++ deps -= [ ++ "//third_party/breakpad:dump_syms($host_toolchain)", ++ "//third_party/breakpad:microdump_stackwalk($host_toolchain)", ++ "//third_party/breakpad:minidump_dump($host_toolchain)", ++ "//third_party/breakpad:minidump_stackwalk($host_toolchain)", ++ ] ++ } + - if (is_mac) { - deps += [ - "//third_party/breakpad:dump_syms", -@@ -677,7 +685,7 @@ group("gn_all") { - host_os == "win") { - deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] + if (is_mac) { + deps += [ + "//third_party/breakpad:dump_syms", +@@ -666,7 +674,7 @@ group("gn_all") { + host_os == "win") { + deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] + } +- } else if (!is_android && !is_ios && !is_fuchsia) { ++ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { + deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -- } else if (!is_android && !is_ios && !is_fuchsia) { -+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { - deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] - } -@@ -1100,7 +1108,7 @@ if (!is_ios) { +@@ -1096,7 +1104,7 @@ if (!is_ios && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ # WPT Webdriver tests runner # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1200,7 +1208,7 @@ if (!is_ios) { +@@ -1196,7 +1204,7 @@ if (!is_ios && !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)" ] } -@@ -1209,7 +1217,7 @@ if (!is_ios) { +@@ -1205,7 +1213,7 @@ if (!is_ios && !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)" ] } -@@ -1677,7 +1685,7 @@ group("chromium_builder_perf") { +@@ -1672,7 +1680,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index d0bcf31e3bff..1246cfbe086e 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2022-10-24 13:33:33 UTC +--- ash/display/mirror_window_controller.cc.orig 2023-05-31 08:12:17 UTC +++ ash/display/mirror_window_controller.cc -@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow( +@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow( if (!base::Contains(display_info_list, iter->first, &display::ManagedDisplayInfo::id)) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index e4a7afebc72e..99581eac42b8 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 2023-04-28 17:01:32 UTC +--- base/BUILD.gn.orig 2023-05-31 08:12:17 UTC +++ base/BUILD.gn -@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -197,7 +197,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" -@@ -1105,11 +1105,23 @@ component("base") { +@@ -1100,11 +1100,23 @@ component("base") { # Needed for 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) { sources += [ "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1137,7 +1149,7 @@ component("base") { +@@ -1132,7 +1144,7 @@ component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -43,7 +43,7 @@ sources += [ "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1178,7 +1190,7 @@ component("base") { +@@ -1173,7 +1185,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -52,7 +52,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2135,6 +2147,43 @@ component("base") { +@@ -2127,6 +2139,43 @@ component("base") { } } @@ -96,7 +96,7 @@ # iOS if (is_ios) { sources += [ -@@ -2244,7 +2293,7 @@ component("base") { +@@ -2236,7 +2285,7 @@ component("base") { } if (dep_libevent) { @@ -105,7 +105,7 @@ } if (use_libevent) { -@@ -3562,7 +3611,7 @@ test("base_unittests") { +@@ -3559,7 +3608,7 @@ test("base_unittests") { ] } @@ -114,7 +114,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3611,7 +3660,7 @@ test("base_unittests") { +@@ -3608,7 +3657,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -123,7 +123,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3622,7 +3671,7 @@ test("base_unittests") { +@@ -3619,7 +3668,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +132,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3848,7 +3897,7 @@ test("base_unittests") { +@@ -3843,7 +3892,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_dispatcher_tls.h b/www/chromium/files/patch-base_allocator_dispatcher_tls.h index 6613880dca00..51dd6a7b59fd 100644 --- a/www/chromium/files/patch-base_allocator_dispatcher_tls.h +++ b/www/chromium/files/patch-base_allocator_dispatcher_tls.h @@ -1,6 +1,6 @@ ---- base/allocator/dispatcher/tls.h.orig 2023-02-08 09:03:45 UTC +--- base/allocator/dispatcher/tls.h.orig 2023-05-31 08:12:17 UTC +++ base/allocator/dispatcher/tls.h -@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator { +@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator { partition_alloc::PartitionPageSize(); #elif BUILDFLAG(IS_APPLE) constexpr static size_t AllocationChunkSize = 16384; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h index e67310662bc4..b4837778e5d5 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator.h.orig 2022-11-30 08:12:58 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2023-05-31 08:12:17 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t +@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t // 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_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index d423837a8b87..7896aa46cbda 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-04-28 17:01:32 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-05-31 08:12:17 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -383,8 +383,12 @@ bool TryRecommitSystemPagesInternal( +@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast(address); 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 67fdc47c1f1b..1d6b8c5f9d65 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-28 17:01:32 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-05-31 08:12:17 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -285,7 +285,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt +@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt "AsanBackupRefPtr requires RawPtrHookableImpl") declare_args() { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index 0b3468df1b5e..62424268d4a0 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2023-04-28 17:01:32 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-05-31 08:12:17 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -43,7 +43,7 @@ +@@ -46,7 +46,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include #endif -@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() { +@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,7 +18,7 @@ // 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. -@@ -378,7 +378,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -381,7 +381,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // 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 -@@ -850,7 +850,7 @@ void PartitionRoot::Init(PartitionOptions +@@ -853,7 +853,7 @@ void PartitionRoot::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); 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 00e9c1bd57b2..de8691c92fe6 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 2023-02-08 09:03:45 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2023-05-31 08:12:17 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -521,7 +521,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) { +@@ -473,7 +473,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvent()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -1345,7 +1345,7 @@ enum Permission { +@@ -1275,7 +1275,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1376,7 +1376,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1306,7 +1306,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } #endif // BUILDFLAG(IS_APPLE) 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 d5440ad2aba6..7c9e00b671a6 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-04-28 17:01:32 UTC +--- base/files/file_util_unittest.cc.orig 2023-05-31 08:12:17 UTC +++ base/files/file_util_unittest.cc -@@ -3853,7 +3853,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3871,7 +3871,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"; -@@ -4576,7 +4576,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4594,7 +4594,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index ead3fe5472be..f6675773b436 100644 --- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-05-19 14:06:27 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2023-05-31 08:12:17 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -295,6 +295,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_APPLE) std::vector vec(allocated_pages_); #else -@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons return false; } return true; diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 85291ccdbdfd..e5b95631f50d 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2023-03-09 06:31:50 UTC +--- base/process/process_metrics.cc.orig 2023-05-31 08:12:17 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -27,7 +27,7 @@ Value::Dict meminfo = memory_info_.ToDict(); meminfo.Merge(vmstat_info_.ToDict()); res.Set("meminfo", std::move(meminfo)); -@@ -98,7 +98,6 @@ std::unique_ptr ProcessMetrics::Create +@@ -100,7 +100,6 @@ std::unique_ptr ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } @@ -35,7 +35,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -124,7 +123,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( double ProcessMetrics::GetPlatformIndependentCPUUsage() { return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage()); } @@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) { -@@ -155,7 +153,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { +@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index 9cd1a72c8e2a..278bd803c9f2 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_posix.cc.orig 2022-08-31 12:19:35 UTC +--- base/process/process_metrics_posix.cc.orig 2023-05-31 08:12:17 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ @@ -9,7 +9,7 @@ #else #include #endif -@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() { return stats.size_in_use; #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return GetMallocUsageMallinfo(); diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h index 63ac19b02681..f3cfae0331e7 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 2022-11-30 08:12:58 UTC +--- base/rand_util.h.orig 2023-05-31 08:12:17 UTC +++ base/rand_util.h -@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index f030b0307ea8..68ea0347c4d2 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2023-03-09 06:31:50 UTC +--- base/system/sys_info.cc.orig 2023-05-31 08:12:17 UTC +++ base/system/sys_info.cc -@@ -106,7 +106,7 @@ std::string SysInfo::HardwareModelName() { +@@ -148,7 +148,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback callback) { diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 2151241365a3..5c9937f693ca 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2023-02-08 09:03:45 UTC +--- base/system/sys_info.h.orig 2023-05-31 08:12:17 UTC +++ base/system/sys_info.h -@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo { +@@ -253,6 +253,8 @@ class BASE_EXPORT SysInfo { static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); #endif @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -257,7 +259,7 @@ class BASE_EXPORT SysInfo { +@@ -264,7 +266,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index 7b9cbd580612..6b0706a91793 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2023-03-09 06:31:50 UTC +--- base/test/launcher/test_launcher.cc.orig 2023-05-31 08:12:17 UTC +++ base/test/launcher/test_launcher.cc -@@ -67,6 +67,7 @@ +@@ -69,6 +69,7 @@ #include "third_party/libxml/chromium/libxml_utils.h" #if BUILDFLAG(IS_POSIX) diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 14ce513d99fb..5c87ed247ad9 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2023-04-28 17:01:32 UTC +--- build/config/compiler/BUILD.gn.orig 2023-05-31 08:12:17 UTC +++ build/config/compiler/BUILD.gn @@ -237,13 +237,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in @@ -38,7 +38,16 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -816,7 +823,7 @@ config("compiler") { +@@ -727,7 +734,7 @@ config("compiler") { + + ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] + +- 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 +@@ -825,7 +832,7 @@ config("compiler") { # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode # lldb doesn't have the needed changes yet. # TODO(crbug.com/1379070): Remove if the upstream default ever changes. @@ -47,7 +56,7 @@ cflags_cc += [ "-gsimple-template-names" ] } -@@ -996,7 +1003,7 @@ config("compiler_cpu_abi") { +@@ -1005,7 +1012,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1011,7 +1018,7 @@ config("compiler_cpu_abi") { +@@ -1020,7 +1027,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -65,7 +74,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1346,7 +1353,7 @@ config("compiler_deterministic") { +@@ -1355,7 +1362,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. @@ -74,7 +83,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1398,7 +1405,7 @@ config("compiler_deterministic") { +@@ -1407,7 +1414,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,7 +92,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1636,7 +1643,7 @@ config("default_warnings") { +@@ -1645,7 +1652,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -92,7 +101,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1827,7 +1834,7 @@ config("no_chromium_code") { +@@ -1836,7 +1843,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -101,7 +110,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2337,7 +2344,7 @@ config("afdo_optimize_size") { +@@ -2346,7 +2353,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") { @@ -110,7 +119,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2356,7 +2363,7 @@ config("afdo") { +@@ -2365,7 +2372,7 @@ config("afdo") { } inputs = [ _clang_sample_profile ] } @@ -119,7 +128,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2511,7 +2518,8 @@ config("symbols") { +@@ -2523,7 +2530,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni index e52e75ceb868..19d053b81726 100644 --- a/www/chromium/files/patch-build_config_rust.gni +++ b/www/chromium/files/patch-build_config_rust.gni @@ -1,6 +1,6 @@ ---- build/config/rust.gni.orig 2023-04-28 17:01:32 UTC +--- build/config/rust.gni.orig 2023-05-31 08:12:17 UTC +++ build/config/rust.gni -@@ -157,7 +157,7 @@ if (enable_rust) { +@@ -170,7 +170,7 @@ if (enable_rust) { rust_sysroot = "//third_party/rust-toolchain" use_unverified_rust_toolchain = false } else { diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 53cbcfd600fc..9f88b28c852e 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-04-28 17:01:32 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-05-31 08:12:17 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). # -@@ -837,22 +844,12 @@ template("gcc_toolchain") { +@@ -859,22 +866,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 cf0f8bed2da7..017ab0893c61 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 2023-04-28 17:01:32 UTC +--- cc/BUILD.gn.orig 2023-05-31 08:12:17 UTC +++ cc/BUILD.gn -@@ -664,7 +664,7 @@ cc_test_static_library("test_support") { +@@ -672,7 +672,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -911,7 +911,6 @@ cc_test("cc_unittests") { +@@ -922,7 +922,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-chrome_app_app__management__strings.grdp b/www/chromium/files/patch-chrome_app_app__management__strings.grdp index 951439da5219..6c9bfa4a371a 100644 --- a/www/chromium/files/patch-chrome_app_app__management__strings.grdp +++ b/www/chromium/files/patch-chrome_app_app__management__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/app_management_strings.grdp.orig 2022-07-22 17:30:31 UTC +--- chrome/app/app_management_strings.grdp.orig 2023-05-31 08:12:17 UTC +++ chrome/app/app_management_strings.grdp -@@ -173,7 +173,7 @@ +@@ -176,7 +176,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, <a href="#">learn how to set default apps on your device</a>. diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index 38eea00db206..b43e62b57bbd 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/app/chrome_main.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/app/chrome_main.cc -@@ -28,11 +28,11 @@ +@@ -27,11 +27,11 @@ #include "chrome/app/notification_metrics.h" #endif @@ -14,7 +14,7 @@ #include "chrome/app/chrome_main_linux.h" #endif -@@ -147,7 +147,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -136,7 +136,7 @@ int ChromeMain(int argc, const char** argv) { SetUpBundleOverrides(); #endif @@ -23,7 +23,7 @@ AppendExtraArgumentsToCommandLine(command_line); #endif -@@ -175,7 +175,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -164,7 +164,7 @@ int ChromeMain(int argc, const char** argv) { headless::SetUpCommandLine(command_line); } else { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 4a76c4bdcb91..59734c00d37e 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -135,7 +135,7 @@ +@@ -137,7 +137,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -179,16 +179,16 @@ +@@ -182,16 +182,16 @@ #include "v8/include/v8.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -323,7 +323,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -327,7 +327,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 -@@ -408,7 +408,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -412,7 +412,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) || -@@ -522,7 +522,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -526,7 +526,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. -@@ -611,7 +611,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -615,7 +615,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::RecordStartupProcessCreationTime( -@@ -941,7 +941,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -956,7 +956,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); @@ -74,7 +74,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1080,7 +1080,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo +@@ -1094,7 +1094,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo // 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 -@@ -1110,7 +1110,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo +@@ -1124,7 +1124,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -92,7 +92,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1484,7 +1484,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1498,7 +1498,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)) { -@@ -1586,7 +1586,7 @@ absl::variant Chrome +@@ -1600,7 +1600,7 @@ absl::variant 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_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index a57daeea1297..07888c60362a 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-04-28 17:01:32 UTC +--- chrome/app/generated_resources.grd.orig 2023-05-31 08:12:17 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,7 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3219,7 +3219,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3258,7 +3258,7 @@ are declared in tools/grit/grit_rule.gni. @@ -18,7 +18,7 @@ Device Credentials -@@ -4974,7 +4974,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -5007,7 +5007,7 @@ are declared in tools/grit/grit_rule.gni. Read information about your browser, OS, device, installed software, registry values and files @@ -27,7 +27,7 @@ Read information about your browser, OS, device, installed software and files -@@ -5644,7 +5644,7 @@ Keep your key file in a safe place. You will need it t +@@ -5689,7 +5689,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. @@ -36,7 +36,7 @@ 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. -@@ -5690,7 +5690,7 @@ Keep your key file in a safe place. You will need it t +@@ -5735,7 +5735,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. @@ -45,7 +45,7 @@ Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. -@@ -9707,7 +9707,7 @@ Check your passwords anytime in @@ -54,7 +54,7 @@ Use system title bar and borders -@@ -11048,7 +11048,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -11182,7 +11182,7 @@ Please help our engineers fix this problem. Tell us wh Set as default @@ -63,7 +63,7 @@ Minimize -@@ -13184,7 +13184,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -13324,7 +13324,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway diff --git a/www/chromium/files/patch-chrome_app_profiles__strings.grdp b/www/chromium/files/patch-chrome_app_profiles__strings.grdp index cf95a34a489e..d7816ca6c466 100644 --- a/www/chromium/files/patch-chrome_app_profiles__strings.grdp +++ b/www/chromium/files/patch-chrome_app_profiles__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/profiles_strings.grdp.orig 2022-02-07 13:39:41 UTC +--- chrome/app/profiles_strings.grdp.orig 2023-05-31 08:12:17 UTC +++ chrome/app/profiles_strings.grdp -@@ -66,7 +66,7 @@ +@@ -60,7 +60,7 @@ Add Profile... diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 60ce67608cbc..ff3753e3770a 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2023-04-05 11:05:06 UTC +--- chrome/app/settings_strings.grdp.orig 2023-05-31 08:12:17 UTC +++ chrome/app/settings_strings.grdp -@@ -166,7 +166,7 @@ +@@ -202,7 +202,7 @@ Theme @@ -9,7 +9,7 @@ GTK -@@ -186,7 +186,7 @@ +@@ -222,7 +222,7 @@ Use Classic 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 index 8172123c8583..5ccb10f413a5 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-04-05 11:05:06 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-05-31 08:12:17 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -16,7 +16,7 @@ @@ -9,7 +9,7 @@ -@@ -63,7 +63,7 @@ +@@ -67,7 +67,7 @@ @@ -18,7 +18,7 @@ -@@ -77,7 +77,7 @@ +@@ -81,7 +81,7 @@ diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 24145d4d74f3..ae690a53f3f0 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 2023-04-28 17:01:32 UTC +--- chrome/browser/about_flags.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/about_flags.cc -@@ -220,7 +220,7 @@ +@@ -221,7 +221,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -312,7 +312,7 @@ +@@ -314,7 +314,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -418,7 +418,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -420,7 +420,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -27,8 +27,8 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1447,7 +1447,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval - #endif +@@ -1447,7 +1447,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 + std::size(kChromeRefresh2023Level1), nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -36,7 +36,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = { {"DocumentProviderMaxLowQualitySuggestions", "1"}, -@@ -4637,13 +4637,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4749,13 +4749,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -52,7 +52,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -4917,7 +4917,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5032,7 +5032,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -61,7 +61,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5537,7 +5537,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5679,7 +5679,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -70,16 +70,16 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -6252,7 +6252,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, +@@ -6463,7 +6463,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kParallelDownloadingDescription, kOsAll, + FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7145,7 +7145,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7336,7 +7336,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -88,7 +88,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -7883,7 +7883,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8111,7 +8111,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -97,16 +97,16 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8108,7 +8108,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8356,7 +8356,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"enable-get-display-media-set", flag_descriptions::kGetDisplayMediaSetName, - flag_descriptions::kGetDisplayMediaSetDescription, + {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, + flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8169,7 +8169,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8417,7 +8417,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -115,7 +115,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -8722,7 +8722,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8994,7 +8994,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -124,3 +124,21 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, +@@ -9692,7 +9692,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, + FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, + +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + {"webui-system-font", flag_descriptions::kWebUiSystemFontName, + flag_descriptions::kWebUiSystemFontDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, +@@ -9893,7 +9893,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif + + #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + {"data-retention-policies-disable-sync-types-needed", + flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, + flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, diff --git a/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc b/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc new file mode 100644 index 000000000000..abef5d273c00 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc @@ -0,0 +1,11 @@ +--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2023-05-31 08:12:17 UTC ++++ chrome/browser/apps/app_service/publishers/extension_apps.cc +@@ -25,7 +25,7 @@ ExtensionApps::~ExtensionApps() = default; + + bool ExtensionApps::Accepts(const extensions::Extension* extension) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(), + extension->id())) { + return false; diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc index cd6ccf427c25..5b2bbff3d527 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc @@ -1,4 +1,4 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.cc @@ -20,7 +20,7 @@ #include "extensions/common/extension.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" -@@ -124,7 +124,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con +@@ -138,7 +138,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h index 393b6f62495b..421d2be586c0 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h @@ -1,11 +1,11 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.h -@@ -36,7 +36,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, - // and false otherwise. +@@ -37,7 +37,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, bool OpenExtensionApplicationTab(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) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and // Chrome Apps are deprecated on the |profile|. Returns true if that was the // case, or false otherwise. diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index 0efa589ecfab..f34db76c1a81 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -889,7 +889,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -874,7 +874,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc index 97d82e9e7c7e..f0c0a7280a88 100644 --- a/www/chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/chromium/files/patch-chrome_browser_browser__features.cc @@ -1,11 +1,11 @@ ---- chrome/browser/browser_features.cc.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/browser_features.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/browser_features.cc -@@ -24,7 +24,7 @@ BASE_FEATURE(kClosedTabCache, - // the browser exits. +@@ -27,7 +27,7 @@ BASE_FEATURE(kClosedTabCache, BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- 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-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index ad1d24a40f42..91327c635acf 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/browser_process_impl.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/browser_process_impl.cc @@ -213,7 +213,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1222,7 +1222,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1195,7 +1195,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1475,7 +1475,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1448,7 +1448,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_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 520dd4047f0b..4ea24d58d8ff 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 2023-04-28 17:01:32 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -113,13 +113,13 @@ +@@ -117,13 +117,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 -@@ -193,7 +193,7 @@ +@@ -197,7 +197,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -853,7 +853,7 @@ void PopulateChromeFrameBinders( +@@ -881,7 +881,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -34,7 +34,7 @@ if (!render_frame_host->GetParent()) { map->Add( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -861,7 +861,7 @@ void PopulateChromeFrameBinders( +@@ -889,7 +889,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -43,8 +43,8 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -926,14 +926,14 @@ void PopulateChromeWebUIFrameBinders( - SegmentationInternalsUI>(map); +@@ -958,14 +958,14 @@ void PopulateChromeWebUIFrameBinders( + commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1377,7 +1377,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1420,7 +1420,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 343d5124bbe1..246bf78ce181 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 2023-04-28 17:01:32 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -240,11 +240,11 @@ +@@ -241,11 +241,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 -@@ -279,7 +279,7 @@ +@@ -280,7 +280,7 @@ // 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) || \ @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -991,7 +991,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -992,7 +992,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,7 +32,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 . -@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1048,7 +1048,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) || \ 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 d989f0b99409..8dbd05118f59 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 2023-04-28 17:01:32 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -420,7 +420,7 @@ +@@ -424,7 +424,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -503,12 +503,12 @@ +@@ -512,12 +512,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 -@@ -517,14 +517,14 @@ +@@ -526,14 +526,14 @@ #include "components/crash/content/browser/crash_handler_host_linux.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) -@@ -553,11 +553,11 @@ +@@ -562,11 +562,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -55,7 +55,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1567,7 +1567,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1609,7 +1609,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true); registry->RegisterBooleanPref( policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false); @@ -64,7 +64,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1680,7 +1680,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1722,7 +1722,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique( is_integration_test, &startup_data_); @@ -73,7 +73,7 @@ main_parts = std::make_unique( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1719,7 +1719,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1761,7 +1761,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -82,7 +82,7 @@ main_parts->AddParts( std::make_unique()); #else -@@ -1740,7 +1740,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1782,7 +1782,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique()); #endif @@ -91,7 +91,7 @@ main_parts->AddParts(std::make_unique()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique()); -@@ -1759,7 +1759,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1801,7 +1801,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -100,7 +100,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2582,6 +2582,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2626,6 +2626,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -109,7 +109,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2951,7 +2953,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3020,7 +3022,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -118,7 +118,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4504,7 +4506,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4574,7 +4576,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -127,7 +127,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5023,7 +5025,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5093,7 +5095,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -136,7 +136,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5033,7 +5035,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5103,7 +5105,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -145,7 +145,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5072,7 +5074,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5142,7 +5144,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -154,7 +154,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -6703,7 +6705,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -6849,7 +6851,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS } bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { 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 b82601d53a43..0ef812447655 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,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -458,7 +458,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -460,7 +460,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index e20aad771d13..ef2e38396831 100644 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2023-02-08 09:03:45 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -33,7 +33,7 @@ This file specifies browser resources for developer-fa +@@ -34,7 +34,7 @@ This file specifies browser resources for developer-fa 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 605ab1ae00aa..71cf3353ba69 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,4 +1,4 @@ ---- chrome/browser/download/download_item_model.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/download/download_item_model.cc @@ -766,7 +766,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1222,7 +1222,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1234,7 +1234,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 fa841ca69284..63a33db14312 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 2023-05-17 10:17:13 UTC +--- chrome/browser/download/download_prefs.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ @@ -37,7 +37,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -308,7 +313,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -311,7 +316,7 @@ void DownloadPrefs::RegisterProfilePrefs( registry->RegisterTimePref(prefs::kDownloadLastCompleteTime, /*default_value=*/base::Time()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -481,7 +486,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -484,7 +489,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -55,7 +55,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -513,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -516,7 +521,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -64,7 +64,7 @@ SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -544,7 +549,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -547,7 +552,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; -@@ -668,7 +673,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -671,7 +676,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_device__trust_signals_signals__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index 06b57a07674b..57c00c7f02ed 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc @@ -18,7 +18,7 @@ #include "chrome/browser/profiles/profile.h" @@ -9,12 +9,12 @@ #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -55,7 +55,7 @@ std::unique_ptr CreateSignalsService(P +@@ -56,7 +56,7 @@ std::unique_ptr CreateSignalsService(P enterprise_signals::ContextInfoFetcher::CreateInstance( profile, ConnectorsServiceFactory::GetForBrowserContext(profile)))); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - policy::CloudPolicyStore* store = nullptr; - // Managed device. + policy::CloudPolicyStore* browser_cloud_policy_store = nullptr; + if (management_service->HasManagementAuthority( diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index a2c668c7c5de..0aaab8f95393 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 2023-04-05 11:05:06 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1340,6 +1340,10 @@ static_library("extensions") { +@@ -1348,6 +1348,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } 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 1293d8833b75..ed30073a08d1 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 2023-04-28 17:01:32 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -517,7 +517,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -544,7 +544,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 51f0ba109d68..71220f078ea4 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_STRING; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::PREF_TYPE_NUMBER; diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 0eda00536ecc..afb652ef82f7 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,15 +1,24 @@ ---- chrome/browser/flag_descriptions.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/flag_descriptions.cc -@@ -6311,7 +6311,7 @@ const char kLibAssistantV2MigrationDescription[] = +@@ -2450,7 +2450,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P + const char kWebUIOmniboxPopupDescription[] = + "If enabled, shows the omnibox suggestions popup in WebUI."; + +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + const char kWebUiSystemFontName[] = "WebUI System font"; + const char kWebUiSystemFontDescription[] = + "If enabled, all WebUI surfaces will use the default UI font of the " +@@ -6593,7 +6593,7 @@ const char kLibAssistantV2MigrationDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kGetDisplayMediaSetName[] = "GetDisplayMediaSet API"; - const char kGetDisplayMediaSetDescription[] = - "When enabled, the getDisplayMediaSet API for capturing multiple surfaces " -@@ -6559,7 +6559,7 @@ const char kSearchWebInSidePanelDescription[] = + const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; + const char kGetAllScreensMediaDescription[] = + "When enabled, the getAllScreensMedia API for capturing multiple screens " +@@ -6839,7 +6839,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +27,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -6568,7 +6568,7 @@ const char kQuickCommandsDescription[] = +@@ -6848,7 +6848,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +36,16 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -6589,7 +6589,7 @@ const char kWebShareDescription[] = +@@ -6870,7 +6870,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] + "instead of JSON."; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kUseOutOfProcessVideoDecodingName[] = + "Use out-of-process video decoding (OOP-VD)"; + const char kUseOutOfProcessVideoDecodingDescription[] = +@@ -6888,7 +6888,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -36,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6609,7 +6609,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6908,7 +6908,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -45,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -6623,7 +6623,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -6922,7 +6922,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -54,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -6724,7 +6724,7 @@ const char kElasticOverscrollDescription[] = +@@ -7023,7 +7023,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -63,3 +81,12 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; +@@ -7052,7 +7052,7 @@ const char kSigninInterceptBubbleV2Description[] = + #endif + + #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + const char kDataRetentionPoliciesDisableSyncTypesNeededName[] = + "Data Retention Policies Disable Sync Types"; + const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] = diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 54051d7d60b0..ad74f6a06df1 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,15 +1,24 @@ ---- chrome/browser/flag_descriptions.h.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/flag_descriptions.h -@@ -3660,7 +3660,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[ +@@ -1379,7 +1379,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd + extern const char kWebUIOmniboxPopupName[]; + extern const char kWebUIOmniboxPopupDescription[]; + +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + extern const char kWebUiSystemFontName[]; + extern const char kWebUiSystemFontDescription[]; + #endif +@@ -3815,7 +3815,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[ extern const char kLacrosScreenCoordinatesEnabledDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kGetDisplayMediaSetName[]; - extern const char kGetDisplayMediaSetDescription[]; - -@@ -3787,14 +3787,14 @@ extern const char kSearchWebInSidePanelDescription[]; + extern const char kGetAllScreensMediaName[]; + extern const char kGetAllScreensMediaDescription[]; + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +@@ -3942,14 +3942,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -26,7 +35,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -3804,7 +3804,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -3959,7 +3959,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -35,7 +44,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3814,7 +3814,7 @@ extern const char kOzonePlatformHintName[]; +@@ -3969,7 +3969,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -44,7 +53,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -3822,13 +3822,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -3977,13 +3977,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -60,7 +69,16 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -3908,7 +3908,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -3999,7 +3999,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; + extern const char kEnableProtoApiForClassifyUrlDescription[]; + #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kUseOutOfProcessVideoDecodingName[]; + extern const char kUseOutOfProcessVideoDecodingDescription[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -4073,7 +4073,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -69,3 +87,12 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; +@@ -4091,7 +4091,7 @@ extern const char kSigninInterceptBubbleV2Description[ + #endif + + #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[]; + extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[]; + #endif diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc index de3500fc748e..8e33f6757d7b 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -121,7 +121,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const +@@ -125,7 +125,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite( content::BrowserContext* context) { @@ -9,12 +9,12 @@ Profile* profile = Profile::FromBrowserContext(context); if (!profile) { return false; -@@ -148,7 +148,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny +@@ -162,7 +162,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny bool IsGetDisplayMediaSetSelectAllScreensAllowed( content::BrowserContext* context, const GURL& url) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) Profile* profile = Profile::FromBrowserContext(context); - if (!profile) + if (!profile) { return false; 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 ac438f7610fa..9c3ae1596e5c 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,6 +1,6 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/shell.h" #include "ui/aura/window.h" @@ -9,7 +9,7 @@ #include "base/functional/callback.h" #include "content/public/browser/desktop_capture.h" #endif -@@ -31,7 +31,7 @@ base::LazyInstance>::Destru +@@ -32,7 +32,7 @@ base::LazyInstance>::Destru root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER; } // namespace @@ -18,7 +18,7 @@ namespace { base::LazyInstance>::DestructorAtExit g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER; -@@ -77,7 +77,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( +@@ -78,7 +78,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); -@@ -128,7 +128,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( +@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( root_windows_for_testing_.Get() = std::move(root_windows); } @@ -36,9 +36,9 @@ void ChromeScreenEnumerator::SetDesktopCapturerForTesting( std::unique_ptr capturer) { g_desktop_capturer_for_testing.Get() = std::move(capturer); -@@ -144,7 +144,7 @@ void ChromeScreenEnumerator::EnumerateScreens( - DCHECK(base::FeatureList::IsEnabled( - features::kGetDisplayMediaSetAutoSelectAllScreens)); +@@ -146,7 +146,7 @@ void ChromeScreenEnumerator::EnumerateScreens( + features::kGetDisplayMediaSetAutoSelectAllScreens)) || + base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia)); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 177ccc28bcff..1a13efa5e189 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 2023-04-28 17:01:32 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -65,8 +65,10 @@ +@@ -66,8 +66,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" -@@ -100,7 +102,7 @@ +@@ -101,7 +103,7 @@ #include "chromeos/startup/startup_switches.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -512,7 +514,7 @@ void RecordStartupMetrics() { +@@ -528,7 +530,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -30,7 +30,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -712,7 +714,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -728,7 +730,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #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 a90bc4c24d3c..b5480d5673b5 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 2023-04-28 17:01:32 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -176,7 +176,7 @@ +@@ -178,7 +178,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 @@ +@@ -204,7 +204,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/family_link_user_metrics_provider.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID)) -@@ -764,7 +764,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -770,7 +770,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -27,7 +27,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique()); #endif -@@ -843,7 +843,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -849,7 +849,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique()); -@@ -852,7 +852,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -858,7 +858,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #if BUILDFLAG(ENABLE_SUPERVISED_USERS) && \ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +45,7 @@ if (base::FeatureList::IsEnabled( kExtendFamilyLinkUserLogSegmentToAllPlatforms)) { metrics_service_->RegisterMetricsProvider( -@@ -960,7 +960,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -966,7 +966,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique()); #endif @@ -54,7 +54,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1144,7 +1144,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1163,7 +1163,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // 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_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index c33ca1e33ada..bb4cd439949e 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 2023-04-28 17:01:32 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -93,7 +93,7 @@ @@ -27,8 +27,8 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -489,7 +489,7 @@ SystemNetworkContextManager::SystemNetworkContextManag - base::Unretained(this))); +@@ -503,7 +503,7 @@ SystemNetworkContextManager::SystemNetworkContextManag + #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -36,7 +36,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -539,7 +539,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -553,7 +553,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -45,7 +45,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -568,7 +568,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -582,7 +582,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false); #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,8 +54,8 @@ // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -959,7 +959,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo - } +@@ -1004,7 +1004,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor + #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) 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 33a17bee0723..b6e94c226334 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,7 +1,7 @@ ---- chrome/browser/net/system_network_context_manager.h.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/net/system_network_context_manager.h -@@ -194,7 +194,7 @@ class SystemNetworkContextManager { - void UpdateExplicitlyAllowedNetworkPorts(); +@@ -207,7 +207,7 @@ class SystemNetworkContextManager { + #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) 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 af8688fdafd6..f6326517f71f 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 2023-04-28 17:01:32 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -205,12 +205,12 @@ +@@ -206,12 +206,12 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -15,7 +15,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -772,14 +772,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -770,14 +770,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -32,7 +32,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1439,7 +1439,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1431,7 +1431,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,7 +41,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1509,18 +1509,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1501,18 +1501,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +63,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1533,7 +1533,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1525,7 +1525,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) \ @@ -72,7 +72,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1637,7 +1637,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1629,7 +1629,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -81,7 +81,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1724,13 +1724,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1725,13 +1725,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -97,7 +97,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1761,7 +1761,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1762,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -106,16 +106,7 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1790,7 +1790,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - - #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \ -- || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) -+ || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) - { key::kChromeAppsEnabled, - extensions::pref_names::kChromeAppsEnabled, - base::Value::Type::BOOLEAN }, -@@ -1850,7 +1850,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1844,7 +1844,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -124,7 +115,7 @@ { key::kHighEfficiencyModeEnabled, performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled, base::Value::Type::BOOLEAN }, -@@ -1895,7 +1895,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1889,7 +1889,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(ENABLE_PPAPI) @@ -133,7 +124,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2162,7 +2162,7 @@ std::unique_ptr BuildH +@@ -2156,7 +2156,7 @@ std::unique_ptr BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -142,7 +133,7 @@ handlers->AddHandler( std::make_unique()); handlers->AddHandler( -@@ -2219,7 +2219,7 @@ std::unique_ptr BuildH +@@ -2213,7 +2213,7 @@ std::unique_ptr BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -151,7 +142,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler(std::make_unique()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -2254,7 +2254,7 @@ std::unique_ptr BuildH +@@ -2248,7 +2248,7 @@ std::unique_ptr BuildH std::vector> signin_legacy_policies; #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -160,7 +151,7 @@ signin_legacy_policies.push_back(std::make_unique( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2608,7 +2608,7 @@ std::unique_ptr BuildH +@@ -2604,7 +2604,7 @@ std::unique_ptr BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -169,7 +160,7 @@ handlers->AddHandler(std::make_unique()); handlers->AddHandler( std::make_unique( -@@ -2616,7 +2616,7 @@ std::unique_ptr BuildH +@@ -2612,7 +2612,7 @@ std::unique_ptr BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -178,7 +169,7 @@ handlers->AddHandler(std::make_unique( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2629,7 +2629,7 @@ std::unique_ptr BuildH +@@ -2625,7 +2625,7 @@ std::unique_ptr BuildH handlers->AddHandler( std::make_unique( chrome_schema)); diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc new file mode 100644 index 000000000000..264a3cec6660 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc @@ -0,0 +1,20 @@ +--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-05-31 08:12:17 UTC ++++ chrome/browser/policy/policy_value_and_status_aggregator.cc +@@ -55,7 +55,7 @@ + #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h" + #endif // BUILDFLAG(ENABLE_EXTENSIONS) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -106,7 +106,7 @@ std::unique_ptr GetUserP + #else // BUILDFLAG(IS_CHROMEOS_ASH) + policy::CloudPolicyManager* cloud_policy_manager = + profile->GetUserCloudPolicyManager(); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!cloud_policy_manager) { + cloud_policy_manager = profile->GetProfileCloudPolicyManager(); + } 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 a486968f5c7c..b445a3781892 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 2023-04-28 17:01:32 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -464,13 +464,13 @@ +@@ -465,13 +465,13 @@ #include "components/os_crypt/sync/os_crypt.h" #endif @@ -16,7 +16,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -503,7 +503,7 @@ +@@ -504,7 +504,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -25,7 +25,7 @@ #include "ui/color/system_theme.h" #endif -@@ -800,7 +800,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -731,7 +731,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li const char kPluginsShowDetails[] = "plugins.show_details"; // Deprecated 02/2023. @@ -34,7 +34,7 @@ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -904,7 +904,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS +@@ -872,7 +872,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Deprecated 02/2023. @@ -43,7 +43,7 @@ registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1033,7 +1033,7 @@ void RegisterProfilePrefsForMigration( +@@ -987,7 +987,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -52,7 +52,7 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1686,11 +1686,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1690,11 +1690,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif @@ -66,7 +66,7 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -1878,7 +1878,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local +@@ -1857,7 +1857,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Added 02/2023 @@ -75,7 +75,7 @@ local_state->ClearPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -2038,7 +2038,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -1992,7 +1992,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif 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 cdf3c9e15bc4..e13e2da04e41 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,6 +1,6 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -602,7 +602,7 @@ PrintBackendServiceManager::RegisterClient( +@@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient( query_clients_.insert(client_id); break; case ClientType::kQueryWithUi: @@ -9,7 +9,7 @@ if (!query_with_ui_clients_.empty()) return absl::nullopt; #endif -@@ -868,7 +868,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -960,7 +960,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate break; case ClientType::kQueryWithUi: @@ -18,7 +18,7 @@ // No need to update if there were other query with UI clients. if (query_with_ui_clients_.size() > 1) return absl::nullopt; -@@ -925,7 +925,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1017,7 +1017,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: @@ -27,3 +27,12 @@ // No need to update if there were other query with UI clients. if (HasQueryWithUiClientForRemoteId(remote_id)) { return absl::nullopt; +@@ -1477,7 +1477,7 @@ template + void PrintBackendServiceManager::RunSavedCallbacks( + RemoteSavedCallbacks& saved_callbacks, + const RemoteId& remote_id, +- std::remove_reference::type... result) { ++ typename std::remove_reference::type... result) { + auto found_callbacks_map = saved_callbacks.find(remote_id); + if (found_callbacks_map == saved_callbacks.end()) + return; // No callbacks to run. diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h new file mode 100644 index 000000000000..d7c9307957bc --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h @@ -0,0 +1,11 @@ +--- chrome/browser/printing/print_backend_service_manager.h.orig 2023-05-31 08:12:17 UTC ++++ chrome/browser/printing/print_backend_service_manager.h +@@ -587,7 +587,7 @@ class PrintBackendServiceManager { + template + void RunSavedCallbacks(RemoteSavedCallbacks& saved_callbacks, + const RemoteId& remote_id, +- std::remove_reference::type... result); ++ typename std::remove_reference::type... result); + + // Test support for client ID management. + static void SetClientsForTesting( diff --git a/www/chromium/files/patch-chrome_browser_printing_printer__query.cc b/www/chromium/files/patch-chrome_browser_printing_printer__query.cc index 186da4ad3b5b..f980d96b1c26 100644 --- a/www/chromium/files/patch-chrome_browser_printing_printer__query.cc +++ b/www/chromium/files/patch-chrome_browser_printing_printer__query.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/printer_query.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/printing/printer_query.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/printing/printer_query.cc -@@ -339,7 +339,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di +@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di crash_key = std::make_unique( print_backend->GetPrinterDriverInfo(printer_name)); 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 e21e56e95bbc..59c95f5c6cc1 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,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -361,17 +361,17 @@ +@@ -363,17 +363,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -21,7 +21,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" -@@ -535,7 +535,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -543,7 +543,7 @@ void ChromeBrowserMainExtraPartsProfiles:: BreadcrumbManagerKeyedServiceFactory::GetInstance(); } browser_sync::UserEventServiceFactory::GetInstance(); @@ -30,7 +30,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif BrowsingDataHistoryObserverService::Factory::GetInstance(); -@@ -606,16 +606,16 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -614,16 +614,16 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) DriveServiceFactory::GetInstance(); #endif @@ -50,7 +50,7 @@ enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -718,12 +718,12 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -729,12 +729,12 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -65,12 +65,12 @@ enterprise_idle::IdleServiceFactory::GetInstance(); #endif ModelTypeStoreServiceFactory::GetInstance(); -@@ -786,7 +786,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - PolicyBlocklistFactory::GetInstance(); +@@ -801,7 +801,7 @@ void ChromeBrowserMainExtraPartsProfiles:: PredictionServiceFactory::GetInstance(); + PrimaryAccountPolicyManagerFactory::GetInstance(); -#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(); + policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); #endif - #if !BUILDFLAG(IS_ANDROID) 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 bf4e3f5b5d90..1b0d866547c9 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-04-28 17:01:32 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -260,6 +260,10 @@ +@@ -263,6 +263,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,16 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -865,7 +869,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -611,7 +615,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async + #else + { + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ProfileManager* profile_manager = g_browser_process->profile_manager(); + ProfileAttributesEntry* entry = + profile_manager->GetProfileAttributesStorage() +@@ -886,7 +890,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 014e10c0cde4..13e8ab242934 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 2022-09-24 10:57:32 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -181,7 +181,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -182,7 +182,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_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 645e71dd8d1d..01f9a99a0ed6 100644 --- 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 @@ -1,15 +1,15 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-05-31 08:12:17 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -28,7 +28,7 @@ +@@ -27,7 +27,7 @@ + - + @@ -18,7 +18,7 @@