diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-28 16:14:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-12-13 15:19:41 +0000 |
| commit | 61d9742824d54be5693191fe502325a909feca59 (patch) | |
| tree | cbf28e779b11338fe52eb75b915684cd8955542c /chromium/ash | |
| parent | 45f9ded08bb7526984b24ccb5a5327aaf6821676 (diff) | |
| download | qtwebengine-chromium-61d9742824d54be5693191fe502325a909feca59.tar.gz | |
BASELINE: Update Chromium to 108.0.5359.70
Change-Id: I77334ff232b819600f275bd3cfe41fbaa3619230
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/445904
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ash')
373 files changed, 3148 insertions, 7347 deletions
diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn index 705c87f013a..428e5eec417 100644 --- a/chromium/ash/BUILD.gn +++ b/chromium/ash/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -33,10 +33,14 @@ component("ash") { "accelerators/accelerator_history_impl.cc", "accelerators/accelerator_history_impl.h", "accelerators/accelerator_ids.h", + "accelerators/accelerator_layout_table.cc", + "accelerators/accelerator_layout_table.h", "accelerators/accelerator_notifications.cc", "accelerators/accelerator_notifications.h", "accelerators/accelerator_table.cc", "accelerators/accelerator_table.h", + "accelerators/ash_accelerator_configuration.cc", + "accelerators/ash_accelerator_configuration.h", "accelerators/ash_focus_manager_factory.cc", "accelerators/ash_focus_manager_factory.h", "accelerators/debug_commands.cc", @@ -51,6 +55,8 @@ component("ash") { "accelerators/pre_target_accelerator_handler.h", "accelerators/spoken_feedback_toggler.cc", "accelerators/spoken_feedback_toggler.h", + "accelerators/tablet_volume_controller.cc", + "accelerators/tablet_volume_controller.h", "accelerometer/accelerometer_constants.h", "accelerometer/accelerometer_file_reader.cc", "accelerometer/accelerometer_file_reader.h", @@ -189,6 +195,8 @@ component("ash") { "ambient/ui/ambient_animation_attribution_transformer.h", "ambient/ui/ambient_animation_background_color.cc", "ambient/ui/ambient_animation_background_color.h", + "ambient/ui/ambient_animation_frame_rate_schedule.cc", + "ambient/ui/ambient_animation_frame_rate_schedule.h", "ambient/ui/ambient_animation_player.cc", "ambient/ui/ambient_animation_player.h", "ambient/ui/ambient_animation_progress_tracker.cc", @@ -282,6 +290,8 @@ component("ash") { "capture_mode/capture_mode_constants.h", "capture_mode/capture_mode_controller.cc", "capture_mode/capture_mode_controller.h", + "capture_mode/capture_mode_demo_tools_controller.cc", + "capture_mode/capture_mode_demo_tools_controller.h", "capture_mode/capture_mode_feature_pod_controller.cc", "capture_mode/capture_mode_feature_pod_controller.h", "capture_mode/capture_mode_menu_group.cc", @@ -330,7 +340,6 @@ component("ash") { "clipboard/clipboard_history_item.h", "clipboard/clipboard_history_menu_model_adapter.cc", "clipboard/clipboard_history_menu_model_adapter.h", - "clipboard/clipboard_history_metrics.h", "clipboard/clipboard_history_resource_manager.cc", "clipboard/clipboard_history_resource_manager.h", "clipboard/clipboard_history_util.cc", @@ -359,6 +368,8 @@ component("ash") { "clipboard/views/clipboard_history_text_item_view.cc", "clipboard/views/clipboard_history_text_item_view.h", "clipboard/views/clipboard_history_view_constants.h", + "color_enhancement/color_enhancement_controller.cc", + "color_enhancement/color_enhancement_controller.h", "controls/contextual_nudge.cc", "controls/contextual_nudge.h", "controls/contextual_tooltip.cc", @@ -369,6 +380,16 @@ component("ash") { "controls/rounded_scroll_bar.h", "controls/scroll_view_gradient_helper.cc", "controls/scroll_view_gradient_helper.h", + "curtain/input_event_filter.cc", + "curtain/input_event_filter.h", + "curtain/security_curtain_controller.cc", + "curtain/security_curtain_controller.h", + "curtain/security_curtain_controller_impl.cc", + "curtain/security_curtain_controller_impl.h", + "curtain/security_curtain_widget_controller.cc", + "curtain/security_curtain_widget_controller.h", + "curtain/session.cc", + "curtain/session.h", "dbus/ash_dbus_services.cc", "dbus/ash_dbus_services.h", "dbus/display_service_provider.cc", @@ -525,14 +546,25 @@ component("ash") { "frame_throttler/frame_throttling_observer.h", "glanceables/glanceables_controller.cc", "glanceables/glanceables_controller.h", + "glanceables/glanceables_delegate.h", + "glanceables/glanceables_restore_view.cc", + "glanceables/glanceables_restore_view.h", + "glanceables/glanceables_up_next_event_item_view.cc", + "glanceables/glanceables_up_next_event_item_view.h", + "glanceables/glanceables_up_next_view.cc", + "glanceables/glanceables_up_next_view.h", + "glanceables/glanceables_util.cc", + "glanceables/glanceables_util.h", "glanceables/glanceables_view.cc", "glanceables/glanceables_view.h", "glanceables/glanceables_weather_view.cc", "glanceables/glanceables_weather_view.h", "glanceables/glanceables_welcome_label.cc", "glanceables/glanceables_welcome_label.h", - "high_contrast/high_contrast_controller.cc", - "high_contrast/high_contrast_controller.h", + "glanceables/glanceables_window_hider.cc", + "glanceables/glanceables_window_hider.h", + "glanceables/signout_screenshot_handler.cc", + "glanceables/signout_screenshot_handler.h", "highlighter/highlighter_controller.cc", "highlighter/highlighter_controller.h", "highlighter/highlighter_gesture_util.cc", @@ -876,6 +908,8 @@ component("ash") { "shelf/login_shelf_view.h", "shelf/login_shelf_widget.cc", "shelf/login_shelf_widget.h", + "shelf/partying_shelf_item.cc", + "shelf/partying_shelf_item.h", "shelf/scroll_arrow_view.cc", "shelf/scroll_arrow_view.h", "shelf/scrollable_shelf_constants.cc", @@ -963,7 +997,6 @@ component("ash") { "shutdown_controller_impl.h", "shutdown_reason.cc", "shutdown_reason.h", - "style/ash_color_id.h", "style/ash_color_mixer.cc", "style/ash_color_mixer.h", "style/ash_color_provider.cc", @@ -972,6 +1005,8 @@ component("ash") { "style/ash_color_provider_source.h", "style/close_button.cc", "style/close_button.h", + "style/color_util.cc", + "style/color_util.h", "style/dark_light_mode_controller_impl.cc", "style/dark_light_mode_controller_impl.h", "style/dark_light_mode_nudge.cc", @@ -985,11 +1020,21 @@ component("ash") { "style/dot_indicator.h", "style/icon_button.cc", "style/icon_button.h", + "style/icon_switch.cc", + "style/icon_switch.h", "style/pill_button.cc", "style/pill_button.h", + "style/rounded_label.cc", + "style/rounded_label.h", + "style/rounded_label_widget.cc", + "style/rounded_label_widget.h", "style/scoped_light_mode_as_default.cc", "style/style_util.cc", "style/style_util.h", + "style/style_viewer/system_ui_components_grid_view.cc", + "style/style_viewer/system_ui_components_grid_view.h", + "style/style_viewer/system_ui_components_style_viewer_view.cc", + "style/style_viewer/system_ui_components_style_viewer_view.h", "style/system_shadow.cc", "style/system_shadow.h", "style/system_shadow_on_nine_patch_layer.cc", @@ -998,8 +1043,6 @@ component("ash") { "style/system_shadow_on_texture_layer.h", "style/system_toast_style.cc", "style/system_toast_style.h", - "style/temp_palette.cc", - "style/temp_palette.h", "system/accessibility/accessibility_feature_disable_dialog.cc", "system/accessibility/accessibility_feature_disable_dialog.h", "system/accessibility/accessibility_feature_pod_controller.cc", @@ -1074,8 +1117,6 @@ component("ash") { "system/bluetooth/bluetooth_detailed_view_controller.h", "system/bluetooth/bluetooth_detailed_view_impl.cc", "system/bluetooth/bluetooth_detailed_view_impl.h", - "system/bluetooth/bluetooth_detailed_view_legacy.cc", - "system/bluetooth/bluetooth_detailed_view_legacy.h", "system/bluetooth/bluetooth_device_list_controller.cc", "system/bluetooth/bluetooth_device_list_controller.h", "system/bluetooth/bluetooth_device_list_controller_impl.cc", @@ -1092,20 +1133,8 @@ component("ash") { "system/bluetooth/bluetooth_disabled_detailed_view.h", "system/bluetooth/bluetooth_feature_pod_controller.cc", "system/bluetooth/bluetooth_feature_pod_controller.h", - "system/bluetooth/bluetooth_feature_pod_controller_legacy.cc", - "system/bluetooth/bluetooth_feature_pod_controller_legacy.h", "system/bluetooth/bluetooth_notification_controller.cc", "system/bluetooth/bluetooth_notification_controller.h", - "system/bluetooth/bluetooth_power_controller.cc", - "system/bluetooth/bluetooth_power_controller.h", - "system/bluetooth/tray_bluetooth_helper.cc", - "system/bluetooth/tray_bluetooth_helper.h", - "system/bluetooth/tray_bluetooth_helper_experimental.cc", - "system/bluetooth/tray_bluetooth_helper_experimental.h", - "system/bluetooth/tray_bluetooth_helper_legacy.cc", - "system/bluetooth/tray_bluetooth_helper_legacy.h", - "system/bluetooth/unified_bluetooth_detailed_view_controller.cc", - "system/bluetooth/unified_bluetooth_detailed_view_controller.h", "system/brightness/brightness_controller_chromeos.cc", "system/brightness/brightness_controller_chromeos.h", "system/brightness/unified_brightness_slider_controller.cc", @@ -1193,6 +1222,8 @@ component("ash") { "system/holding_space/holding_space_tray_icon.h", "system/holding_space/holding_space_tray_icon_preview.cc", "system/holding_space/holding_space_tray_icon_preview.h", + "system/holding_space/holding_space_ui.cc", + "system/holding_space/holding_space_ui.h", "system/holding_space/holding_space_util.cc", "system/holding_space/holding_space_util.h", "system/holding_space/holding_space_view_delegate.cc", @@ -1205,6 +1236,8 @@ component("ash") { "system/holding_space/recent_files_bubble.h", "system/holding_space/screen_captures_section.cc", "system/holding_space/screen_captures_section.h", + "system/holding_space/suggestions_section.cc", + "system/holding_space/suggestions_section.h", "system/human_presence/human_presence_metrics.h", "system/human_presence/human_presence_orientation_controller.cc", "system/human_presence/human_presence_orientation_controller.h", @@ -1272,6 +1305,8 @@ component("ash") { "system/message_center/ash_message_center_lock_screen_controller.h", "system/message_center/ash_message_popup_collection.cc", "system/message_center/ash_message_popup_collection.h", + "system/message_center/ash_notification_control_button_factory.cc", + "system/message_center/ash_notification_control_button_factory.h", "system/message_center/ash_notification_expand_button.cc", "system/message_center/ash_notification_expand_button.h", "system/message_center/ash_notification_input_container.cc", @@ -1576,12 +1611,20 @@ component("ash") { "system/privacy/privacy_indicators_controller.h", "system/privacy/privacy_indicators_tray_item_view.cc", "system/privacy/privacy_indicators_tray_item_view.h", + "system/privacy/screen_capture_observer.h", + "system/privacy/screen_security_controller.cc", + "system/privacy/screen_security_controller.h", + "system/privacy/screen_share_observer.h", + "system/privacy/screen_switch_check_controller.cc", + "system/privacy/screen_switch_check_controller.h", "system/privacy_hub/camera_privacy_switch_controller.cc", "system/privacy_hub/camera_privacy_switch_controller.h", "system/privacy_hub/microphone_privacy_switch_controller.cc", "system/privacy_hub/microphone_privacy_switch_controller.h", "system/privacy_hub/privacy_hub_controller.cc", "system/privacy_hub/privacy_hub_controller.h", + "system/privacy_hub/privacy_hub_metrics.cc", + "system/privacy_hub/privacy_hub_metrics.h", "system/privacy_screen/privacy_screen_feature_pod_controller.cc", "system/privacy_screen/privacy_screen_feature_pod_controller.h", "system/privacy_screen/privacy_screen_toast_controller.cc", @@ -1608,12 +1651,6 @@ component("ash") { "system/scheduled_feature/scheduled_feature.h", "system/screen_layout_observer.cc", "system/screen_layout_observer.h", - "system/screen_security/screen_capture_observer.h", - "system/screen_security/screen_security_notification_controller.cc", - "system/screen_security/screen_security_notification_controller.h", - "system/screen_security/screen_share_observer.h", - "system/screen_security/screen_switch_check_controller.cc", - "system/screen_security/screen_switch_check_controller.h", "system/session/logout_button_tray.cc", "system/session/logout_button_tray.h", "system/session/logout_confirmation_controller.cc", @@ -1689,7 +1726,6 @@ component("ash") { "system/tray/system_nudge_controller.h", "system/tray/system_nudge_label.cc", "system/tray/system_nudge_label.h", - "system/tray/system_tray_item_uma_type.h", "system/tray/system_tray_notifier.cc", "system/tray/system_tray_notifier.h", "system/tray/time_to_click_recorder.cc", @@ -1726,6 +1762,8 @@ component("ash") { "system/tray/unfocusable_label.cc", "system/tray/unfocusable_label.h", "system/tray/view_click_listener.h", + "system/unified/buttons.cc", + "system/unified/buttons.h", "system/unified/camera_mic_tray_item_view.cc", "system/unified/camera_mic_tray_item_view.h", "system/unified/collapse_button.cc", @@ -1745,6 +1783,8 @@ component("ash") { "system/unified/feature_pod_controller_base.h", "system/unified/feature_pods_container_view.cc", "system/unified/feature_pods_container_view.h", + "system/unified/feature_tiles_container_view.cc", + "system/unified/feature_tiles_container_view.h", "system/unified/ime_mode_view.cc", "system/unified/ime_mode_view.h", "system/unified/managed_device_tray_item_view.cc", @@ -1757,6 +1797,16 @@ component("ash") { "system/unified/notification_icons_controller.h", "system/unified/page_indicator_view.cc", "system/unified/page_indicator_view.h", + "system/unified/power_button.cc", + "system/unified/power_button.h", + "system/unified/quick_settings_footer.cc", + "system/unified/quick_settings_footer.h", + "system/unified/quick_settings_header.cc", + "system/unified/quick_settings_header.h", + "system/unified/quick_settings_metrics_util.cc", + "system/unified/quick_settings_metrics_util.h", + "system/unified/quick_settings_view.cc", + "system/unified/quick_settings_view.h", "system/unified/quiet_mode_feature_pod_controller.cc", "system/unified/quiet_mode_feature_pod_controller.h", "system/unified/screen_capture_tray_item_view.cc", @@ -1832,6 +1882,8 @@ component("ash") { "wallpaper/wallpaper_constants.h", "wallpaper/wallpaper_controller_impl.cc", "wallpaper/wallpaper_controller_impl.h", + "wallpaper/wallpaper_metrics_manager.cc", + "wallpaper/wallpaper_metrics_manager.h", "wallpaper/wallpaper_pref_manager.cc", "wallpaper/wallpaper_pref_manager.h", "wallpaper/wallpaper_utils/wallpaper_calculated_colors.cc", @@ -1840,6 +1892,10 @@ component("ash") { "wallpaper/wallpaper_utils/wallpaper_color_calculator.h", "wallpaper/wallpaper_utils/wallpaper_color_calculator_observer.h", "wallpaper/wallpaper_utils/wallpaper_color_extraction_result.h", + "wallpaper/wallpaper_utils/wallpaper_ephemeral_user.cc", + "wallpaper/wallpaper_utils/wallpaper_ephemeral_user.h", + "wallpaper/wallpaper_utils/wallpaper_language.cc", + "wallpaper/wallpaper_utils/wallpaper_language.h", "wallpaper/wallpaper_utils/wallpaper_resizer.cc", "wallpaper/wallpaper_utils/wallpaper_resizer.h", "wallpaper/wallpaper_utils/wallpaper_resizer_observer.h", @@ -1906,30 +1962,24 @@ component("ash") { "wm/desks/desks_util.h", "wm/desks/expanded_desks_bar_button.cc", "wm/desks/expanded_desks_bar_button.h", - "wm/desks/persistent_desks_bar_button.cc", - "wm/desks/persistent_desks_bar_button.h", - "wm/desks/persistent_desks_bar_context_menu.cc", - "wm/desks/persistent_desks_bar_context_menu.h", - "wm/desks/persistent_desks_bar_controller.cc", - "wm/desks/persistent_desks_bar_controller.h", - "wm/desks/persistent_desks_bar_view.cc", - "wm/desks/persistent_desks_bar_view.h", + "wm/desks/persistent_desks_bar/persistent_desks_bar_button.cc", + "wm/desks/persistent_desks_bar/persistent_desks_bar_button.h", + "wm/desks/persistent_desks_bar/persistent_desks_bar_context_menu.cc", + "wm/desks/persistent_desks_bar/persistent_desks_bar_context_menu.h", + "wm/desks/persistent_desks_bar/persistent_desks_bar_controller.cc", + "wm/desks/persistent_desks_bar/persistent_desks_bar_controller.h", + "wm/desks/persistent_desks_bar/persistent_desks_bar_view.cc", + "wm/desks/persistent_desks_bar/persistent_desks_bar_view.h", "wm/desks/root_window_desk_switch_animator.cc", "wm/desks/root_window_desk_switch_animator.h", "wm/desks/scroll_arrow_button.cc", "wm/desks/scroll_arrow_button.h", "wm/desks/templates/restore_data_collector.cc", "wm/desks/templates/restore_data_collector.h", - "wm/desks/templates/save_desk_template_button.cc", - "wm/desks/templates/save_desk_template_button.h", - "wm/desks/templates/save_desk_template_button_container.cc", - "wm/desks/templates/save_desk_template_button_container.h", "wm/desks/templates/saved_desk_animations.cc", "wm/desks/templates/saved_desk_animations.h", "wm/desks/templates/saved_desk_dialog_controller.cc", "wm/desks/templates/saved_desk_dialog_controller.h", - "wm/desks/templates/saved_desk_feedback_button.cc", - "wm/desks/templates/saved_desk_feedback_button.h", "wm/desks/templates/saved_desk_grid_view.cc", "wm/desks/templates/saved_desk_grid_view.h", "wm/desks/templates/saved_desk_icon_container.cc", @@ -1946,6 +1996,10 @@ component("ash") { "wm/desks/templates/saved_desk_name_view.h", "wm/desks/templates/saved_desk_presenter.cc", "wm/desks/templates/saved_desk_presenter.h", + "wm/desks/templates/saved_desk_save_desk_button.cc", + "wm/desks/templates/saved_desk_save_desk_button.h", + "wm/desks/templates/saved_desk_save_desk_button_container.cc", + "wm/desks/templates/saved_desk_save_desk_button_container.h", "wm/desks/templates/saved_desk_util.cc", "wm/desks/templates/saved_desk_util.h", "wm/desks/zero_state_button.cc", @@ -2040,10 +2094,6 @@ component("ash") { "wm/overview/overview_wallpaper_controller.h", "wm/overview/overview_window_drag_controller.cc", "wm/overview/overview_window_drag_controller.h", - "wm/overview/rounded_label.cc", - "wm/overview/rounded_label.h", - "wm/overview/rounded_label_widget.cc", - "wm/overview/rounded_label_widget.h", "wm/overview/scoped_overview_animation_settings.cc", "wm/overview/scoped_overview_animation_settings.h", "wm/overview/scoped_overview_hide_windows.cc", @@ -2207,6 +2257,10 @@ component("ash") { "wm/workspace/workspace_window_resizer.h", "wm/workspace_controller.cc", "wm/workspace_controller.h", + "wm_mode/wm_mode_button_tray.cc", + "wm_mode/wm_mode_button_tray.h", + "wm_mode/wm_mode_controller.cc", + "wm_mode/wm_mode_controller.h", ] configs += [ "//build/config:precompiled_headers" ] @@ -2257,12 +2311,8 @@ component("ash") { "//ash/assistant/ui:constants", "//ash/assistant/util", "//ash/components/fwupd", - "//ash/components/geolocation", - "//ash/components/hid_detection", - "//ash/components/multidevice/logging", "//ash/components/peripheral_notification", "//ash/components/phonehub", - "//ash/components/settings", "//ash/constants", "//ash/dbus:privacy_screen_proto", "//ash/in_session_auth", @@ -2277,12 +2327,7 @@ component("ash") { "//ash/quick_pair/scanning", "//ash/quick_pair/ui", "//ash/services/multidevice_setup/public/mojom", - "//ash/services/nearby/public/cpp", - "//ash/services/quick_pair", - "//ash/services/quick_pair/public/cpp", - "//ash/services/quick_pair/public/mojom", - "//ash/services/recording", - "//ash/services/recording/public/mojom", + "//ash/style", "//ash/system/machine_learning:user_settings_event_proto", "//ash/webui/diagnostics_ui/mojom:mojom", "//ash/webui/eche_app_ui/mojom:mojom", @@ -2312,10 +2357,25 @@ component("ash") { "//chromeos/ash/components/dbus/update_engine", "//chromeos/ash/components/dbus/usb", "//chromeos/ash/components/feature_usage", + "//chromeos/ash/components/geolocation", + "//chromeos/ash/components/hid_detection", "//chromeos/ash/components/human_presence", + "//chromeos/ash/components/multidevice/logging", "//chromeos/ash/components/network", + "//chromeos/ash/components/settings", "//chromeos/ash/services/assistant/public/cpp", "//chromeos/ash/services/assistant/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/hotspot_config/public/mojom", + "//chromeos/ash/services/libassistant/public/cpp:structs", + "//chromeos/ash/services/libassistant/public/mojom", + "//chromeos/ash/services/nearby/public/cpp", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair/public/cpp", + "//chromeos/ash/services/quick_pair/public/mojom", + "//chromeos/ash/services/recording", + "//chromeos/ash/services/recording/public/mojom", "//chromeos/components/quick_answers/public/cpp:prefs", "//chromeos/components/sensors:buildflags", "//chromeos/components/sensors:sensors", @@ -2328,11 +2388,6 @@ component("ash") { "//chromeos/dbus/power:power_manager_proto", "//chromeos/login/login_state", "//chromeos/metrics", - "//chromeos/services/bluetooth_config/public/cpp", - "//chromeos/services/bluetooth_config/public/mojom", - "//chromeos/services/hotspot_config/public/mojom", - "//chromeos/services/libassistant/public/cpp:structs", - "//chromeos/services/libassistant/public/mojom", "//chromeos/services/network_config/public/cpp", "//chromeos/services/network_config/public/mojom", "//chromeos/strings", @@ -2515,6 +2570,7 @@ test("ash_unittests") { "accelerators/accelerator_history_unittest.cc", "accelerators/accelerator_table_unittest.cc", "accelerators/accelerator_unittest.cc", + "accelerators/ash_accelerator_configuration_unittest.cc", "accelerators/magnifier_key_scroller_unittest.cc", "accelerators/spoken_feedback_toggler_unittest.cc", "accelerometer/accelerometer_provider_mojo_unittest.cc", @@ -2555,6 +2611,7 @@ test("ash_unittests") { "ambient/model/ambient_topic_queue_unittest.cc", "ambient/ui/ambient_animation_attribution_transformer_unittest.cc", "ambient/ui/ambient_animation_background_color_unittest.cc", + "ambient/ui/ambient_animation_frame_rate_schedule_unittest.cc", "ambient/ui/ambient_animation_progress_tracker_unittest.cc", "ambient/ui/ambient_animation_resizer_unittest.cc", "ambient/ui/ambient_animation_shield_controller_unittest.cc", @@ -2590,6 +2647,7 @@ test("ash_unittests") { "assistant/util/resource_util_unittest.cc", "bubble/bubble_utils_unittest.cc", "capture_mode/capture_mode_camera_unittests.cc", + "capture_mode/capture_mode_demo_tools_unittests.cc", "capture_mode/capture_mode_test_util.cc", "capture_mode/capture_mode_test_util.h", "capture_mode/capture_mode_unittests.cc", @@ -2599,9 +2657,11 @@ test("ash_unittests") { "clipboard/clipboard_history_unittest.cc", "clipboard/clipboard_history_util_unittest.cc", "clipboard/clipboard_nudge_controller_unittest.cc", + "color_enhancement/color_enhancement_controller_unittest.cc", "controls/contextual_tooltip_unittest.cc", "controls/rounded_scroll_bar_unittest.cc", "controls/scroll_view_gradient_helper_unittest.cc", + "curtain/security_curtain_controller_impl_unittest.cc", "dbus/gesture_properties_service_provider_unittest.cc", "dbus/url_handler_service_provider_unittest.cc", "detachable_base/detachable_base_handler_unittest.cc", @@ -2653,10 +2713,10 @@ test("ash_unittests") { "frame/caption_buttons/frame_size_button_unittest.cc", "frame/default_frame_header_unittest.cc", "frame/non_client_frame_view_ash_unittest.cc", - "glanceables/glanceables_controller_unittest.cc", - "glanceables/glanceables_view_unittest.cc", - "glanceables/glanceables_weather_view_unittest.cc", + "frame_throttler/frame_throttling_controller_unittest.cc", + "glanceables/glanceables_unittests.cc", "glanceables/glanceables_welcome_label_unittest.cc", + "glanceables/signout_screenshot_handler_unittest.cc", "highlighter/highlighter_controller_unittest.cc", "highlighter/highlighter_gesture_util_unittest.cc", "host/ash_window_tree_host_platform_unittest.cc", @@ -2767,8 +2827,10 @@ test("ash_unittests") { "shelf/test/widget_animation_smoothness_inspector.h", "shell_unittest.cc", "style/ash_color_provider_unittest.cc", + "style/color_util_unittest.cc", "style/dark_light_mode_controller_unittests.cc", "style/dark_light_mode_nudge_controller_unittests.cc", + "style/system_components_unittests.cc", "system/accessibility/accessibility_feature_pod_controller_unittest.cc", "system/accessibility/autoclick_menu_bubble_controller_unittest.cc", "system/accessibility/dictation_bubble_controller_unittest.cc", @@ -2791,13 +2853,10 @@ test("ash_unittests") { "system/bluetooth/bluetooth_disabled_detailed_view_unittest.cc", "system/bluetooth/bluetooth_feature_pod_controller_unittest.cc", "system/bluetooth/bluetooth_notification_controller_unittest.cc", - "system/bluetooth/bluetooth_power_controller_unittest.cc", "system/bluetooth/fake_bluetooth_detailed_view.cc", "system/bluetooth/fake_bluetooth_detailed_view.h", "system/bluetooth/fake_bluetooth_device_list_controller.cc", "system/bluetooth/fake_bluetooth_device_list_controller.h", - "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc", - "system/bluetooth/unified_bluetooth_detailed_view_controller_unittest.cc", "system/camera/autozoom_toast_controller_unittest.cc", "system/caps_lock_notification_controller_unittest.cc", "system/channel_indicator/channel_indicator_quick_settings_view_unittest.cc", @@ -2818,6 +2877,9 @@ test("ash_unittests") { "system/geolocation/geolocation_controller_unittest.cc", "system/gesture_education/gesture_education_notification_controller_unittest.cc", "system/holding_space/holding_space_animation_registry_unittest.cc", + "system/holding_space/holding_space_ash_test_base.cc", + "system/holding_space/holding_space_ash_test_base.h", + "system/holding_space/holding_space_tray_child_bubble_unittest.cc", "system/holding_space/holding_space_tray_unittest.cc", "system/human_presence/human_presence_orientation_controller_unittest.cc", "system/human_presence/lock_on_leave_controller_unittest.cc", @@ -2870,6 +2932,7 @@ test("ash_unittests") { "system/network/wifi_toggle_notification_controller_unittest.cc", "system/night_light/night_light_controller_unittest.cc", "system/night_light/night_light_feature_pod_controller_unittest.cc", + "system/notification_center/notification_center_tray_unittest.cc", "system/overview/overview_button_tray_unittest.cc", "system/palette/mock_palette_tool_delegate.cc", "system/palette/mock_palette_tool_delegate.h", @@ -2893,6 +2956,7 @@ test("ash_unittests") { "system/power/adaptive_charging_notification_controller_unittest.cc", "system/power/adaptive_charging_nudge_controller_unittest.cc", "system/power/backlights_forced_off_setter_unittest.cc", + "system/power/battery_notification_unittest.cc", "system/power/peripheral_battery_listener_unittest.cc", "system/power/peripheral_battery_notifier_listener_integration_test.cc", "system/power/peripheral_battery_notifier_unittest.cc", @@ -2905,6 +2969,7 @@ test("ash_unittests") { "system/power/video_activity_notifier_unittest.cc", "system/privacy/privacy_indicators_controller_unittest.cc", "system/privacy/privacy_indicators_tray_item_view_unittest.cc", + "system/privacy/screen_security_controller_unittest.cc", "system/privacy_hub/camera_privacy_switch_controller_unittest.cc", "system/privacy_hub/microphone_privacy_switch_controller_unittest.cc", "system/progress_indicator/progress_indicator_animation_registry_unittest.cc", @@ -2912,7 +2977,6 @@ test("ash_unittests") { "system/rotation/rotation_lock_feature_pod_controller_unittest.cc", "system/scheduled_feature/scheduled_feature_unittest.cc", "system/screen_layout_observer_unittest.cc", - "system/screen_security/screen_security_notification_controller_unittest.cc", "system/session/logout_button_tray_unittest.cc", "system/session/logout_confirmation_controller_unittest.cc", "system/session/session_limit_notification_controller_unittest.cc", @@ -2941,9 +3005,13 @@ test("ash_unittests") { "system/unified/camera_mic_tray_item_view_unittest.cc", "system/unified/date_tray_unittest.cc", "system/unified/feature_pods_container_view_unittest.cc", + "system/unified/feature_tiles_container_view_unittest.cc", "system/unified/notification_counter_view_unittest.cc", "system/unified/notification_icons_controller_unittest.cc", "system/unified/page_indicator_view_unittest.cc", + "system/unified/power_button_unittest.cc", + "system/unified/quick_settings_footer_unittest.cc", + "system/unified/quick_settings_header_unittest.cc", "system/unified/quiet_mode_feature_pod_controller_unittest.cc", "system/unified/top_shortcuts_view_unittest.cc", "system/unified/unified_system_info_view_unittest.cc", @@ -2971,6 +3039,8 @@ test("ash_unittests") { "wallpaper/wallpaper_controller_unittest.cc", "wallpaper/wallpaper_pref_manager_unittest.cc", "wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc", + "wallpaper/wallpaper_utils/wallpaper_ephemeral_user_unittest.cc", + "wallpaper/wallpaper_utils/wallpaper_language_unittest.cc", "wallpaper/wallpaper_utils/wallpaper_resizer_unittest.cc", "wallpaper/wallpaper_window_state_manager_unittest.cc", "window_user_data_unittest.cc", @@ -3059,6 +3129,7 @@ test("ash_unittests") { "wm/workspace/workspace_layout_manager_unittest.cc", "wm/workspace/workspace_window_resizer_unittest.cc", "wm/workspace_controller_unittest.cc", + "wm_mode/wm_mode_unittests.cc", ] configs += [ "//build/config:precompiled_headers" ] @@ -3078,11 +3149,7 @@ test("ash_unittests") { "//ash/assistant/ui/test_support", "//ash/assistant/util", "//ash/components/arc:notification_test_support", - "//ash/components/geolocation", - "//ash/components/login/auth", - "//ash/components/login/auth:test_support", "//ash/components/phonehub:test_support", - "//ash/components/settings", "//ash/constants", "//ash/dbus:privacy_screen_proto", "//ash/in_session_auth", @@ -3101,13 +3168,13 @@ test("ash_unittests") { "//ash/services:unit_tests", "//ash/services/multidevice_setup/public/cpp:test_support", "//ash/services/multidevice_setup/public/mojom", - "//ash/services/nearby/public/cpp", - "//ash/services/recording:test_support", "//ash/shortcut_viewer:unit_tests", "//ash/strings", + "//ash/style", "//ash/system/machine_learning:user_settings_event_proto", "//ash/webui/diagnostics_ui/mojom", "//ash/webui/personalization_app/proto", + "//ash/webui/projector_app/public/cpp", "//base", "//base/test:test_support", "//build:branding_buildflags", @@ -3127,11 +3194,18 @@ test("ash_unittests") { "//chromeos/ash/components/dbus/shill", "//chromeos/ash/components/dbus/userdataauth", "//chromeos/ash/components/feature_usage", + "//chromeos/ash/components/geolocation", "//chromeos/ash/components/human_presence:human_presence", + "//chromeos/ash/components/login/auth", + "//chromeos/ash/components/login/auth:test_support", "//chromeos/ash/components/network:test_support", + "//chromeos/ash/components/settings", "//chromeos/ash/services/assistant:test_support", "//chromeos/ash/services/assistant/public/cpp", "//chromeos/ash/services/assistant/public/mojom", + "//chromeos/ash/services/bluetooth_config:test_support", + "//chromeos/ash/services/nearby/public/cpp", + "//chromeos/ash/services/recording:test_support", "//chromeos/components/sensors:sensors", "//chromeos/components/sensors:test_support", "//chromeos/components/sensors/mojom", @@ -3139,7 +3213,6 @@ test("ash_unittests") { "//chromeos/crosapi/cpp", "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", - "//chromeos/services/bluetooth_config:test_support", "//chromeos/services/network_config/public/cpp", "//chromeos/services/network_config/public/mojom", "//chromeos/strings:strings_grit", @@ -3170,6 +3243,7 @@ test("ash_unittests") { "//components/ukm:test_support", "//components/user_manager", "//components/user_manager:test_support", + "//components/viz/host", "//components/viz/test:test_support", "//device/bluetooth", "//device/bluetooth:mocks", @@ -3269,8 +3343,6 @@ test("ash_pixeltests") { "app_list/views/app_list_view_pixeltest.cc", "shelf/login_shelf_view_pixeltest.cc", "shelf/scrollable_shelf_view_pixeltest.cc", - "test/ash_pixel_diff_test_helper.cc", - "test/ash_pixel_diff_test_helper.h", "test/demo_ash_pixel_diff_test.cc", ] @@ -3286,7 +3358,6 @@ test("ash_pixeltests") { "//components/viz/test:test_support", "//mojo/core/embedder:embedder", "//ui/views:test_support", - "//ui/views:view_pixel_diff_test_support", ] } @@ -3379,6 +3450,8 @@ static_library("test_support") { "fast_ink/laser/laser_pointer_controller_test_api.h", "frame_throttler/mock_frame_throttling_observer.cc", "frame_throttler/mock_frame_throttling_observer.h", + "glanceables/test_glanceables_delegate.cc", + "glanceables/test_glanceables_delegate.h", "highlighter/highlighter_controller_test_api.cc", "highlighter/highlighter_controller_test_api.h", "ime/test_ime_controller_client.cc", @@ -3408,8 +3481,10 @@ static_library("test_support") { "system/geolocation/test_geolocation_url_loader_factory.h", "system/tray/system_nudge_label.cc", "system/tray/system_nudge_label.h", - "test/layer_animation_stopped_waiter.cc", - "test/layer_animation_stopped_waiter.h", + "test/ash_pixel_diff_test_helper.cc", + "test/ash_pixel_diff_test_helper.h", + "test/ash_pixel_diff_util.cc", + "test/ash_pixel_diff_util.h", "utility/haptics_tracking_test_input_controller.cc", "utility/haptics_tracking_test_input_controller.h", @@ -3503,6 +3578,8 @@ static_library("test_support") { "wm/desks/desks_test_util.h", "wm/desks/root_window_desk_switch_animator_test_api.cc", "wm/desks/root_window_desk_switch_animator_test_api.h", + "wm/desks/templates/saved_desk_test_helper.cc", + "wm/desks/templates/saved_desk_test_helper.h", "wm/desks/templates/saved_desk_test_util.cc", "wm/desks/templates/saved_desk_test_util.h", "wm/gestures/back_gesture/test_back_gesture_contextual_nudge_delegate.cc", @@ -3548,16 +3625,12 @@ static_library("test_support") { "//ash/assistant/model:model", "//ash/assistant/ui:constants", "//ash/assistant/ui:ui", - "//ash/components/disks:test_support", - "//ash/components/geolocation", "//ash/constants", "//ash/keyboard/ui", "//ash/keyboard/ui:test_support", "//ash/public/cpp", "//ash/public/cpp:test_support", "//ash/public/cpp/ambient/proto", - "//ash/services/recording:test_support", - "//ash/services/recording/public/mojom", "//ash/webui/personalization_app/mojom", "//ash/webui/personalization_app/proto", "//base", @@ -3570,16 +3643,22 @@ static_library("test_support") { "//chromeos/ash/components/dbus/audio", "//chromeos/ash/components/dbus/rgbkbd", "//chromeos/ash/components/dbus/system_clock", + "//chromeos/ash/components/disks:test_support", + "//chromeos/ash/components/geolocation", "//chromeos/ash/components/network:test_support", "//chromeos/ash/services/assistant:test_support", "//chromeos/ash/services/assistant/public/cpp", + "//chromeos/ash/services/bluetooth_config:test_support", + "//chromeos/ash/services/recording:test_support", + "//chromeos/ash/services/recording/public/mojom", "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", "//chromeos/login/login_state", - "//chromeos/services/bluetooth_config:test_support", "//chromeos/system", "//chromeos/ui/frame", "//components/account_id", + "//components/desks_storage", + "//components/desks_storage:test_support", "//components/exo/wayland:weston_test_stub", "//components/prefs:test_support", "//components/user_manager:user_manager", @@ -3615,6 +3694,7 @@ static_library("test_support") { "//ui/snapshot:snapshot", "//ui/views", "//ui/views:test_support", + "//ui/views:view_pixel_diff_test_support", "//ui/wm", "//ui/wm/public", ] diff --git a/chromium/ash/ambient/resources/BUILD.gn b/chromium/ash/ambient/resources/BUILD.gn index 32a40afebd7..831ae921f69 100644 --- a/chromium/ash/ambient/resources/BUILD.gn +++ b/chromium/ash/ambient/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/ambient/resources/resources.gni b/chromium/ash/ambient/resources/resources.gni index 9dd621425de..3341845b50f 100644 --- a/chromium/ash/ambient/resources/resources.gni +++ b/chromium/ash/ambient/resources/resources.gni @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn index 29c3e6b61d2..1719f4743bb 100644 --- a/chromium/ash/app_list/BUILD.gn +++ b/chromium/ash/app_list/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -100,8 +100,6 @@ source_set("app_list") { "views/continue_task_container_view.h", "views/continue_task_view.cc", "views/continue_task_view.h", - "views/expand_arrow_view.cc", - "views/expand_arrow_view.h", "views/folder_background_view.cc", "views/folder_background_view.h", "views/folder_header_view.cc", @@ -141,6 +139,12 @@ source_set("app_list") { "views/search_result_base_view.h", "views/search_result_container_view.cc", "views/search_result_container_view.h", + "views/search_result_image_list_view.cc", + "views/search_result_image_list_view.h", + "views/search_result_image_view.cc", + "views/search_result_image_view.h", + "views/search_result_image_view_delegate.cc", + "views/search_result_image_view_delegate.h", "views/search_result_inline_icon_view.cc", "views/search_result_inline_icon_view.h", "views/search_result_list_view.cc", @@ -151,8 +155,6 @@ source_set("app_list") { "views/search_result_page_dialog_controller.h", "views/search_result_page_view.cc", "views/search_result_page_view.h", - "views/search_result_suggestion_chip_view.cc", - "views/search_result_suggestion_chip_view.h", "views/search_result_tile_item_list_view.cc", "views/search_result_tile_item_list_view.h", "views/search_result_tile_item_view.cc", @@ -161,8 +163,6 @@ source_set("app_list") { "views/search_result_view.h", "views/suggested_content_info_view.cc", "views/suggested_content_info_view.h", - "views/suggestion_chip_container_view.cc", - "views/suggestion_chip_container_view.h", "views/top_icon_animation_view.cc", "views/top_icon_animation_view.h", ] @@ -183,6 +183,7 @@ source_set("app_list") { "//ash/resources/vector_icons", "//ash/search_box", "//ash/strings", + "//ash/style", "//base", "//base:i18n", "//base/third_party/dynamic_annotations", @@ -318,6 +319,7 @@ source_set("unit_tests") { ":app_list", ":test_support", "//ash:test_support", + "//ash/app_menu", "//ash/assistant/model", "//ash/assistant/ui", "//ash/assistant/ui:constants", @@ -329,6 +331,7 @@ source_set("unit_tests") { "//ash/public/cpp:test_support", "//ash/public/cpp/app_list/vector_icons", "//ash/search_box", + "//ash/style", "//base", "//base/test:test_support", "//chromeos/ash/components/feature_usage", @@ -340,6 +343,7 @@ source_set("unit_tests") { "//ui/accessibility", "//ui/aura:test_support", "//ui/base", + "//ui/chromeos/styles:cros_tokens_color_mappings", "//ui/color", "//ui/compositor", "//ui/compositor:test_support", diff --git a/chromium/ash/app_list/model/BUILD.gn b/chromium/ash/app_list/model/BUILD.gn index 36b3391e506..90363d05743 100644 --- a/chromium/ash/app_list/model/BUILD.gn +++ b/chromium/ash/app_list/model/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/app_menu/BUILD.gn b/chromium/ash/app_menu/BUILD.gn index 2e8abae0f24..a51b09e7a74 100644 --- a/chromium/ash/app_menu/BUILD.gn +++ b/chromium/ash/app_menu/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/assistant/model/BUILD.gn b/chromium/ash/assistant/model/BUILD.gn index d640b9b1c65..1e108186e69 100644 --- a/chromium/ash/assistant/model/BUILD.gn +++ b/chromium/ash/assistant/model/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -49,7 +49,7 @@ component("model") { "//ash/public/cpp", "//chromeos/ash/services/assistant/public/cpp", "//chromeos/ash/services/assistant/public/mojom", - "//chromeos/services/libassistant/public/cpp:structs", + "//chromeos/ash/services/libassistant/public/cpp:structs", "//ui/accessibility/mojom:ax_assistant_mojom", "//ui/gfx/geometry", ] diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn index 5680df5d179..f9150d68e7a 100644 --- a/chromium/ash/assistant/ui/BUILD.gn +++ b/chromium/ash/assistant/ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -93,11 +93,12 @@ source_set("ui") { "//ash/public/cpp", "//ash/resources/vector_icons", "//ash/strings", + "//ash/style", "//base", "//chromeos/ash/components/assistant:buildflags", "//chromeos/ash/services/assistant/public/cpp", "//chromeos/ash/services/assistant/public/mojom", - "//chromeos/services/libassistant/public/cpp:structs", + "//chromeos/ash/services/libassistant/public/cpp:structs", "//chromeos/ui/vector_icons", "//components/vector_icons", "//ui/aura", diff --git a/chromium/ash/assistant/ui/colors/BUILD.gn b/chromium/ash/assistant/ui/colors/BUILD.gn index c85472a91dd..f8a8ffbf66b 100644 --- a/chromium/ash/assistant/ui/colors/BUILD.gn +++ b/chromium/ash/assistant/ui/colors/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/assistant/ui/test_support/BUILD.gn b/chromium/ash/assistant/ui/test_support/BUILD.gn index c11becd4d6c..0fe2dab082d 100644 --- a/chromium/ash/assistant/ui/test_support/BUILD.gn +++ b/chromium/ash/assistant/ui/test_support/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/assistant/util/BUILD.gn b/chromium/ash/assistant/util/BUILD.gn index 384f1be8a0d..637388a47cb 100644 --- a/chromium/ash/assistant/util/BUILD.gn +++ b/chromium/ash/assistant/util/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/assistant/util/test_support/BUILD.gn b/chromium/ash/assistant/util/test_support/BUILD.gn index c682f858df4..1b1c1a71a6d 100644 --- a/chromium/ash/assistant/util/test_support/BUILD.gn +++ b/chromium/ash/assistant/util/test_support/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/BUILD.gn b/chromium/ash/components/BUILD.gn index fc0f7c8e019..6889ea4d2ce 100644 --- a/chromium/ash/components/BUILD.gn +++ b/chromium/ash/components/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -23,27 +23,9 @@ test("ash_components_unittests") { "//ash/components/arc:unit_tests", "//ash/components/arc/mojom:unit_tests", "//ash/components/arc/session:unit_tests", - "//ash/components/device_activity:unit_tests", - "//ash/components/disks:unit_tests", - "//ash/components/drivefs:unit_tests", "//ash/components/fwupd:unit_tests", - "//ash/components/geolocation:unit_tests", - "//ash/components/hid_detection:unit_tests", - "//ash/components/login/auth:unit_tests", - "//ash/components/login/hibernate:unit_tests", - "//ash/components/login/session:unit_tests", - "//ash/components/multidevice:unit_tests", "//ash/components/peripheral_notification:unit_tests", "//ash/components/phonehub:unit_tests", - "//ash/components/policy:unit_tests", - "//ash/components/power:unit_tests", - "//ash/components/proximity_auth:unit_tests", - "//ash/components/settings:unit_tests", - "//ash/components/smbfs:unit_tests", - "//ash/components/tether:unit_tests", - "//ash/components/timezone:unit_tests", - "//ash/components/tpm:unit_tests", - "//ash/components/trial_group:unit_tests", "//ash/strings", "//base/test:test_support", "//mojo/core/embedder", diff --git a/chromium/ash/components/arc/BUILD.gn b/chromium/ash/components/arc/BUILD.gn index 1df8c82f031..bcf5aa5358a 100644 --- a/chromium/ash/components/arc/BUILD.gn +++ b/chromium/ash/components/arc/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. +# Copyright 2015 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -118,13 +118,14 @@ static_library("arc") { deps = [ "//ash", "//ash/components/arc/vector_icons", - "//ash/components/disks", "//ash/keyboard/ui", "//ash/public/cpp", "//ash/public/cpp/external_arc:external_arc", + "//ash/style", "//chromeos/ash/components/audio", "//chromeos/ash/components/dbus", "//chromeos/ash/components/dbus/arc", + "//chromeos/ash/components/dbus/arc:arc_proto", "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/concierge:concierge_proto", "//chromeos/ash/components/dbus/cryptohome", @@ -137,6 +138,7 @@ static_library("arc") { "//chromeos/ash/components/dbus/upstart:upstart", "//chromeos/ash/components/dbus/userdataauth", "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", + "//chromeos/ash/components/disks", "//chromeos/ash/components/network", "//chromeos/components/disks:prefs", "//chromeos/components/sensors:sensors", @@ -161,6 +163,7 @@ static_library("arc") { "//ui/base/ime/ash", "//ui/chromeos/strings", "//ui/chromeos/styles:cros_styles_views", + "//ui/chromeos/styles:cros_tokens_color_mappings", "//ui/display/manager", "//ui/display/util", "//ui/events/ozone", @@ -437,8 +440,6 @@ source_set("unit_tests") { "//ash/components/arc/enterprise", "//ash/components/arc/media_session", "//ash/components/arc/video_accelerator:common", - "//ash/components/disks:test_support", - "//ash/components/policy", "//ash/constants", "//ash/keyboard/ui", "//ash/public/cpp", @@ -449,6 +450,7 @@ source_set("unit_tests") { "//chromeos/ash/components/cryptohome", "//chromeos/ash/components/dbus/arc", "//chromeos/ash/components/dbus/concierge", + "//chromeos/ash/components/dbus/dlcservice", "//chromeos/ash/components/dbus/patchpanel", "//chromeos/ash/components/dbus/patchpanel:patchpanel_proto", "//chromeos/ash/components/dbus/resourced", @@ -456,8 +458,9 @@ source_set("unit_tests") { "//chromeos/ash/components/dbus/session_manager:login_manager_proto", "//chromeos/ash/components/dbus/shill", "//chromeos/ash/components/dbus/upstart", + "//chromeos/ash/components/disks:test_support", "//chromeos/ash/components/network:test_support", - "//chromeos/dbus/dlcservice", + "//chromeos/ash/components/policy", "//chromeos/dbus/permission_broker", "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", diff --git a/chromium/ash/components/arc/enterprise/BUILD.gn b/chromium/ash/components/arc/enterprise/BUILD.gn index 088b501348c..4250701a13e 100644 --- a/chromium/ash/components/arc/enterprise/BUILD.gn +++ b/chromium/ash/components/arc/enterprise/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -26,13 +26,13 @@ static_library("enterprise") { deps = [ "//ash/components/arc:prefs", - "//ash/components/policy", "//ash/constants", "//base", "//chromeos/ash/components/cryptohome", "//chromeos/ash/components/dbus", "//chromeos/ash/components/dbus/arc", "//chromeos/ash/components/dbus/upstart:upstart", + "//chromeos/ash/components/policy", "//chromeos/dbus/power", "//components/prefs", "//components/session_manager/core", diff --git a/chromium/ash/components/arc/input_overlay/resources/BUILD.gn b/chromium/ash/components/arc/input_overlay/resources/BUILD.gn index c7c889343dd..2d964327ad4 100644 --- a/chromium/ash/components/arc/input_overlay/resources/BUILD.gn +++ b/chromium/ash/components/arc/input_overlay/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/arc/media_session/BUILD.gn b/chromium/ash/components/arc/media_session/BUILD.gn index b0ad70a80c3..ba0a28b38ad 100644 --- a/chromium/ash/components/arc/media_session/BUILD.gn +++ b/chromium/ash/components/arc/media_session/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/BUILD.gn b/chromium/ash/components/arc/mojom/BUILD.gn index 8c37f1ca917..96d8c5a31f2 100644 --- a/chromium/ash/components/arc/mojom/BUILD.gn +++ b/chromium/ash/components/arc/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/accessibility_helper.mojom b/chromium/ash/components/arc/mojom/accessibility_helper.mojom index 47174119465..acfdd8cace6 100644 --- a/chromium/ash/components/arc/mojom/accessibility_helper.mojom +++ b/chromium/ash/components/arc/mojom/accessibility_helper.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/adbd.mojom b/chromium/ash/components/arc/mojom/adbd.mojom index 49d2e8d0279..809a21f2563 100644 --- a/chromium/ash/components/arc/mojom/adbd.mojom +++ b/chromium/ash/components/arc/mojom/adbd.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/anr.mojom b/chromium/ash/components/arc/mojom/anr.mojom index 348f1da44f3..cbe5baf69bc 100644 --- a/chromium/ash/components/arc/mojom/anr.mojom +++ b/chromium/ash/components/arc/mojom/anr.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/app.mojom b/chromium/ash/components/arc/mojom/app.mojom index 1901a34f181..a9501834e69 100644 --- a/chromium/ash/components/arc/mojom/app.mojom +++ b/chromium/ash/components/arc/mojom/app.mojom @@ -1,8 +1,8 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Next MinVersion: 53 +// Next MinVersion: 55 module arc.mojom; @@ -42,6 +42,9 @@ struct AppInfo { // Size of app and associated data in bytes. [MinVersion=52] AppStorage? app_storage; + // Option, only for ARC upgrade. True if the app is fixing up. + // During fixup, it cannot be launched. + [MinVersion=54] bool need_fixup; }; // Describes the data required to install a web app. @@ -304,6 +307,22 @@ enum PaiFlowState { TIMEOUT = 9, }; +// Names and values match the CATEGORY_ constants on +// android.content.pm.ApplicationInfo. +[Extensible] +enum AppCategory { + [Default] kUndefined = -1, + kGame = 0, + kAudio = 1, + kVideo = 2, + kImage = 3, + kSocial = 4, + kNews = 5, + kMaps = 6, + kProductivity = 7, + kAccessibility = 8, +}; + // Next method ID: 19 // Deprecated method IDs: 1 interface AppHost { @@ -390,7 +409,7 @@ interface AppHost { }; // TODO(lhchavez): Migrate all request/response messages to Mojo. -// Next method ID: 40 +// Next method ID: 42 // Deprecated method IDs: 0, 1, 2, 3, 4, 9, 12, 13, 15, 17, 18, 19, 22 interface AppInstance { // Establishes full-duplex communication with the host. @@ -545,4 +564,11 @@ interface AppInstance { // it isn't available in the user's store. [MinVersion=43] IsInstallable@34(string package_name) => (bool is_installable); + + // Returns the app category of the given package. Corresponds to |category| + // field on android.content.pm.ApplicationInfo. + // Returns kUndefined if the package is not found or if the package does not + // declare an app category. + [MinVersion=53] GetAppCategory@41(string package_name) => + (AppCategory category); }; diff --git a/chromium/ash/components/arc/mojom/app_permissions.mojom b/chromium/ash/components/arc/mojom/app_permissions.mojom index c44ef5df4db..71318374788 100644 --- a/chromium/ash/components/arc/mojom/app_permissions.mojom +++ b/chromium/ash/components/arc/mojom/app_permissions.mojom @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/appfuse.mojom b/chromium/ash/components/arc/mojom/appfuse.mojom index b78d30d99e7..d0cd790371f 100644 --- a/chromium/ash/components/arc/mojom/appfuse.mojom +++ b/chromium/ash/components/arc/mojom/appfuse.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/arc_bridge.mojom b/chromium/ash/components/arc/mojom/arc_bridge.mojom index b17daa9a801..db1e1f5b7e6 100644 --- a/chromium/ash/components/arc/mojom/arc_bridge.mojom +++ b/chromium/ash/components/arc/mojom/arc_bridge.mojom @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/audio.mojom b/chromium/ash/components/arc/mojom/audio.mojom index c17b9eb1c82..c7491281c85 100644 --- a/chromium/ash/components/arc/mojom/audio.mojom +++ b/chromium/ash/components/arc/mojom/audio.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/auth.mojom b/chromium/ash/components/arc/mojom/auth.mojom index 052b719f69a..1636fe421d9 100644 --- a/chromium/ash/components/arc/mojom/auth.mojom +++ b/chromium/ash/components/arc/mojom/auth.mojom @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/backup_settings.mojom b/chromium/ash/components/arc/mojom/backup_settings.mojom index 4ebb2ce2e09..ef42a4d5120 100644 --- a/chromium/ash/components/arc/mojom/backup_settings.mojom +++ b/chromium/ash/components/arc/mojom/backup_settings.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/bitmap.mojom b/chromium/ash/components/arc/mojom/bitmap.mojom index 02d96647b6c..f658691b70c 100644 --- a/chromium/ash/components/arc/mojom/bitmap.mojom +++ b/chromium/ash/components/arc/mojom/bitmap.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/bluetooth.mojom b/chromium/ash/components/arc/mojom/bluetooth.mojom index 68e2e76b57b..0f4948b2584 100644 --- a/chromium/ash/components/arc/mojom/bluetooth.mojom +++ b/chromium/ash/components/arc/mojom/bluetooth.mojom @@ -1,8 +1,8 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Next MinVersion: 19 +// Next MinVersion: 21 module arc.mojom; @@ -153,7 +153,9 @@ enum BluetoothGattStatus { // https://source.android.com/devices/halref/structbtgatt__gatt__id__t.html struct BluetoothGattID { BluetoothUUID uuid; - uint8 inst_id; + uint8 deprecated_inst_id; + // Diverges from above spec since ARC++ uses 16-bit handles in this field. + [MinVersion=19] uint16 instance_id; }; // Copy from Android API @@ -228,7 +230,7 @@ enum BluetoothGattDBAttributeType { }; struct BluetoothGattDBElement { - uint8 id; + uint8 deprecated_id; BluetoothUUID uuid; BluetoothGattDBAttributeType type; uint16 attribute_handle; @@ -246,6 +248,9 @@ struct BluetoothGattDBElement { * the characteristic. */ uint8 properties; + + // Attribute IDs are stored in this field; it must be 16-bits wide. + [MinVersion=19] uint16 element_id; }; // Bluetooth SDP types @@ -488,7 +493,7 @@ interface BluetoothHost { => (BluetoothStatus status, pending_receiver<BluetoothConnectSocketClient>? client); }; -// Next Method ID: 24 +// Next Method ID: 25 // Deprecated Method ID: 0, 2, 6, 11, 12 interface BluetoothInstance { // Establishes full-duplex communication with the host. @@ -532,6 +537,9 @@ interface BluetoothInstance { BluetoothGattID char_id, bool is_notify, array<uint8> value); + // Used to notify service change, called when service is added or + // removed. + [MinVersion=20] OnServiceChanged@24(BluetoothAddress remote_addr); // Bluetooth Gatt Server functions [MinVersion=3] RequestGattRead@14( diff --git a/chromium/ash/components/arc/mojom/boot_phase_monitor.mojom b/chromium/ash/components/arc/mojom/boot_phase_monitor.mojom index 5a38abc913d..06bb4f239fc 100644 --- a/chromium/ash/components/arc/mojom/boot_phase_monitor.mojom +++ b/chromium/ash/components/arc/mojom/boot_phase_monitor.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/camera.mojom b/chromium/ash/components/arc/mojom/camera.mojom index 890a7f4e2af..91877586b4a 100644 --- a/chromium/ash/components/arc/mojom/camera.mojom +++ b/chromium/ash/components/arc/mojom/camera.mojom @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/camera_intent.mojom b/chromium/ash/components/arc/mojom/camera_intent.mojom index 33a423c9077..3aa40e04e2c 100644 --- a/chromium/ash/components/arc/mojom/camera_intent.mojom +++ b/chromium/ash/components/arc/mojom/camera_intent.mojom @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/cert_store.mojom b/chromium/ash/components/arc/mojom/cert_store.mojom index 94ddb79b5e5..795ceb8adf6 100644 --- a/chromium/ash/components/arc/mojom/cert_store.mojom +++ b/chromium/ash/components/arc/mojom/cert_store.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/clipboard.mojom b/chromium/ash/components/arc/mojom/clipboard.mojom index ce6d3959579..0676cdb79f1 100644 --- a/chromium/ash/components/arc/mojom/clipboard.mojom +++ b/chromium/ash/components/arc/mojom/clipboard.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/compatibility_mode.mojom b/chromium/ash/components/arc/mojom/compatibility_mode.mojom index 745373bad75..ae3e12d196f 100644 --- a/chromium/ash/components/arc/mojom/compatibility_mode.mojom +++ b/chromium/ash/components/arc/mojom/compatibility_mode.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/crash_collector.mojom b/chromium/ash/components/arc/mojom/crash_collector.mojom index dc7dac5934a..abbc98149dd 100644 --- a/chromium/ash/components/arc/mojom/crash_collector.mojom +++ b/chromium/ash/components/arc/mojom/crash_collector.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/digital_goods.mojom b/chromium/ash/components/arc/mojom/digital_goods.mojom index 83cf80bee26..aa992d24e23 100644 --- a/chromium/ash/components/arc/mojom/digital_goods.mojom +++ b/chromium/ash/components/arc/mojom/digital_goods.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/disk_quota.mojom b/chromium/ash/components/arc/mojom/disk_quota.mojom index be026afa186..da22da1cfbd 100644 --- a/chromium/ash/components/arc/mojom/disk_quota.mojom +++ b/chromium/ash/components/arc/mojom/disk_quota.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/enterprise_reporting.mojom b/chromium/ash/components/arc/mojom/enterprise_reporting.mojom index 1213b274cfc..bcb7f215a26 100644 --- a/chromium/ash/components/arc/mojom/enterprise_reporting.mojom +++ b/chromium/ash/components/arc/mojom/enterprise_reporting.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/file_system.mojom b/chromium/ash/components/arc/mojom/file_system.mojom index 51cc18fcb69..d8245d433e4 100644 --- a/chromium/ash/components/arc/mojom/file_system.mojom +++ b/chromium/ash/components/arc/mojom/file_system.mojom @@ -1,8 +1,8 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Next MinVersion: 23 +// Next MinVersion: 24 module arc.mojom; @@ -11,6 +11,7 @@ import "ash/components/arc/mojom/bitmap.mojom"; import "ash/components/arc/mojom/gfx.mojom"; import "ash/components/arc/mojom/intent_common.mojom"; import "ash/components/arc/mojom/video_common.mojom"; +import "mojo/public/mojom/base/file_path.mojom"; import "mojo/public/mojom/base/time.mojom"; import "url/mojom/url.mojom"; @@ -284,7 +285,29 @@ struct FileSession { handle fd; }; -// Next method ID: 12 +// Representation of an entry in the MediaStore downloads collection. +struct MediaStoreDownloadMetadata { + // The display name of the download including its extension (e.g. "foo.pdf"). + string display_name; + + // The package name that contributed the download (e.g. "com.bar.foo"). + string owner_package_name; + + // The relative path of the download within the Download/ directory (e.g. + // "Download/foo/bar/"). The method implementation must verify that the + // `relative_path` is in fact within the Download/ directory, treating ARC as + // an untrusted source. + mojo_base.mojom.FilePath relative_path; +}; + +// Representation of an entry in a MediaStore collection. +[Extensible] +union MediaStoreMetadata { + [Default] uint8 unknown; // Actual value is ignored and is just a placeholder. + MediaStoreDownloadMetadata download; +}; + +// Next method ID: 13 interface FileSystemHost { // Returns the name of the file specified by the URL. // When an error occurs, returns null value. @@ -336,6 +359,11 @@ interface FileSystemHost { [MinVersion=11] GetFileSelectorElements@8( GetFileSelectorElementsRequest request) => (FileSelectorElements elements); + + // Invoked when the specified |uri| has been added to a MediaStore collection + // with the given |metadata|. + [MinVersion=23] OnMediaStoreUriAdded@12( + url.mojom.Url uri, MediaStoreMetadata metadata); }; // The browser process is using this interface in ArcFileSystemOperationRunner, diff --git a/chromium/ash/components/arc/mojom/gfx.mojom b/chromium/ash/components/arc/mojom/gfx.mojom index 3400f6957bf..a22fe181343 100644 --- a/chromium/ash/components/arc/mojom/gfx.mojom +++ b/chromium/ash/components/arc/mojom/gfx.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/iio_sensor.mojom b/chromium/ash/components/arc/mojom/iio_sensor.mojom index 1e4fdce2007..ef1f35f9e18 100644 --- a/chromium/ash/components/arc/mojom/iio_sensor.mojom +++ b/chromium/ash/components/arc/mojom/iio_sensor.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/ime.mojom b/chromium/ash/components/arc/mojom/ime.mojom index 0b688d885bf..15817d36862 100644 --- a/chromium/ash/components/arc/mojom/ime.mojom +++ b/chromium/ash/components/arc/mojom/ime.mojom @@ -1,8 +1,8 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Next MinVersion: 22 +// Next MinVersion: 23 module arc.mojom; @@ -79,9 +79,10 @@ struct KeyEventData { // in <linux/input-event-codes.h>. [MinVersion=16] uint32 scan_code; [MinVersion=20] bool is_alt_gr_down; + [MinVersion=23] bool is_repeat; }; -// Deprecated method IDs: 5, 6 +// Deprecated method IDs: 1, 4, 5, 6 // Next method ID: 10 interface ImeHost { // Notifies Chrome that the text input focus is changed. @@ -91,11 +92,6 @@ interface ImeHost { [MinVersion=10] bool is_personalized_learning_allowed, [MinVersion=11] int32 flags); - // DEPRECATED: Please use OnCursorRectChanged@8 instead. - OnCursorRectChangedDeprecated@1( - Rect rect, - [MinVersion=8] bool is_screen_coordinates); - // Notifies Chrome that the cursor position has changed. // // |rect| describes the coordinates in physical pixels in the given @@ -110,14 +106,6 @@ interface ImeHost { // Show virtual keyboard of Chrome OS if needed. [MinVersion=2] ShowVirtualKeyboardIfEnabled@3(); - // DEPRECATED: Please use OnCursorRectChangedWithSurroundingText@9 instead. - [MinVersion=5] OnCursorRectChangedWithSurroundingTextDeprecated@4( - Rect rect, - Range text_range, - string text_in_range, - Range selection_range, - [MinVersion=8] bool is_screen_coordinates); - // Notifies Chrome that the cursor position has changed and // also sends surrounding text. // diff --git a/chromium/ash/components/arc/mojom/input_method_manager.mojom b/chromium/ash/components/arc/mojom/input_method_manager.mojom index 02156cbf0fc..67bc66b0423 100644 --- a/chromium/ash/components/arc/mojom/input_method_manager.mojom +++ b/chromium/ash/components/arc/mojom/input_method_manager.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/intent_common.mojom b/chromium/ash/components/arc/mojom/intent_common.mojom index dfe9c0c6bd1..12fc6b3364a 100644 --- a/chromium/ash/components/arc/mojom/intent_common.mojom +++ b/chromium/ash/components/arc/mojom/intent_common.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/intent_helper.mojom b/chromium/ash/components/arc/mojom/intent_helper.mojom index 1fd3e0446e8..ef0663d3236 100644 --- a/chromium/ash/components/arc/mojom/intent_helper.mojom +++ b/chromium/ash/components/arc/mojom/intent_helper.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -249,15 +249,13 @@ struct LaunchIntent { array<LaunchFileInfo>? files; }; -// Contains information about an app's supported links. -struct SupportedLinks { +// Contains information about supported links for an ARC package. +[RenamedFrom="arc.mojom.SupportedLinks"] +struct SupportedLinksPackage { // Android package name of the app. string package_name; - // A list of all the link intent filters handled by the app. Should only - // include, link intents. That is, filters must have an http/https scheme and - // at least one authority. This field can be omitted when deleting supported - // links for an app. - array<IntentFilter>? filters; + // Deprecated and no longer used. + array<IntentFilter>? deprecated_filters; }; // The source of a change in the supported links setting. @@ -281,7 +279,7 @@ interface CustomTabSession { }; // Handles intents from ARC in Chrome. -// Deprecated method ID: 4, 9, 10, 16 +// Deprecated method ID: 4, 9, 10, 16, 18 // Next method ID: 23 interface IntentHelperHost { // Called when icons associated with the package are no longer up to date. @@ -356,10 +354,11 @@ interface IntentHelperHost { // IntentFilters, and removes the apps in |removed_packages| from handling // supported links. [MinVersion=47] OnSupportedLinksChanged@20( - array<SupportedLinks> added_packages, - array<SupportedLinks> removed_packages, + array<SupportedLinksPackage> added_packages, + array<SupportedLinksPackage> removed_packages, [MinVersion=48] SupportedLinkChangeSource source); + // DEPRECATED: Replaced by `FileSystemHost::OnMediaStoreUriAdded()`. // Called when a new entry has been added to the MediaStore.Downloads // collection of downloaded items with the specified metadata. // |relative_path| relative path of the download within the Download/ @@ -369,7 +368,7 @@ interface IntentHelperHost { // treating ARC as an untrusted source. // |owner_package_name| package name that contributed the download (e.g. // "com.bar.foo"). - [MinVersion=44] OnDownloadAdded@18( + [MinVersion=44] OnDownloadAddedDeprecated@18( string relative_path, string owner_package_name); // Opens the web app for a specified URL, if it is installed, and delivers diff --git a/chromium/ash/components/arc/mojom/keyboard_shortcut.mojom b/chromium/ash/components/arc/mojom/keyboard_shortcut.mojom index ffc078aacac..917d57d5113 100644 --- a/chromium/ash/components/arc/mojom/keyboard_shortcut.mojom +++ b/chromium/ash/components/arc/mojom/keyboard_shortcut.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/keymaster.mojom b/chromium/ash/components/arc/mojom/keymaster.mojom index 6aa80cf3284..62f5dbf8f26 100644 --- a/chromium/ash/components/arc/mojom/keymaster.mojom +++ b/chromium/ash/components/arc/mojom/keymaster.mojom @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/kiosk.mojom b/chromium/ash/components/arc/mojom/kiosk.mojom index 4ace32fe243..9c3dcb52499 100644 --- a/chromium/ash/components/arc/mojom/kiosk.mojom +++ b/chromium/ash/components/arc/mojom/kiosk.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/lock_screen.mojom b/chromium/ash/components/arc/mojom/lock_screen.mojom index a19bc32dbbd..e31ee92b255 100644 --- a/chromium/ash/components/arc/mojom/lock_screen.mojom +++ b/chromium/ash/components/arc/mojom/lock_screen.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/media_session.mojom b/chromium/ash/components/arc/mojom/media_session.mojom index e12dd0181e9..15c43f994ad 100644 --- a/chromium/ash/components/arc/mojom/media_session.mojom +++ b/chromium/ash/components/arc/mojom/media_session.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/memory.mojom b/chromium/ash/components/arc/mojom/memory.mojom index 6d5313245b5..eacd8dd95b6 100644 --- a/chromium/ash/components/arc/mojom/memory.mojom +++ b/chromium/ash/components/arc/mojom/memory.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // Next MinVersion: 1 diff --git a/chromium/ash/components/arc/mojom/metrics.mojom b/chromium/ash/components/arc/mojom/metrics.mojom index ce91c667276..1edbf999c09 100644 --- a/chromium/ash/components/arc/mojom/metrics.mojom +++ b/chromium/ash/components/arc/mojom/metrics.mojom @@ -1,8 +1,7 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Next MinVersion: 26 - +// Next MinVersion: 27 module arc.mojom; import "mojo/public/mojom/base/time.mojom"; @@ -347,7 +346,27 @@ enum AndroidDataSubdirectory { kDEStorageRootUserDir = 3, }; -// Next method ID: 30 +// Enumerates the types of Wayland timing events where the message processing +// completed late and could cause UI jank in ARC apps. This enum is persisted to +// logs. Existing values should not be changed and new values should only be +// appended to the end. +[Extensible] +enum WaylandTimingEvent { + [Default] kOther = 0, + kBinderReleaseClipboardData = 1, + kWlBufferRelease = 2, + kWlKeyboardLeave = 3, + kWlPointerMotion = 4, + kWlPointerLeave = 5, + kZauraShellActivated = 6, + kZauraSurfaceOcclusionChanged = 7, + kZcrRemoteSurfaceWindowGeometryChanged = 8, + kZcrRemoteSurfaceBoundsChangedInOutput = 9, + kZcrVsyncTimingUpdate = 10, +}; + +// Deprecated method IDs: 25 +// Next method ID: 31 interface MetricsHost { // Reports boot progress events from ARC instance. ReportBootProgress@0(array<BootProgressEvent> events, @@ -450,8 +469,8 @@ interface MetricsHost { [MinVersion=22] ReportProvisioningPreSignIn@24(); // Reports the duration of late timing events for Wayland. - [MinVersion=23] ReportWaylandLateTimingDuration@25( - mojo_base.mojom.TimeDelta duration); + [MinVersion=26] ReportWaylandLateTimingEvent@30( + WaylandTimingEvent event, mojo_base.mojom.TimeDelta duration); // Reports the number of directories and non-directory files under the // "Play files" folder in ChromeOS Files app except for the "Android" folder. diff --git a/chromium/ash/components/arc/mojom/midis.mojom b/chromium/ash/components/arc/mojom/midis.mojom index 52e12ebaf4e..a49c1e7e6bf 100644 --- a/chromium/ash/components/arc/mojom/midis.mojom +++ b/chromium/ash/components/arc/mojom/midis.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/nearby_share.mojom b/chromium/ash/components/arc/mojom/nearby_share.mojom index 98e0dd1b2a0..281717dab3b 100644 --- a/chromium/ash/components/arc/mojom/nearby_share.mojom +++ b/chromium/ash/components/arc/mojom/nearby_share.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/net.mojom b/chromium/ash/components/arc/mojom/net.mojom index 8fb7267a549..9a78c23f0f9 100644 --- a/chromium/ash/components/arc/mojom/net.mojom +++ b/chromium/ash/components/arc/mojom/net.mojom @@ -1,8 +1,8 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Next MinVersion: 20 +// Next MinVersion: 21 // This file defines the mojo interface between the ARC networking stack and // Chrome OS. There are three different groups of interactions: @@ -262,9 +262,6 @@ struct IPConfiguration { // IP family for that configuration IPAddressType type; - - // URL of the HTTP proxy to use for that network. - string web_proxy_auto_discovery_url; }; // The subset of wireless security protocols that Android defines in @@ -489,6 +486,74 @@ struct WifiConfiguration { // Set of EAP credentials used to connect to a network that matched these // credentials. [MinVersion=16] EapCredentials? eap@8; + + // Indicates if the App has expressed an explicit opinion about the + // meteredness of this network. + [MinVersion=20] MeteredOverride metered_override@9; + + // The proxy configuration of this object. + [MinVersion=20] ArcProxyInfo? http_proxy@10; + + // Static IPv4 configuration of the network + [MinVersion=20] StaticIpv4Configuration? static_ipv4_config@11; + + // List of domains to search when resolving host names on this + // link, in priority order. + [MinVersion=20] array<string>? domains@12; + + // DNS server IP addresses included in the configuration + [MinVersion=20] array<string>? dns_servers@13; +}; + +[Extensible] +enum MeteredOverride { + // No metered override + [Default] kNone = 0, + + // Override network to be metered + kMetered = 1, + + // Override network to be unmetered + kNotmetered = 2, +}; + +// Static Ipv4 configuration +struct StaticIpv4Configuration { + // Static IPv4 address included in the configuration + string? ipv4_addr@0; + + // Static IPv4 address of the gateway included in the configuration + string? gateway_ipv4_addr@1; + + // Prefix length of the network + int32 prefix_length@2; +}; + +// For ProxyInfo, we have 2 options to set up proxy: +// 1. a direct configuration: host, port, and exclusion_list are +// used and pac_url is ignored +// 2. a PAC URL configuration: only pac_url +// is used and other fields are ignored. +union ArcProxyInfo { + ManualProxyConfig manual_proxy@0; + PacUrlProxyConfig pac_url_proxy@1; +}; + +struct PacUrlProxyConfig { + // PAC script download URL for that network. + url.mojom.Url pac_url@0; +}; + +struct ManualProxyConfig { + // The host IP address of this proxy + string host@0; + + // The port of this proxy + int32 port@1; + + // When configured to use a Direct Proxy this returns the list of hosts + // for which the proxy is ignored. + array<string> exclusion_list@2; }; // Response object sent back to ARC when it queries existing networks on diff --git a/chromium/ash/components/arc/mojom/notifications.mojom b/chromium/ash/components/arc/mojom/notifications.mojom index 3006cdf9fcd..f44172079ff 100644 --- a/chromium/ash/components/arc/mojom/notifications.mojom +++ b/chromium/ash/components/arc/mojom/notifications.mojom @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/obb_mounter.mojom b/chromium/ash/components/arc/mojom/obb_mounter.mojom index a33c3b8f35d..296e0c47afe 100644 --- a/chromium/ash/components/arc/mojom/obb_mounter.mojom +++ b/chromium/ash/components/arc/mojom/obb_mounter.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/oemcrypto.mojom b/chromium/ash/components/arc/mojom/oemcrypto.mojom index bc6830e2407..eeb5eae4bde 100644 --- a/chromium/ash/components/arc/mojom/oemcrypto.mojom +++ b/chromium/ash/components/arc/mojom/oemcrypto.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/payment_app.mojom b/chromium/ash/components/arc/mojom/payment_app.mojom index d206f0d4865..2ce4e791ed1 100644 --- a/chromium/ash/components/arc/mojom/payment_app.mojom +++ b/chromium/ash/components/arc/mojom/payment_app.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/pip.mojom b/chromium/ash/components/arc/mojom/pip.mojom index 8d38010bc40..e7ea38c649e 100644 --- a/chromium/ash/components/arc/mojom/pip.mojom +++ b/chromium/ash/components/arc/mojom/pip.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/policy.mojom b/chromium/ash/components/arc/mojom/policy.mojom index 01f19d1ec5f..6988344791b 100644 --- a/chromium/ash/components/arc/mojom/policy.mojom +++ b/chromium/ash/components/arc/mojom/policy.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/power.mojom b/chromium/ash/components/arc/mojom/power.mojom index c926178442c..9357a1e1500 100644 --- a/chromium/ash/components/arc/mojom/power.mojom +++ b/chromium/ash/components/arc/mojom/power.mojom @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/print_common.mojom b/chromium/ash/components/arc/mojom/print_common.mojom index 9886c73ad05..180b0f2da11 100644 --- a/chromium/ash/components/arc/mojom/print_common.mojom +++ b/chromium/ash/components/arc/mojom/print_common.mojom @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/print_spooler.mojom b/chromium/ash/components/arc/mojom/print_spooler.mojom index c28e1fea284..2e5b9a0a7a7 100644 --- a/chromium/ash/components/arc/mojom/print_spooler.mojom +++ b/chromium/ash/components/arc/mojom/print_spooler.mojom @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/privacy_items.mojom b/chromium/ash/components/arc/mojom/privacy_items.mojom index 78a29620a40..17635adcf81 100644 --- a/chromium/ash/components/arc/mojom/privacy_items.mojom +++ b/chromium/ash/components/arc/mojom/privacy_items.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/process.mojom b/chromium/ash/components/arc/mojom/process.mojom index 8964106393c..025fb287056 100644 --- a/chromium/ash/components/arc/mojom/process.mojom +++ b/chromium/ash/components/arc/mojom/process.mojom @@ -1,4 +1,4 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/property.mojom b/chromium/ash/components/arc/mojom/property.mojom index cac4bc030ee..2ad9ee58c05 100644 --- a/chromium/ash/components/arc/mojom/property.mojom +++ b/chromium/ash/components/arc/mojom/property.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/protected_buffer_manager.mojom b/chromium/ash/components/arc/mojom/protected_buffer_manager.mojom index 017e9ab34d7..55888707205 100644 --- a/chromium/ash/components/arc/mojom/protected_buffer_manager.mojom +++ b/chromium/ash/components/arc/mojom/protected_buffer_manager.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/rotation_lock.mojom b/chromium/ash/components/arc/mojom/rotation_lock.mojom index 9bfeb524a52..1b90929d70f 100644 --- a/chromium/ash/components/arc/mojom/rotation_lock.mojom +++ b/chromium/ash/components/arc/mojom/rotation_lock.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/scale_factor.mojom b/chromium/ash/components/arc/mojom/scale_factor.mojom index 883425bfdd1..a30ed014c45 100644 --- a/chromium/ash/components/arc/mojom/scale_factor.mojom +++ b/chromium/ash/components/arc/mojom/scale_factor.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/screen_capture.mojom b/chromium/ash/components/arc/mojom/screen_capture.mojom index 83901786ab2..5e767a0a052 100644 --- a/chromium/ash/components/arc/mojom/screen_capture.mojom +++ b/chromium/ash/components/arc/mojom/screen_capture.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/sensor.mojom b/chromium/ash/components/arc/mojom/sensor.mojom index e9763d72081..17aaed75b7e 100644 --- a/chromium/ash/components/arc/mojom/sensor.mojom +++ b/chromium/ash/components/arc/mojom/sensor.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/sensor_service.mojom b/chromium/ash/components/arc/mojom/sensor_service.mojom index abf361bdf77..fc00d856b1c 100644 --- a/chromium/ash/components/arc/mojom/sensor_service.mojom +++ b/chromium/ash/components/arc/mojom/sensor_service.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/sharesheet.mojom b/chromium/ash/components/arc/mojom/sharesheet.mojom index cec5a0844d4..4eaf0095cb2 100644 --- a/chromium/ash/components/arc/mojom/sharesheet.mojom +++ b/chromium/ash/components/arc/mojom/sharesheet.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/storage_manager.mojom b/chromium/ash/components/arc/mojom/storage_manager.mojom index d1c19bfc450..71b8bf53446 100644 --- a/chromium/ash/components/arc/mojom/storage_manager.mojom +++ b/chromium/ash/components/arc/mojom/storage_manager.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/system_ui.mojom b/chromium/ash/components/arc/mojom/system_ui.mojom index 751aad3678d..75171262ee6 100644 --- a/chromium/ash/components/arc/mojom/system_ui.mojom +++ b/chromium/ash/components/arc/mojom/system_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. +// Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/timer.mojom b/chromium/ash/components/arc/mojom/timer.mojom index b79b3f4e521..378a54f4351 100644 --- a/chromium/ash/components/arc/mojom/timer.mojom +++ b/chromium/ash/components/arc/mojom/timer.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/tracing.mojom b/chromium/ash/components/arc/mojom/tracing.mojom index aa1f5a2f3bc..06806f0909a 100644 --- a/chromium/ash/components/arc/mojom/tracing.mojom +++ b/chromium/ash/components/arc/mojom/tracing.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/tts.mojom b/chromium/ash/components/arc/mojom/tts.mojom index 2e36f2ac2ff..dffd3d5ea31 100644 --- a/chromium/ash/components/arc/mojom/tts.mojom +++ b/chromium/ash/components/arc/mojom/tts.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // Next MinVersion: 5 diff --git a/chromium/ash/components/arc/mojom/usb_host.mojom b/chromium/ash/components/arc/mojom/usb_host.mojom index 0edc5ecde8d..990646079d2 100644 --- a/chromium/ash/components/arc/mojom/usb_host.mojom +++ b/chromium/ash/components/arc/mojom/usb_host.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/video.mojom b/chromium/ash/components/arc/mojom/video.mojom index febe3858a83..fb19f1dc1c9 100644 --- a/chromium/ash/components/arc/mojom/video.mojom +++ b/chromium/ash/components/arc/mojom/video.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/video_common.mojom b/chromium/ash/components/arc/mojom/video_common.mojom index b2850efea6c..eb849b6a4cc 100644 --- a/chromium/ash/components/arc/mojom/video_common.mojom +++ b/chromium/ash/components/arc/mojom/video_common.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/video_decode_accelerator.mojom b/chromium/ash/components/arc/mojom/video_decode_accelerator.mojom index 98c0f125abc..9ec6be9dcbc 100644 --- a/chromium/ash/components/arc/mojom/video_decode_accelerator.mojom +++ b/chromium/ash/components/arc/mojom/video_decode_accelerator.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/video_decoder.mojom b/chromium/ash/components/arc/mojom/video_decoder.mojom index 1e9b46ca803..0d422d914a9 100644 --- a/chromium/ash/components/arc/mojom/video_decoder.mojom +++ b/chromium/ash/components/arc/mojom/video_decoder.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/video_encode_accelerator.mojom b/chromium/ash/components/arc/mojom/video_encode_accelerator.mojom index 0e09919dce6..1016b3e050d 100644 --- a/chromium/ash/components/arc/mojom/video_encode_accelerator.mojom +++ b/chromium/ash/components/arc/mojom/video_encode_accelerator.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/video_frame_pool.mojom b/chromium/ash/components/arc/mojom/video_frame_pool.mojom index 7a893b0f502..4a1a9815fe7 100644 --- a/chromium/ash/components/arc/mojom/video_frame_pool.mojom +++ b/chromium/ash/components/arc/mojom/video_frame_pool.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/video_protected_buffer_allocator.mojom b/chromium/ash/components/arc/mojom/video_protected_buffer_allocator.mojom index c3e29952c6d..b6f3f959c3e 100644 --- a/chromium/ash/components/arc/mojom/video_protected_buffer_allocator.mojom +++ b/chromium/ash/components/arc/mojom/video_protected_buffer_allocator.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/volume_mounter.mojom b/chromium/ash/components/arc/mojom/volume_mounter.mojom index 3e1767c4b3d..a6bc5a28ddf 100644 --- a/chromium/ash/components/arc/mojom/volume_mounter.mojom +++ b/chromium/ash/components/arc/mojom/volume_mounter.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/wake_lock.mojom b/chromium/ash/components/arc/mojom/wake_lock.mojom index b1f689189b0..8be5f8e920e 100644 --- a/chromium/ash/components/arc/mojom/wake_lock.mojom +++ b/chromium/ash/components/arc/mojom/wake_lock.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/mojom/wallpaper.mojom b/chromium/ash/components/arc/mojom/wallpaper.mojom index d3497089ddc..8b3851707b0 100644 --- a/chromium/ash/components/arc/mojom/wallpaper.mojom +++ b/chromium/ash/components/arc/mojom/wallpaper.mojom @@ -1,4 +1,4 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/ash/components/arc/mojom/webapk.mojom b/chromium/ash/components/arc/mojom/webapk.mojom index 4951f5f10e5..e2beee4000e 100644 --- a/chromium/ash/components/arc/mojom/webapk.mojom +++ b/chromium/ash/components/arc/mojom/webapk.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/components/arc/session/BUILD.gn b/chromium/ash/components/arc/session/BUILD.gn index c9c0db3435b..da444c1a712 100644 --- a/chromium/ash/components/arc/session/BUILD.gn +++ b/chromium/ash/components/arc/session/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -55,12 +55,13 @@ static_library("session") { "//chromeos/ash/components/cryptohome", "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/debug_daemon", + "//chromeos/ash/components/dbus/dlcservice", + "//chromeos/ash/components/dbus/dlcservice:dlcservice_proto", "//chromeos/ash/components/dbus/session_manager", + "//chromeos/ash/components/dbus/spaced:spaced", "//chromeos/ash/components/dbus/upstart", "//chromeos/ash/components/memory:memory", "//chromeos/components/sensors:buildflags", - "//chromeos/dbus/dlcservice:dlcservice", - "//chromeos/dbus/dlcservice:dlcservice_proto", "//chromeos/system:system", "//components/prefs:prefs", "//components/user_manager", @@ -132,9 +133,9 @@ source_set("unit_tests") { "//chromeos/ash/components/cryptohome", "//chromeos/ash/components/dbus/concierge", "//chromeos/ash/components/dbus/debug_daemon", + "//chromeos/ash/components/dbus/dlcservice", "//chromeos/ash/components/dbus/session_manager", "//chromeos/ash/components/dbus/upstart", - "//chromeos/dbus/dlcservice", "//chromeos/system:system", "//components/account_id", "//components/prefs:test_support", diff --git a/chromium/ash/components/arc/vector_icons/BUILD.gn b/chromium/ash/components/arc/vector_icons/BUILD.gn index 580452b3f99..545051b9419 100644 --- a/chromium/ash/components/arc/vector_icons/BUILD.gn +++ b/chromium/ash/components/arc/vector_icons/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/arc/video_accelerator/BUILD.gn b/chromium/ash/components/arc/video_accelerator/BUILD.gn index 438748cd223..0bbc41d228d 100644 --- a/chromium/ash/components/arc/video_accelerator/BUILD.gn +++ b/chromium/ash/components/arc/video_accelerator/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/device_activity/BUILD.gn b/chromium/ash/components/device_activity/BUILD.gn deleted file mode 100644 index 6eda6311a62..00000000000 --- a/chromium/ash/components/device_activity/BUILD.gn +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//third_party/protobuf/proto_library.gni") - -assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") - -component("device_activity") { - output_name = "ash_device_activity" - defines = [ "IS_ASH_DEVICE_ACTIVITY_IMPL" ] - - deps = [ - ":fresnel_service_proto", - "//ash/constants:constants", - "//base", - "//base:i18n", - "//chromeos/ash/components/dbus/session_manager", - "//chromeos/ash/components/dbus/system_clock:system_clock", - "//chromeos/ash/components/network", - "//chromeos/system", - "//components/policy/core/common", - "//components/prefs:prefs", - "//components/version_info", - "//crypto:crypto", - "//dbus", - "//google_apis", - "//services/network/public/cpp", - "//third_party/icu", - "//third_party/private_membership:private_membership", - "//third_party/private_membership:private_membership_proto", - "//url", - ] - - sources = [ - "daily_use_case_impl.cc", - "daily_use_case_impl.h", - "device_active_use_case.cc", - "device_active_use_case.h", - "device_activity_client.cc", - "device_activity_client.h", - "device_activity_controller.cc", - "device_activity_controller.h", - "fresnel_pref_names.cc", - "fresnel_pref_names.h", - "monthly_use_case_impl.cc", - "monthly_use_case_impl.h", - "trigger.h", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "daily_use_case_impl_unittest.cc", - "device_activity_client_unittest.cc", - "device_activity_controller_unittest.cc", - "monthly_use_case_impl_unittest.cc", - ] - - deps = [ - ":device_activity", - ":fresnel_service_proto", - "//ash/constants:constants", - "//base", - "//base/test:test_support", - "//chromeos/ash/components/dbus/session_manager:session_manager", - "//chromeos/ash/components/dbus/system_clock:system_clock", - "//chromeos/ash/components/network", - "//chromeos/ash/components/network:test_support", - "//chromeos/system:system", - "//components/policy/core/common:test_support", - "//components/prefs:test_support", - "//components/version_info:channel", - "//dbus", - "//services/device/public/cpp:test_support", - "//services/network:test_support", - "//testing/gmock", - "//testing/gtest", - "//third_party/private_membership:private_membership", - ] - - data = [ "//third_party/private_membership/src/internal/testing/regression_test_data/test_data.binarypb" ] -} - -proto_library("fresnel_service_proto") { - sources = [ "fresnel_service.proto" ] - - extra_configs = - [ "//third_party/private_membership:private_membership_config" ] - - import_dirs = [ - "//third_party/private_membership/src", - "//third_party/shell-encryption/src", - ".", - ] - - proto_in_dir = "//" - - link_deps = [ "//third_party/private_membership:private_membership_proto" ] -} diff --git a/chromium/ash/components/disks/BUILD.gn b/chromium/ash/components/disks/BUILD.gn deleted file mode 100644 index d913fa03319..00000000000 --- a/chromium/ash/components/disks/BUILD.gn +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//testing/test.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("disks") { - defines = [ "IS_ASH_DISKS_IMPL" ] - deps = [ - "//ash/constants", - "//base", - "//chromeos/ash/components/dbus", - "//chromeos/ash/components/dbus/cros_disks", - "//chromeos/dbus/power", - "//chromeos/dbus/power:power_manager_proto", - ] - sources = [ - "disk.cc", - "disk.h", - "disk_mount_manager.cc", - "disk_mount_manager.h", - "mount_point.cc", - "mount_point.h", - "suspend_unmount_manager.cc", - "suspend_unmount_manager.h", - ] -} - -source_set("test_support") { - testonly = true - public_deps = [ ":disks" ] - deps = [ - "//base", - "//base/test:test_support", - "//chromeos/ash/components/dbus:test_support", - "//chromeos/ash/components/dbus/cros_disks", - "//chromeos/dbus/power:power_manager_proto", - "//testing/gmock", - "//testing/gtest", - ] - sources = [ - "mock_disk_mount_manager.cc", - "mock_disk_mount_manager.h", - ] -} - -source_set("unit_tests") { - testonly = true - deps = [ - ":disks", - ":test_support", - "//base/test:test_support", - "//chromeos/ash/components/dbus:test_support", - "//chromeos/ash/components/dbus/cros_disks", - "//chromeos/dbus/power", - "//chromeos/dbus/power:power_manager_proto", - "//testing/gmock", - "//testing/gtest", - ] - sources = [ - "disk_mount_manager_unittest.cc", - "disk_unittest.cc", - "mount_point_unittest.cc", - "suspend_unmount_manager_unittest.cc", - ] -} diff --git a/chromium/ash/components/drivefs/BUILD.gn b/chromium/ash/components/drivefs/BUILD.gn deleted file mode 100644 index 2378eef971a..00000000000 --- a/chromium/ash/components/drivefs/BUILD.gn +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//chromeos/dbus/config/use_real_dbus_clients.gni") - -assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") - -component("drivefs") { - sources = [ - "drivefs_auth.cc", - "drivefs_auth.h", - "drivefs_bootstrap.cc", - "drivefs_bootstrap.h", - "drivefs_host.cc", - "drivefs_host.h", - "drivefs_host_observer.h", - "drivefs_http_client.cc", - "drivefs_http_client.h", - "drivefs_search.cc", - "drivefs_search.h", - "drivefs_session.cc", - "drivefs_session.h", - "drivefs_util.h", - ] - if (!use_real_dbus_clients) { - sources += [ - "fake_drivefs_launcher_client.cc", - "fake_drivefs_launcher_client.h", - ] - } - deps = [ - "//ash/components/disks", - "//ash/components/drivefs/mojom", - "//ash/constants", - "//base", - "//chromeos/ash/components/dbus", - "//chromeos/ash/components/dbus/cros_disks", - "//chromeos/components/mojo_bootstrap", - "//components/account_id", - "//components/drive", - "//components/signin/public/identity_manager", - "//dbus", - "//google_apis", - "//mojo/public/cpp/bindings", - "//mojo/public/cpp/platform", - "//net", - "//services/network/public/cpp:cpp", - ] - defines = [ "IS_DRIVEFS_IMPL" ] -} - -source_set("test_support") { - testonly = true - sources = [ - "fake_drivefs.cc", - "fake_drivefs.h", - ] - deps = [ - ":drivefs", - "//ash/components/drivefs/mojom", - "//base", - "//chromeos/ash/components/dbus:test_support", - "//chromeos/ash/components/dbus/cros_disks", - "//net", - "//testing/gmock", - ] -} - -source_set("unit_tests") { - testonly = true - sources = [ - "drivefs_auth_unittest.cc", - "drivefs_bootstrap_unittest.cc", - "drivefs_host_unittest.cc", - "drivefs_http_client_unittest.cc", - "drivefs_search_unittest.cc", - "drivefs_session_unittest.cc", - ] - - deps = [ - ":drivefs", - ":test_support", - "//ash/components/disks:test_support", - "//ash/components/drivefs/mojom", - "//base", - "//base/test:test_support", - "//chromeos/components/mojo_bootstrap", - "//components/account_id", - "//components/drive", - "//components/invalidation/impl:test_support", - "//components/signin/public/identity_manager", - "//components/signin/public/identity_manager:test_support", - "//mojo/public/cpp/bindings", - "//net", - "//net:test_support", - "//services/network:test_support", - "//services/network/public/cpp:cpp", - "//testing/gmock", - "//testing/gtest", - ] -} diff --git a/chromium/ash/components/drivefs/mojom/BUILD.gn b/chromium/ash/components/drivefs/mojom/BUILD.gn deleted file mode 100644 index e0028e44817..00000000000 --- a/chromium/ash/components/drivefs/mojom/BUILD.gn +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash) - -mojom_component("mojom") { - sources = [ - "drivefs.mojom", - "fake_drivefs_launcher.mojom", - ] - - public_deps = [ "//mojo/public/mojom/base" ] - - output_prefix = "drivefs_mojom" - macro_prefix = "DRIVEFS_MOJOM" - - cpp_typemaps = [ - { - types = [ - { - mojom = "drivefs.mojom.FileError" - cpp = "::drive::FileError" - }, - ] - traits_headers = [ "//ash/components/drivefs/drivefs_mojom_traits.h" ] - traits_sources = [ "//ash/components/drivefs/drivefs_mojom_traits.cc" ] - traits_public_deps = [ - "//base", - "//components/drive", - ] - }, - ] -} diff --git a/chromium/ash/components/drivefs/mojom/drivefs.mojom b/chromium/ash/components/drivefs/mojom/drivefs.mojom deleted file mode 100644 index 1c11e90f2f6..00000000000 --- a/chromium/ash/components/drivefs/mojom/drivefs.mojom +++ /dev/null @@ -1,695 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module drivefs.mojom; - -import "mojo/public/mojom/base/file_path.mojom"; -import "mojo/public/mojom/base/time.mojom"; - -// This file tracks apps/drive/fs/chromeos/mojom/drivefs.mojom. Changes -// should be made there first and then replicated here. - -// Implemented by DriveFS, used from Chrome. -interface DriveFsBootstrap { - // Initialize a DriveFS instance with its configuration and mojo connections - // to the browser. - Init(DriveFsConfiguration config, pending_receiver<DriveFs> drive_fs, - pending_remote<DriveFsDelegate> delegate); -}; - -// Implemented by DriveFS, used from Chrome. -interface DriveFs { - // Returns the metadata for |path|. - GetMetadata(mojo_base.mojom.FilePath path) => ( - FileError error, FileMetadata? metadata); - - // Sets the file at |path| to pinned or unpinned depending on the value of - // |pinned|. - SetPinned(mojo_base.mojom.FilePath path, bool pinned) => (FileError error); - - // Update DriveFS with the current network state, including whether the - // network is available and whether syncing should be paused. - UpdateNetworkState(bool pause_syncing, bool is_offline); - - // Reset DriveFS cache. - ResetCache() => (FileError error); - - // Returns a PNG containing a thumbnail for |path|. If |crop_to_square|, a - // 360x360 thumbnail, cropped to fit a square is returned; otherwise a - // thumbnail up to 500x500, maintaining aspect ration, is returned. If |path| - // does not exist or does not have a thumbnail, |thumbnail| will be null. - GetThumbnail(mojo_base.mojom.FilePath path, bool crop_to_square) => ( - array<uint8>? thumbnail); - - // Copy a file at |source| to |target|. If |source| refers to a directory, - // kNotAFile is returned. |target| is the path to the desired output of the - // copy; its parent must be an existing directory. - CopyFile(mojo_base.mojom.FilePath source, mojo_base.mojom.FilePath target) => - (FileError error); - - // Start a search query with given parameters. - StartSearchQuery(pending_receiver<SearchQuery> query, - QueryParameters query_params); - - // Fetches all changelogs, i.e. for My Drive and all Team Drives. - FetchAllChangeLogs(); - - // Fetches the changelog(s) using the provided |options|. - FetchChangeLog(array<FetchChangeLogOptions> options); - - // Send a native message |request| to DriveFS. |request| is a DriveFS - // specific message that looks like "native_opener/v2/$command_id/$message", - // where $command_id is an integer and $message is the base64 encoding of a - // JSPB encoded proto message. - // - // |response| is only filled out if |error| is kOk, and returns a JSPB - // encoded proto message. - SendNativeMessageRequest(string request) => ( - FileError error, string response); - - // Sets the arguments to be parsed by DriveFS on startup. Should only be - // called in developer mode. - SetStartupArguments(string arguments) => (bool success); - - // Gets the currently set arguments parsed by DriveFS on startup. Should only - // be called in developer mode. - GetStartupArguments() => (string arguments); - - // Enables or disables performance tracing, which logs to - // |data_dir_path|/Logs/drive_fs_trace. - SetTracingEnabled(bool enabled); - - // Enables or disables networking for testing. Should only be called in - // developer mode. - SetNetworkingEnabled(bool enabled); - - // Overrides syncing to be paused if enabled. Should only be called in - // developer mode. - ForcePauseSyncing(bool enable); - - // Dumps account settings (including feature flags) to - // |data_dir_path/account_settings. Should only be called in developer mode. - DumpAccountSettings(); - - // Loads account settings (including feature flags) from - // |data_dir_path/account_settings. Should only be called in developer mode. - LoadAccountSettings(); - - // Establish communication session between extension and DriveFS. - CreateNativeHostSession(ExtensionConnectionParams params, - pending_receiver<NativeMessagingHost> session, - pending_remote<NativeMessagingPort> port); - - // Find the files corresponding to Drive's item IDs provided. - // Paths returned are relative to the mount point. - LocateFilesByItemIds(array<string> item_ids) => ( - array<FilePathOrError>? response); - - // Returns the total and free space available in the user's Drive. - GetQuotaUsage() => (FileError error, QuotaUsage quota); - - // Toggle mirror sync capability. - ToggleMirroring(bool enabled) => (MirrorSyncStatus status); - - // Toggle syncing for supplied path. - ToggleSyncForPath(mojo_base.mojom.FilePath path, - MirrorPathStatus status) => (FileError error); - - // Retrieves a list of paths being synced. - GetSyncingPaths() => (FileError error, array<mojo_base.mojom.FilePath> paths); - - // Tells DriveFS to update its cached pin states of hosted files (once). - PollHostedFilePinStates(); - - // Returns the total and free space available in the user's Drive and their - // organization's, if they belong to one. - GetPooledQuotaUsage() => (FileError error, PooledQuotaUsage quota); -}; - -// Implemented by Chrome, used from DriveFS. -interface DriveFsDelegate { - // Get an access token for |client_id| and |app_id| with access to |scopes|. - // |access_token| is only valid if |status| is kSuccess. - GetAccessToken(string client_id, string app_id, array<string> scopes) => ( - AccessTokenStatus status, string access_token); - - // Invoked when the mount is ready for use. - OnMounted(); - - // Invoked if mounting has failed. If retry_delay is present the - // browser should try to mount again after the specified interval. - OnMountFailed(mojo_base.mojom.TimeDelta? retry_delay); - - // Invoked when the mount is going away. If retry_delay is present the - // browser should try to mount again after the specified interval. - OnUnmounted(mojo_base.mojom.TimeDelta? retry_delay); - - // Invoked when the syncing status changes. - OnSyncingStatusUpdate(SyncingStatus status); - - // Invoked when server-side file changes are received. - OnFilesChanged(array<FileChange> changes); - - // Invoked when a supported error occurs. - OnError(DriveError error); - - // Invoked with the list of team drive IDs. - OnTeamDrivesListReady(array<string> team_drive_ids); - - enum CreateOrDelete { - kCreated, - kDeleted, - }; - - // Invoked whenever a Team Drive root changes or gets deleted. - OnTeamDriveChanged(string team_drive_id, CreateOrDelete change_type); - - // Invoked from time to time to indicate that drivefs is operational. - OnHeartbeat(); - - [Extensible] - enum ExtensionConnectionStatus { - kSuccess, - kExtensionNotFound, - kFeatureNotEnabled, - }; - - // Initiates connection to the extension specified. - ConnectToExtension(ExtensionConnectionParams params, - pending_receiver<NativeMessagingPort> port, - pending_remote<NativeMessagingHost> host) => ( - ExtensionConnectionStatus error); - - // Invoked when Drive wants to display a confirmation dialog. - DisplayConfirmDialog(DialogReason reason) => (DialogResult result); - - // Executes the given request on Chrome's networking stack and - // calls the necessary callbacks on the |delegate|. - ExecuteHttpRequest( - HttpRequest request, pending_remote<HttpDelegate> delegate); - - // On startup, retrieve the machine ID to ensure Chromebook is reassociated - // with an existing Computers root based on `doc_id`. If no ID is available it - // will return an empty string. - GetMachineRootID() => (string doc_id); - - // Invoked when the machine ID is calculated to store in Chrome device prefs. - PersistMachineRootID(string doc_id); - - // Invoked when the syncing status changes for items that are being tracked by - // the mirror stack. - OnMirrorSyncingStatusUpdate(SyncingStatus status); -}; - -// Next MinVersion: 7 -struct DriveFsConfiguration { - string user_email; - - [MinVersion=1] - string? access_token; - - [MinVersion=2] - bool enable_metrics = false; - - // The directory name to use for lost and found within the user's My files - // directory. - [MinVersion=3] - string? lost_and_found_directory_name; - - [MinVersion=4] - bool enable_experimental_mirroring = false; - - [MinVersion=5] - bool enable_verbose_logging = false; - - // Whether the network service bridge is available. This is enabled on CrOS by - // the |drive-fs-chrome-networking| flag. - [MinVersion=6] - bool enable_cros_network = false; -}; - -enum AccessTokenStatus { - // Getting an access token succeeded. - kSuccess, - - // Getting an access token failed due to a transient error (e.g. network - // access is unavailable). - kTransientError, - - // Getting an access token failed due to an auth error. - kAuthError, -}; - -[Extensible] -enum MirrorSyncStatus { - // Successfully turned on mirror sync. - kSuccess, - // Failed to turn on mirror sync. - kFailure, - // The mirror sync feature is disabled by feature flag. - kFeatureNotEnabled, -}; - -[Extensible] -enum MirrorPathStatus { - // Start syncing a particular path. - kStart, - // Stop syncing a particular path. - kStop, -}; - -enum DialogResult { - // The dialog was not displayed to the user. - kNotDisplayed, - // The user accepted the action proposed by the dialog. - kAccept, - // The user rejected the action proposed by the dialog. - kReject, - // The user closed the dialog without selecting an option. - kDismiss, -}; - -enum FileError { - // These match the values of drive::FileError in - // //components/drive/file_errors.h - kOk = 0, - kFailed = -1, - kInUse = -2, - kExists = -3, - kNotFound = -4, - kAccessDenied = -5, - kTooManyOpened = -6, - kNoMemory = -7, - kNoServerSpace = -8, - kNotADirectory = -9, - kInvalidOperation = -10, - kSecurity = -11, - kAbort = -12, - kNotAFile = -13, - kNotEmpty = -14, - kInvalidUrl = -15, - kNoConnection = -16, - kNoLocalSpace = -17, - kServiceUnavailable = -18, -}; - -// Errors received from DriveFS to be forwarded to the file manager UI. -struct DriveError { - [Extensible] enum Type { - kCantUploadStorageFull, - kPinningFailedDiskFull, - kCantUploadStorageFullOrganization, - }; - - Type type; - - // The path to the file where an error was encountered, if there was one. - mojo_base.mojom.FilePath path; -}; - -struct DialogReason { - [Extensible] enum Type { - kEnableDocsOffline, - }; - - Type type; - - // The path to the file associated with this dialog, if there was one. - mojo_base.mojom.FilePath path; -}; - -// Next MinVersion: 6 -struct FileMetadata { - [Extensible] enum Type { - // A regular file. - kFile, - - // A hosted document (e.g. a gdoc). - kHosted, - - // A directory. - kDirectory, - }; - Type type; - - int64 size; - - string content_mime_type; - - string custom_icon_url; - - // A URL to open the file in the Drive website. - string alternate_url; - - // A URL to download the file. - string download_url; - - mojo_base.mojom.Time modification_time; - mojo_base.mojom.Time last_viewed_by_me_time; - - bool available_offline; - bool dirty; - bool pinned; - bool shared; - bool starred; - - // May be present if the file is an image. - ImageMetadata? image_metadata; - - // Never set. - array<uint8>? deprecated_thumbnail; - - Capabilities capabilities; - - [MinVersion=1] FolderFeature? folder_feature; - - // Only present in QuickAccess queries. - [MinVersion=2] QuickAccess? quick_access; - - // The unique device local ID used by DriveFS to refer to this file. - // Note: 0 is an invalid stable id. - [MinVersion=3] int64 stable_id = 0; - - [Extensible] enum CanPinStatus { - kOk, - kDisabled, - }; - - // Is it currently possible to pin this item. - [MinVersion=4] CanPinStatus can_pin; - - // Id of the associated Cello item. Useful for interacting with Drive API - // methods which require the server side file id, such as - // DriveAPIService::UpdateResource. - [MinVersion=5] string? item_id; -}; - -struct ImageMetadata { - // In pixels. - int32 height = 0; - int32 width = 0; - - // Rotation in clockwise degrees. - int32 rotation = 0; -}; - -// Drive capabilities: -struct Capabilities { - bool can_share = true; - bool can_copy = true; - bool can_delete = true; - bool can_rename = true; - bool can_add_children = true; -}; - -// Set on Drive Uploader roots and optionally on select sub-folders. -struct FolderFeature { - // Identifies a root directory of a machine sync, used for the backup and - // restore feature. - bool is_machine_root = false; - - // Identifies a sync folder. - bool is_arbitrary_sync_folder = false; - - // Identifies an external media folder, that contains one time only uploads - // for USB devices, SD cards etc. - bool is_external_media = false; -}; - -struct QuickAccess { - // A [0, 1] score with the probability that a user wants this document next. - double score; -}; - -// Reason why this event occurred. -// TODO(crbug.com/896777): Put this inside ItemEvent once the fix for the linked -// bug is in libchrome. -[Extensible] -enum ItemEventReason { - // Due to sync traffic from file transfers. - kTransfer, - // Due to the user pinning a file. - kPin, -}; - -// Next MinVersion: 2 -struct ItemEvent { - enum State { - kQueued, - kInProgress, - kCompleted, - kFailed, - }; - - // The stable ID used by DriveFS. - int64 stable_id; - - // A unique ID corresponding to a particular sync action. - int64 group_id; - - string path; - - State state; - - // The following are valid only if |state| is kInProgress or kQueued. -1 acts - // as the sentinel value for unset. - int64 bytes_transferred = -1; - int64 bytes_to_transfer = -1; - - [MinVersion=1] ItemEventReason reason = kTransfer; -}; - -struct SyncingStatus { - array<ItemEvent> item_events; -}; - -// A report of a server-side change to a file. -// Next MinVersion: 2 -struct FileChange { - mojo_base.mojom.FilePath path; - - enum Type { - kCreate, - kDelete, - kModify, - }; - - Type type; - - // The unique device local ID used by DriveFS to refer to this file. - // Note: 0 is an invalid stable id. - [MinVersion=1] int64 stable_id = 0; -}; - -// Definition of the search request sent to DriveFS. -// Next MinVersion: 3 -struct QueryParameters { - // Where this request should go to. - enum QuerySource { - kLocalOnly = 0, - kCloudOnly = 1, - }; - - // Which field should be used for sorting the results. - [Extensible] - enum SortField { - kNone = 0, - kLastModified = 1, - kLastViewedByMe = 2, - kFileSize = 3, - }; - - enum SortDirection { - kAscending = 0, - kDescending = 1, - }; - - // How many results to fetch per page. - int32 page_size = 100; - - // Which source should be queried. - QuerySource query_source = kCloudOnly; - - // Search for documents whose titles matches this string. - string? title; - - // Full-text search by content. Works only with |kCloudOnly|. - string? text_content; - - // Search for documents of this type. - string? mime_type; - - // Results must be only from shared with me documents. - bool shared_with_me = false; - - // Results must be only from available locally on the device. Works only - // with |kLocalOnly|. - bool available_offline = false; - - // How to sort the returned results. - SortField sort_field = kNone; - SortDirection sort_direction = kAscending; - - // The kind of query to perform. - [MinVersion=1] QueryKind query_kind = kRegular; - - // Search for documents whose mime types match any of the string in the array. - // Note: this field is preferred to "mime_type" field above, when processing - // the query, the "mime_type" will be merged into this "mime_types" field. - [MinVersion=2] array<string>? mime_types; -}; - -// TODO(crbug.com/896777): Put this inside QueryParameters once linked bug is -// fixed. -enum QueryKind { - // Regular search. - kRegular = 0, - - // QuickAccess query from the ItemSuggest API. Only page_size is used in a - // QuickAccess query. - kQuickAccess = 1, -}; - -// Represents a search request in progress. -interface SearchQuery { - // Performs query and if successful returns next portion of results. If there - // are no more results to fetch then |results| is empty array. - GetNextPage() => (FileError error, array<QueryItem>? results); -}; - -// Single entry in search response. -struct QueryItem { - FileMetadata metadata; - mojo_base.mojom.FilePath path; -}; - -struct FetchChangeLogOptions { - // Change ID for My Drive or Team Drive specified in a received push - // notification. - int64 change_id = -1; - - // ID of the Team Drive to fetch the changelog for. Set to an empty string to - // fetch the My Drive changelog instead. - string team_drive_id; -}; - -// Implemented in the browser and used from DriveFS. -// Roughly corresponds to a native messaging port to the extension and allows -// sending messages from the DriveFS process to the extension. -interface NativeMessagingPort { - // Send a native |message| to the extension. |message| is an - // opaque string in an extension-specific format. - PostMessageToExtension(string message); -}; - -// Implemented in DriveFS and used from the browser. -// Roughly corresponds to a native messaging host instance and allows -// processing of requests from the extension by the DriveFS process. -// It's up to the extension and the host to agree to message ordering. -interface NativeMessagingHost { - // Process |message| from the extension. |message| is an - // opaque string in an extension-specific format. - HandleMessageFromExtension(string message); -}; - -// Configuration of the connection between extension and DriveFS. -struct ExtensionConnectionParams { - string extension_id; -}; - -// A single file path resolution result. -union FilePathOrError { - FileError error; - mojo_base.mojom.FilePath path; -}; - -enum UserType { - // User doesn't belong to any organization. - kUnmanaged, - // User is a member of an organization. - kOrganization, -}; - -// Free and total space available in Drive relative to both the user and their -// organization, if they belong to one. -struct PooledQuotaUsage { - UserType user_type; - - // How much space the individual user has used. - int64 used_user_bytes; - // The individual limit of a user. -1 means infinite. - int64 total_user_bytes = -1; - - // The following two fields only have meaning if user_type is kOrganization. - // Whether the organization has exceeded its storage limit. - bool organization_limit_exceeded = false; - // Name of the organization the user belongs to. - string organization_name; -}; - -// Free and total space available in Drive. -struct QuotaUsage { - uint64 free_cloud_bytes; - uint64 total_cloud_bytes; -}; - -// Matches errors from //net/base/net_error_list.h -enum NetError { - kOk = 0, - kIOPending = -1, - kFailed = -2, - kAborted = -3, - kInvalidArgument = -4, - kInvalidHandle = -5, - kFileNotFound = -6, - kTimedOut = -7, - kNameNotResolved = -105, - kInternetDisconnected = -106, - kAddressUnreachable = -109, -}; - -struct HttpHeader { - string key; - string value; -}; - -struct HttpRequest { - string method; - string url; - array<HttpHeader> headers; - int64 request_body_bytes; -}; - -struct HttpResponse { - int32 response_code; - array<HttpHeader> headers; -}; - -struct HttpCompletionStatus { - NetError error; - int64 response_body_bytes; -}; - -// This interface is backed by a |cello:HttpDelegate| on the DriveFS side and is -// called from a |URLLoaderClient| on the Chrome side. -interface HttpDelegate { - // Fetches a pipe that will provide the request body. - // This method should only be called once. - GetRequestBody(handle<data_pipe_producer> request_body); - - // Called once when the response code and headers have been received. - // See |URLLoaderClient::OnReceiveResponse| - OnReceiveResponse(HttpResponse response); - - // Called once after |OnReceiveResponse| when the body has been received. - // Provides a pipe for the response body to be read from. - // See |URLLoaderClient::OnStartLoadingResponseBody' - OnReceiveBody(handle<data_pipe_consumer> response_body); - - // Called once after the URLLoader is done. - // NOTE: There may still be data remaining in the data pipe, so destruction - // should be deferred until all data is read. - // See |URLLoaderClient::OnComplete| - OnRequestComplete(HttpCompletionStatus status); -}; diff --git a/chromium/ash/components/drivefs/mojom/fake_drivefs_launcher.mojom b/chromium/ash/components/drivefs/mojom/fake_drivefs_launcher.mojom deleted file mode 100644 index ec7bc74028a..00000000000 --- a/chromium/ash/components/drivefs/mojom/fake_drivefs_launcher.mojom +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module drivefs.mojom; - -import "mojo/public/mojom/base/file_path.mojom"; - -// This file tracks apps/drive/fs/chromeos/mojom/fake_drivefs_launcher.mojom. -// Changes should be made there first and then replicated here. - -interface FakeDriveFsLauncher { - // Launch a DriveFS, using |datadir_path| for its data, mounting at - // |mount_path|, using |mojo_socket_handle| to communicate with chrome. - LaunchDriveFs(mojo_base.mojom.FilePath datadir_path, - mojo_base.mojom.FilePath mount_path, - handle mojo_socket_handle); -}; diff --git a/chromium/ash/components/enhanced_network_tts/mojom/BUILD.gn b/chromium/ash/components/enhanced_network_tts/mojom/BUILD.gn deleted file mode 100644 index a45778b5728..00000000000 --- a/chromium/ash/components/enhanced_network_tts/mojom/BUILD.gn +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash) - -mojom("mojom") { - sources = [ "enhanced_network_tts.mojom" ] - - deps = [ "//mojo/public/mojom/base" ] -} diff --git a/chromium/ash/components/enhanced_network_tts/mojom/enhanced_network_tts.mojom b/chromium/ash/components/enhanced_network_tts/mojom/enhanced_network_tts.mojom deleted file mode 100644 index c6aeed560e1..00000000000 --- a/chromium/ash/components/enhanced_network_tts/mojom/enhanced_network_tts.mojom +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module ash.enhanced_network_tts.mojom; - -const uint16 kEnhancedNetworkTtsMaxCharacterSize = 1000; - -// The ways in which a Text-to-Speech request can fail. -enum TtsRequestError { - // The utterance is empty. - kEmptyUtterance, - // The utterance is over the length limit. - kOverLength, - // The server is down and we did not receive a valid server response. - kServerError, - // The received data is not in the expected format. - kReceivedUnexpectedData, - // The request is overridden by a later request. - kRequestOverride, -}; - -// A request for fetching Text-to-Speech data. -struct TtsRequest { - // The utterance to speak. The length of the utterance should be less than - // |kEnhancedNetworkTtsMaxCharacterSize|, and the utterance should not be - // empty. - string utterance; - - // The speech rate scale factor with 1.0 being unmodified rate. Supported - // values are between 0.3 and 4.0, in steps of 0.1. - float rate; - - // The specific voice to use. Optional. - string? voice; - - // Language to use for speech synthesis. The voice and lang should be - // specified together to be valid (e.g., voice "aua-wavenet" with lang "en" - // for Australian English). Optional. - string? lang; -}; - -// The timing information for each word in the fetched Text-to-Speech data. -struct TimingInfo { - // The text of the word. - string text; - - // The character offset to the start of the utterance in the |TtsRequest|. - uint32 text_offset; - - // The time when the playback of the utterance reaches the word. - string time_offset; - - // The audio duration of the word. - string duration; -}; - -// The Text-to-Speech data fetched from Google's ReadAloud Text-to-Speech -// server. An |AudioDataObserver| may receive several TtsData for a single -// |TtsRequest| that contains a long utterance. -struct TtsData { - // The audio data representing the synthesized speech. The audio data is - // encoded as mp3 with a sample rate of 44.1kHz. - array<uint8> audio; - - // The timing information for each word in the audio data. - array<TimingInfo> time_info; - - // Whether this is the last |TtsData| for the input |TtsRequest|. - bool last_data; -}; - -// The response to a |TtsRequest|. -union TtsResponse { - TtsRequestError error_code; - - TtsData data; -}; - -// The interface to fetch enhanced voices generated from Google text-to-speak -// servers. The remote is a JS extension (i.e., Enhanced Network Tts -// Extension), and the receiver is implemented in c/b/a/enhanced_network_tts. -// The JS extension acts as a Text-to-speech engine, and is currently used by -// Select-to-speak only. When a Select-to-speak user selects text to speak -// with Enhanced Network Tts voices, the text will be sent to chrome.tts.speak. -// The JS extension receives the text by listening to -// chrome.ttsEngine.onSpeakWithAudioStream. Then, the extension uses this mojom -// interface to fetch synthesized audio data. The text from Select-to-speak is -// limited to 32768 chars, and the JS extension wraps the text along with other -// TTS options into a |TtsRequest|. -interface EnhancedNetworkTts { - // The method to fetch the audio data generated by a Google network-based - // API. When a |request| contains a long utterance, the receiver chops the - // utterance into several smaller text pieces, which will be sent to Google - // servers one by one. For each received response from Google servers, the - // receiver sends a |TtsResponse| to |observer|. The next text piece will - // only be sent out when we have finished downloading and processing the - // response from prior one. Closing the message pipe for the |observer| will - // cancel the |TtsRequest|. - // TODO(crbug.com/1240278): Use mojo data pipe for data communication. - GetAudioData(TtsRequest request) - => (pending_receiver<AudioDataObserver> observer); -}; - -// The interface to process the |TtsResponse| generated by |EnhancedNetworkTts|. -interface AudioDataObserver { - // The method to process the |TtsResponse|. - OnAudioDataReceived(TtsResponse response); -}; diff --git a/chromium/ash/components/fwupd/BUILD.gn b/chromium/ash/components/fwupd/BUILD.gn index 87428820cf5..0df5037aacc 100644 --- a/chromium/ash/components/fwupd/BUILD.gn +++ b/chromium/ash/components/fwupd/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/geolocation/BUILD.gn b/chromium/ash/components/geolocation/BUILD.gn deleted file mode 100644 index 0248c8a71c0..00000000000 --- a/chromium/ash/components/geolocation/BUILD.gn +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//testing/test.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("geolocation") { - defines = [ "IS_ASH_GEOLOCATION_IMPL" ] - deps = [ - "//base", - "//chromeos/ash/components/network", - "//google_apis", - "//net", - "//services/network/public/cpp", - ] - sources = [ - "geoposition.cc", - "geoposition.h", - "simple_geolocation_provider.cc", - "simple_geolocation_provider.h", - "simple_geolocation_request.cc", - "simple_geolocation_request.h", - "simple_geolocation_request_test_monitor.cc", - "simple_geolocation_request_test_monitor.h", - ] -} - -source_set("unit_tests") { - testonly = true - deps = [ - ":geolocation", - "//base", - "//base/test:test_support", - "//chromeos/ash/components/dbus/shill", - "//chromeos/ash/components/network:test_support", - "//net", - "//services/network:test_support", - "//services/network/public/cpp", - "//testing/gtest", - ] - sources = [ "simple_geolocation_unittest.cc" ] -} diff --git a/chromium/ash/components/hid_detection/BUILD.gn b/chromium/ash/components/hid_detection/BUILD.gn deleted file mode 100644 index 53425cfdd26..00000000000 --- a/chromium/ash/components/hid_detection/BUILD.gn +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash) - -static_library("hid_detection") { - sources = [ - "bluetooth_hid_detector.cc", - "bluetooth_hid_detector.h", - "bluetooth_hid_detector_impl.cc", - "bluetooth_hid_detector_impl.h", - "hid_detection_manager.cc", - "hid_detection_manager.h", - "hid_detection_manager_impl.cc", - "hid_detection_manager_impl.h", - "hid_detection_utils.cc", - "hid_detection_utils.h", - ] - - deps = [ - "//ash/constants:constants", - "//ash/public/cpp", - "//base", - "//chromeos/services/bluetooth_config/public/mojom", - "//components/device_event_log", - "//device/bluetooth", - "//mojo/public/cpp/bindings", - "//services/device/public/mojom", - "//services/device/public/mojom:device_service", - ] -} - -static_library("test_support") { - testonly = true - - sources = [ - "fake_bluetooth_hid_detector.cc", - "fake_bluetooth_hid_detector.h", - "fake_hid_detection_manager.cc", - "fake_hid_detection_manager.h", - ] - - deps = [ - ":hid_detection", - "//base", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "bluetooth_hid_detector_impl_unittest.cc", - "hid_detection_manager_impl_unittest.cc", - ] - - deps = [ - ":hid_detection", - ":test_support", - "//ash/constants", - "//base", - "//base/test:test_support", - "//chromeos/services/bluetooth_config", - "//chromeos/services/bluetooth_config:test_support", - "//chromeos/services/bluetooth_config/public/mojom", - "//device/bluetooth:mocks", - "//mojo/public/cpp/bindings", - "//services/device/public/cpp/hid:hid", - "//testing/gmock", - "//testing/gtest", - ] -} diff --git a/chromium/ash/components/login/auth/BUILD.gn b/chromium/ash/components/login/auth/BUILD.gn deleted file mode 100644 index c11bf8cd0a7..00000000000 --- a/chromium/ash/components/login/auth/BUILD.gn +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//testing/test.gni") -import("//third_party/protobuf/proto_library.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("auth") { - defines = [ "IS_ASH_LOGIN_AUTH_IMPL" ] - public_deps = [ - "//ash/components/login/auth/public:authpublic", - "//ash/components/login/auth/public:challenge_response_key", - ] - deps = [ - "//ash/components/login/hibernate:hibernate_manager", - "//ash/constants", - "//base", - "//base:i18n", - "//chromeos/ash/components/cryptohome", - "//chromeos/ash/components/dbus/authpolicy", - "//chromeos/ash/components/dbus/authpolicy:authpolicy_proto", - "//chromeos/ash/components/dbus/cryptohome", - "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", - "//chromeos/ash/components/dbus/session_manager", - "//chromeos/ash/components/dbus/userdataauth", - "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", - "//chromeos/dbus/constants", - "//chromeos/login/login_state", - "//chromeos/metrics", - "//components/account_id", - "//components/device_event_log", - "//components/metrics", - "//components/password_manager/core/browser:password_hash_data", - "//components/prefs", - "//components/user_manager", - "//crypto", - "//google_apis", - "//net", - "//skia", - "//third_party/protobuf:protobuf_lite", - "//url", - ] - sources = [ - "auth_attempt_state.cc", - "auth_attempt_state.h", - "auth_factor_editor.cc", - "auth_factor_editor.h", - "auth_performer.cc", - "auth_performer.h", - "auth_session_authenticator.cc", - "auth_session_authenticator.h", - "auth_status_consumer.cc", - "auth_status_consumer.h", - "authenticator.cc", - "authenticator.h", - "challenge_response/cert_utils.cc", - "challenge_response/cert_utils.h", - "challenge_response/key_label_utils.cc", - "challenge_response/key_label_utils.h", - "challenge_response/known_user_pref_utils.cc", - "challenge_response/known_user_pref_utils.h", - "cryptohome_authenticator.cc", - "cryptohome_authenticator.h", - "cryptohome_parameter_utils.cc", - "cryptohome_parameter_utils.h", - "extended_authenticator.cc", - "extended_authenticator.h", - "extended_authenticator_impl.cc", - "extended_authenticator_impl.h", - "login_performer.cc", - "login_performer.h", - "metrics_recorder.cc", - "metrics_recorder.h", - "mount_performer.cc", - "mount_performer.h", - "password_visibility_utils.cc", - "password_visibility_utils.h", - "safe_mode_delegate.h", - "stub_authenticator.cc", - "stub_authenticator.h", - "stub_authenticator_builder.cc", - "stub_authenticator_builder.h", - "test_attempt_state.cc", - "test_attempt_state.h", - ] -} - -source_set("test_support") { - testonly = true - deps = [ - ":auth", - "//base", - "//chromeos/ash/components/dbus/userdataauth", - "//chromeos/login/login_state", - "//components/account_id", - "//google_apis", - "//net", - "//net:test_support", - "//testing/gmock", - "//testing/gtest", - ] - sources = [ - "fake_extended_authenticator.cc", - "fake_extended_authenticator.h", - "mock_auth_performer.cc", - "mock_auth_performer.h", - "mock_auth_status_consumer.cc", - "mock_auth_status_consumer.h", - "mock_safe_mode_delegate.cc", - "mock_safe_mode_delegate.h", - ] -} - -source_set("unit_tests") { - configs += [ "//build/config/linux/dbus" ] - testonly = true - deps = [ - ":auth", - ":test_support", - "//ash/components/login/auth", - "//base", - "//base:i18n", - "//chromeos/ash/components/cryptohome", - "//chromeos/ash/components/dbus/authpolicy", - "//chromeos/ash/components/dbus/authpolicy:authpolicy_proto", - "//chromeos/ash/components/dbus/cryptohome", - "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", - "//chromeos/ash/components/dbus/userdataauth", - "//chromeos/ash/components/dbus/userdataauth:test_support", - "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", - "//components/account_id", - "//components/password_manager/core/browser:password_hash_data", - "//components/prefs", - "//components/prefs:test_support", - "//components/user_manager", - "//net", - "//net:test_support", - "//testing/gmock", - "//testing/gtest", - "//third_party/abseil-cpp:absl", - "//third_party/icu", - ] - sources = [ - "auth_performer_unittest.cc", - "auth_session_authenticator_unittest.cc", - "challenge_response/cert_utils_unittest.cc", - "public/auth_factors_data_unittest.cc", - "public/key_unittest.cc", - "public/operation_chain_runner_unittest.cc", - "public/saml_password_attributes_unittest.cc", - "public/sync_trusted_vault_keys_unittest.cc", - ] -} diff --git a/chromium/ash/components/login/auth/public/BUILD.gn b/chromium/ash/components/login/auth/public/BUILD.gn deleted file mode 100644 index b52aa4924ad..00000000000 --- a/chromium/ash/components/login/auth/public/BUILD.gn +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("authpublic") { - defines = [ "IS_ASH_LOGIN_AUTH_IMPL" ] - public_deps = [ - ":challenge_response_key", - "//components/password_manager/core/browser:password_hash_data", - ] - deps = [ - "//ash/constants", - "//base", - "//chromeos/ash/components/cryptohome", - "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", - "//components/account_id", - "//components/prefs", - "//components/user_manager", - "//crypto", - "//google_apis", - "//net", - "//third_party/abseil-cpp:absl", - ] - sources = [ - "auth_callbacks.h", - "auth_factors_data.cc", - "auth_factors_data.h", - "auth_failure.cc", - "auth_failure.h", - "auth_session_status.h", - "cryptohome_error.cc", - "cryptohome_error.h", - "cryptohome_key_constants.cc", - "cryptohome_key_constants.h", - "key.cc", - "key.h", - "operation_chain_runner.cc", - "operation_chain_runner.h", - "saml_password_attributes.cc", - "saml_password_attributes.h", - "sync_trusted_vault_keys.cc", - "sync_trusted_vault_keys.h", - "user_context.cc", - "user_context.h", - ] -} - -# Separate target to break cyclic dependency with -# //chromeos/ash/components/cryptohome. -component("challenge_response_key") { - defines = [ "IS_ASH_LOGIN_AUTH_IMPL" ] - deps = [ "//base" ] - sources = [ - "challenge_response_key.cc", - "challenge_response_key.h", - ] -} diff --git a/chromium/ash/components/login/hibernate/BUILD.gn b/chromium/ash/components/login/hibernate/BUILD.gn deleted file mode 100644 index dd3c19a98c2..00000000000 --- a/chromium/ash/components/login/hibernate/BUILD.gn +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//chromeos/ash/components/hibernate/buildflags.gni") -import("//testing/test.gni") -import("//third_party/protobuf/proto_library.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("hibernate_manager") { - defines = [ "IS_ASH_LOGIN_HIBERNATE_IMPL" ] - public_deps = [ "//ash/components/login/auth/public:authpublic" ] - deps = [ - "//base", - "//chromeos/ash/components/cryptohome", - "//chromeos/ash/components/hibernate:buildflags", - ] - sources = [ - "hibernate_manager.cc", - "hibernate_manager.h", - ] - - if (enable_hibernate) { - deps += [ "//chromeos/ash/components/dbus/hiberman" ] - } -} - -source_set("unit_tests") { - configs += [ "//build/config/linux/dbus" ] - testonly = true - deps = [ - ":hibernate_manager", - "//base", - "//chromeos/ash/components/dbus/hiberman", - "//testing/gtest", - ] - sources = [ "hibernate_manager_unittest.cc" ] -} diff --git a/chromium/ash/components/login/session/BUILD.gn b/chromium/ash/components/login/session/BUILD.gn deleted file mode 100644 index 5c5ba0bea23..00000000000 --- a/chromium/ash/components/login/session/BUILD.gn +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//testing/test.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("session") { - defines = [ "IS_ASH_LOGIN_SESSION_IMPL" ] - deps = [ - "//base", - "//chromeos/ash/components/dbus/cryptohome", - "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", - "//chromeos/ash/components/dbus/session_manager", - "//chromeos/ash/components/dbus/userdataauth", - "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", - "//chromeos/dbus/power:power", - "//third_party/protobuf:protobuf_lite", - ] - sources = [ - "session_termination_manager.cc", - "session_termination_manager.h", - ] -} - -source_set("unit_tests") { - testonly = true - deps = [ - "//ash/components/login/session:session", - "//base", - "//chromeos/ash/components/dbus/cryptohome", - "//chromeos/ash/components/dbus/session_manager", - "//chromeos/ash/components/dbus/userdataauth", - "//chromeos/dbus/power:power", - "//testing/gtest", - ] - sources = [ "session_termination_manager_unittest.cc" ] -} diff --git a/chromium/ash/components/multidevice/BUILD.gn b/chromium/ash/components/multidevice/BUILD.gn deleted file mode 100644 index 61bc7dd89af..00000000000 --- a/chromium/ash/components/multidevice/BUILD.gn +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash) - -static_library("multidevice") { - sources = [ - "beacon_seed.cc", - "beacon_seed.h", - "expiring_remote_device_cache.cc", - "expiring_remote_device_cache.h", - "remote_device.cc", - "remote_device.h", - "remote_device_cache.cc", - "remote_device_cache.h", - "remote_device_ref.cc", - "remote_device_ref.h", - "secure_message_delegate.cc", - "secure_message_delegate.h", - "secure_message_delegate_impl.cc", - "secure_message_delegate_impl.h", - "software_feature.cc", - "software_feature.h", - "software_feature_state.cc", - "software_feature_state.h", - ] - - deps = [ - "//ash/components/multidevice/logging", - "//ash/services/device_sync/proto:util", - "//base", - "//base:i18n", - "//chromeos/ash/components/dbus", - "//chromeos/ash/components/dbus/easy_unlock", - "//components/prefs", - ] - - public_deps = [ - "//ash/services/device_sync/proto", - "//base", - "//third_party/securemessage/proto", - ] -} - -static_library("stub_multidevice_util") { - sources = [ - "stub_multidevice_util.cc", - "stub_multidevice_util.h", - ] - - deps = [ - ":multidevice", - "//ash/constants", - "//ash/services/device_sync/proto", - "//base", - ] -} - -static_library("test_support") { - testonly = true - - sources = [ - "fake_secure_message_delegate.cc", - "fake_secure_message_delegate.h", - "remote_device_test_util.cc", - "remote_device_test_util.h", - ] - - public_deps = [ ":multidevice" ] - - deps = [ - "//ash/services/device_sync/proto", - "//base", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "expiring_remote_device_cache_unittest.cc", - "fake_secure_message_delegate_unittest.cc", - "remote_device_cache_unittest.cc", - "remote_device_ref_unittest.cc", - ] - - deps = [ - ":multidevice", - ":test_support", - "//ash/components/multidevice/logging:unit_tests", - "//ash/components/multidevice/mojom:unit_tests", - "//ash/services/device_sync/proto", - "//base/test:test_support", - "//testing/gtest", - ] -} diff --git a/chromium/ash/components/multidevice/logging/BUILD.gn b/chromium/ash/components/multidevice/logging/BUILD.gn deleted file mode 100644 index 218e7572702..00000000000 --- a/chromium/ash/components/multidevice/logging/BUILD.gn +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash) - -static_library("logging") { - sources = [ - "log_buffer.cc", - "log_buffer.h", - "logging.cc", - "logging.h", - ] - - deps = [ "//base" ] -} - -source_set("unit_tests") { - testonly = true - sources = [ "logging_unittest.cc" ] - - deps = [ - ":logging", - "//base/test:test_support", - "//testing/gtest", - ] -} diff --git a/chromium/ash/components/multidevice/mojom/BUILD.gn b/chromium/ash/components/multidevice/mojom/BUILD.gn deleted file mode 100644 index 4cf33c7d58f..00000000000 --- a/chromium/ash/components/multidevice/mojom/BUILD.gn +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash) - -mojom("mojom") { - sources = [ "multidevice_types.mojom" ] - public_deps = [ "//mojo/public/mojom/base" ] - cpp_typemaps = [ - { - types = [ - { - mojom = "ash.multidevice.mojom.BeaconSeed" - cpp = "::ash::multidevice::BeaconSeed" - }, - { - mojom = "ash.multidevice.mojom.RemoteDevice" - cpp = "::ash::multidevice::RemoteDevice" - }, - { - mojom = "ash.multidevice.mojom.SoftwareFeature" - cpp = "::ash::multidevice::SoftwareFeature" - }, - ] - traits_headers = [ "multidevice_mojom_traits.h" ] - traits_sources = [ "multidevice_mojom_traits.cc" ] - traits_public_deps = [ - "//ash/components/multidevice", - "//base", - ] - traits_deps = [ - "//ash/components/multidevice/logging", - "//ash/services/device_sync/proto", - "//device/bluetooth/public/cpp", - ] - }, - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ "multidevice_mojom_traits_unittest.cc" ] - - deps = [ - ":mojom", - "//ash/components/multidevice", - "//base", - "//base/test:test_support", - "//mojo/public/cpp/test_support:test_utils", - "//testing/gtest", - ] -} diff --git a/chromium/ash/components/multidevice/mojom/multidevice_types.mojom b/chromium/ash/components/multidevice/mojom/multidevice_types.mojom deleted file mode 100644 index d430df75478..00000000000 --- a/chromium/ash/components/multidevice/mojom/multidevice_types.mojom +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module ash.multidevice.mojom; - -import "mojo/public/mojom/base/time.mojom"; - -// Enumeration of software features which can be enabled/disabled for a given -// device. Each feature has a host and client portion; here, "host" refers to -// the associated phone which provides the feature (at most one host per -// account), and "client" refers to the Chromebook which consumes the feature -// (multiple clients allowed per account). -enum SoftwareFeature { - // The Better Together (MultiDevice) setup flow feature allows users to go - // through a unified setup flow which enrolls the device for all multi-device - // features. - BETTER_TOGETHER_HOST = 1, - BETTER_TOGETHER_CLIENT = 2, - - // EasyUnlock gives users the ability to unlock their Chromebooks with their - // phone instead of by typing a password. - EASY_UNLOCK_HOST = 3, - EASY_UNLOCK_CLIENT = 4, - - // Magic Tether (Instant Tethering) gives users the ability to use their - // phone's Internet connectivity on their Chromebooks via an automated flow - // which does not require any phone-side interaction. - MAGIC_TETHER_HOST = 5, - MAGIC_TETHER_CLIENT = 6, - - // SMS Connect gives users the ability to read and reply to their text - // messages from their Chromebooks. - SMS_CONNECT_HOST = 7, - SMS_CONNECT_CLIENT = 8, - - // Phone Hub allows users to view phone metadata and send commands to their - // phone directly from the Chrome OS UI. - PHONE_HUB_HOST = 9, - PHONE_HUB_CLIENT = 10, - - // Wifi Sync with Android allows users to sync wifi network configurations - // between Chrome OS devices and a connected Android phone - WIFI_SYNC_HOST = 11, - WIFI_SYNC_CLIENT = 12, - - // Eche - ECHE_HOST = 13, - ECHE_CLIENT = 14, - - // Camera Roll allows users to view and download recent photos and videos from - // the Phone Hub tray - PHONE_HUB_CAMERA_ROLL_HOST = 15, - PHONE_HUB_CAMERA_ROLL_CLIENT = 16 -}; - -// Enumeration of what value a SoftwareFeature can be. -enum SoftwareFeatureState { - kNotSupported, - kSupported, - kEnabled -}; - -// Used to generate rotating BLE advertisement data, which is necessary to -// establish a BLE communication channel between two devices. To -// create the BLE channel, both devices must possess the other's BeaconSeeds. -struct BeaconSeed { - string data; - mojo_base.mojom.Time start_time; - mojo_base.mojom.Time end_time; -}; - -// Metadata describing a remote device with which the current device can -// communicate. -struct RemoteDevice { - // Unique identifier of the device. This field is guaranteed to be - // human-readable (i.e., it does not contain non-ASCII characters). - string device_id; - - // Email for the user to whom this device is registered. - string user_email; - - // The immutable FCM Instance ID assigned to the device. Used as the primary - // identifier for devices using CryptAuth v2 Enrollment and DeviceSync. - string instance_id; - - // Human-readable device name; by default, this is the name of the device - // model, but this value is editable. - string device_name; - - // A device model name that's guaranteed not to contain any PII. - string pii_free_device_name; - - // Encryption key used for communication with this device. - string persistent_symmetric_key; - - // The time at which this device's metadata was last updated on the CryptAuth - // back-end. - mojo_base.mojom.Time last_update_time; - - // The features which this device either does not support, supports, or has - // enabled. - map<SoftwareFeature, SoftwareFeatureState> software_features; - - // Seeds belonging to the device. Each seed has start and end timestamps which - // indicate how long the seed is valid, and each device has enough associated - // seeds to keep the device connectable for over 30 days. If no new device - // metadata synced for over 30 days, it is possible that a connection will not - // be able to be established over BLE. - array<BeaconSeed> beacon_seeds; - - // Bluetooth public address, formatted as a hex string with colons and capital - // letters (example: "01:23:45:67:89:AB"). If the device does not have a - // synced address, this field is empty. - string bluetooth_public_address; -}; diff --git a/chromium/ash/components/peripheral_notification/BUILD.gn b/chromium/ash/components/peripheral_notification/BUILD.gn index 96f551dd25a..3acdcab4d10 100644 --- a/chromium/ash/components/peripheral_notification/BUILD.gn +++ b/chromium/ash/components/peripheral_notification/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/phonehub/BUILD.gn b/chromium/ash/components/phonehub/BUILD.gn index 8e4dcb1a969..63890bf4fc2 100644 --- a/chromium/ash/components/phonehub/BUILD.gn +++ b/chromium/ash/components/phonehub/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -37,6 +37,8 @@ static_library("phonehub") { "do_not_disturb_controller.h", "do_not_disturb_controller_impl.cc", "do_not_disturb_controller_impl.h", + "feature_setup_connection_operation.cc", + "feature_setup_connection_operation.h", "feature_setup_response_processor.cc", "feature_setup_response_processor.h", "feature_status.cc", @@ -125,8 +127,6 @@ static_library("phonehub") { ] deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/components/phonehub/proto", "//ash/constants", "//ash/resources/vector_icons", @@ -137,6 +137,8 @@ static_library("phonehub") { "//ash/services/secure_channel/public/mojom", "//ash/webui/eche_app_ui:eche_app_ui_pref", "//base", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", "//chromeos/dbus/power", "//chromeos/services/network_config", "//chromeos/services/network_config:in_process_instance", @@ -191,11 +193,11 @@ static_library("debug") { public_deps = [ ":phonehub" ] deps = [ - "//ash/components/multidevice/logging", "//ash/components/phonehub/proto", "//ash/constants", "//ash/services/multidevice_setup/public/mojom", "//base", + "//chromeos/ash/components/multidevice/logging", ] } @@ -267,8 +269,6 @@ source_set("unit_tests") { ":debug", ":phonehub", ":test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", "//ash/components/phonehub/proto", "//ash/constants", "//ash/services/device_sync/public/cpp", @@ -281,6 +281,8 @@ source_set("unit_tests") { "//ash/webui/eche_app_ui:eche_app_ui_pref", "//base", "//base/test:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice:test_support", "//chromeos/ash/components/network", "//chromeos/ash/components/network:test_support", "//chromeos/dbus/power", diff --git a/chromium/ash/components/phonehub/proto/BUILD.gn b/chromium/ash/components/phonehub/proto/BUILD.gn index 4b16d4ab424..75e3eb9a3ab 100644 --- a/chromium/ash/components/phonehub/proto/BUILD.gn +++ b/chromium/ash/components/phonehub/proto/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/components/policy/BUILD.gn b/chromium/ash/components/policy/BUILD.gn deleted file mode 100644 index 06715caa44b..00000000000 --- a/chromium/ash/components/policy/BUILD.gn +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("policy") { - output_name = "ash_policy" # Avoid conflict with //sandbox/policy - defines = [ "IS_ASH_POLICY_IMPL" ] - - public_deps = [ - "//components/policy/proto", - "//third_party/abseil-cpp:absl", - ] - deps = [ - "//base", - "//base:i18n", - "//third_party/icu", - ] - sources = [ - "weekly_time/time_utils.cc", - "weekly_time/time_utils.h", - "weekly_time/weekly_time.cc", - "weekly_time/weekly_time.h", - "weekly_time/weekly_time_interval.cc", - "weekly_time/weekly_time_interval.h", - ] -} - -source_set("unit_tests") { - testonly = true - deps = [ - ":policy", - "//base", - "//base:i18n", - "//base/test:test_support", - "//components/policy/proto", - "//testing/gtest", - "//third_party/icu", - ] - sources = [ - "weekly_time/time_utils_unittest.cc", - "weekly_time/weekly_time_interval_unittest.cc", - "weekly_time/weekly_time_unittest.cc", - ] -} diff --git a/chromium/ash/components/power/BUILD.gn b/chromium/ash/components/power/BUILD.gn deleted file mode 100644 index 3e18091ecc4..00000000000 --- a/chromium/ash/components/power/BUILD.gn +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") - -component("power") { - output_name = "ash_power" - defines = [ "IS_ASH_POWER_IMPL" ] - deps = [ - "//base", - "//chromeos/dbus/power", - "//services/device/public/mojom", - ] - - sources = [ - "dark_resume_controller.cc", - "dark_resume_controller.h", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ "dark_resume_controller_unittest.cc" ] - - deps = [ - ":power", - "//base/test:test_support", - "//chromeos/dbus/power", - "//services/device/public/cpp:test_support", - "//services/device/public/mojom", - "//testing/gtest", - ] -} diff --git a/chromium/ash/components/proximity_auth/BUILD.gn b/chromium/ash/components/proximity_auth/BUILD.gn deleted file mode 100644 index 48a6bf37626..00000000000 --- a/chromium/ash/components/proximity_auth/BUILD.gn +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//testing/test.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -static_library("proximity_auth") { - sources = [ - "messenger.h", - "messenger_impl.cc", - "messenger_impl.h", - "messenger_observer.h", - "metrics.cc", - "metrics.h", - "proximity_auth_client.h", - "proximity_auth_local_state_pref_manager.cc", - "proximity_auth_local_state_pref_manager.h", - "proximity_auth_pref_manager.h", - "proximity_auth_pref_names.cc", - "proximity_auth_pref_names.h", - "proximity_auth_profile_pref_manager.cc", - "proximity_auth_profile_pref_manager.h", - "proximity_auth_system.cc", - "proximity_auth_system.h", - "proximity_monitor.cc", - "proximity_monitor.h", - "proximity_monitor_impl.cc", - "proximity_monitor_impl.h", - "proximity_monitor_observer.h", - "remote_device_life_cycle.cc", - "remote_device_life_cycle.h", - "remote_device_life_cycle_impl.cc", - "remote_device_life_cycle_impl.h", - "remote_status_update.cc", - "remote_status_update.h", - "screenlock_bridge.cc", - "screenlock_bridge.h", - "smart_lock_metrics_recorder.cc", - "smart_lock_metrics_recorder.h", - "unlock_manager.h", - "unlock_manager_impl.cc", - "unlock_manager_impl.h", - ] - - deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", - "//ash/components/proximity_auth/public/mojom", - "//ash/constants", - "//ash/public/cpp", - "//ash/services/multidevice_setup/public/cpp", - "//ash/services/multidevice_setup/public/cpp:prefs", - "//ash/services/secure_channel/public/cpp/client", - "//ash/services/secure_channel/public/mojom", - "//base", - "//chromeos/ash/components/dbus/session_manager", - "//chromeos/dbus/power", - "//components/account_id", - "//components/pref_registry:pref_registry", - "//components/prefs", - "//device/bluetooth", - "//net", - ] -} - -static_library("test_support") { - testonly = true - - sources = [ - "fake_lock_handler.cc", - "fake_lock_handler.h", - "fake_remote_device_life_cycle.cc", - "fake_remote_device_life_cycle.h", - "mock_proximity_auth_client.cc", - "mock_proximity_auth_client.h", - ] - - public_deps = [ ":proximity_auth" ] - - deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", - "//ash/components/multidevice/logging", - "//ash/services/device_sync/proto", - "//ash/services/secure_channel:test_support", - "//ash/services/secure_channel/public/cpp/client", - "//base", - "//testing/gmock", - ] -} - -source_set("unit_tests") { - testonly = true - sources = [ - "messenger_impl_unittest.cc", - "proximity_auth_local_state_pref_manager_unittest.cc", - "proximity_auth_profile_pref_manager_unittest.cc", - "proximity_auth_system_unittest.cc", - "proximity_monitor_impl_unittest.cc", - "remote_device_life_cycle_impl_unittest.cc", - "remote_status_update_unittest.cc", - "unlock_manager_impl_unittest.cc", - ] - - deps = [ - ":proximity_auth", - ":test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", - "//ash/components/multidevice/logging", - "//ash/constants", - "//ash/public/cpp", - "//ash/services/multidevice_setup/public/cpp:prefs", - "//ash/services/multidevice_setup/public/cpp:test_support", - "//ash/services/secure_channel:test_support", - "//ash/services/secure_channel/public/cpp/client:test_support", - "//base", - "//base/test:test_support", - "//chromeos/dbus/power", - "//chromeos/dbus/power:power_manager_proto", - "//components/prefs:test_support", - "//components/sync_preferences:test_support", - "//device/bluetooth:mocks", - "//testing/gmock", - "//testing/gtest", - ] -} - -# Note: This is a convenience target for ease of rapid iteration during -# development. It is not executed on any try or build bots. -test("proximity_auth_unittests") { - sources = [ "run_all_unittests.cc" ] - deps = [ - ":unit_tests", - "//base", - "//base/test:test_support", - ] -} diff --git a/chromium/ash/components/proximity_auth/public/mojom/BUILD.gn b/chromium/ash/components/proximity_auth/public/mojom/BUILD.gn deleted file mode 100644 index e205c9951ec..00000000000 --- a/chromium/ash/components/proximity_auth/public/mojom/BUILD.gn +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -mojom("mojom") { - sources = [ "auth_type.mojom" ] -} diff --git a/chromium/ash/components/proximity_auth/public/mojom/auth_type.mojom b/chromium/ash/components/proximity_auth/public/mojom/auth_type.mojom deleted file mode 100644 index a38d925816e..00000000000 --- a/chromium/ash/components/proximity_auth/public/mojom/auth_type.mojom +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module proximity_auth.mojom; - -// Supported authentication types. -enum AuthType { - // Password is used to authenticate. - OFFLINE_PASSWORD, - - // Online authentication against GAIA. - ONLINE_SIGN_IN, - - // Click on the user pod to unlock/sign-in. - USER_CLICK, - - // Used for public session. Click on the user pod would expand the pod and - // allow a click to sign-in. - EXPAND_THEN_USER_CLICK, - - // Forced to use password to authenticate. - // Unlike OFFLINE_PASSWORD, this can't be changed to any other. - FORCE_OFFLINE_PASSWORD, -}; diff --git a/chromium/ash/components/settings/BUILD.gn b/chromium/ash/components/settings/BUILD.gn deleted file mode 100644 index 14c0fca668d..00000000000 --- a/chromium/ash/components/settings/BUILD.gn +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//testing/test.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("settings") { - defines = [ "IS_ASH_SETTINGS_IMPL" ] - deps = [ - "//ash/constants", - "//base", - "//base:i18n", - "//chromeos/login/login_state", - "//third_party/icu", - ] - sources = [ - "cros_settings_names.cc", - "cros_settings_names.h", - "cros_settings_provider.cc", - "cros_settings_provider.h", - "system_settings_provider.cc", - "system_settings_provider.h", - "timezone_settings.cc", - "timezone_settings.h", - "timezone_settings_helper.cc", - "timezone_settings_helper.h", - ] -} - -source_set("unit_tests") { - testonly = true - deps = [ - ":settings", - "//base", - "//base:i18n", - "//base/test:test_support", - "//testing/gmock", - "//testing/gtest", - "//third_party/icu", - ] - sources = [ "timezone_settings_unittest.cc" ] -} diff --git a/chromium/ash/components/smbfs/BUILD.gn b/chromium/ash/components/smbfs/BUILD.gn deleted file mode 100644 index f73b2ed2a22..00000000000 --- a/chromium/ash/components/smbfs/BUILD.gn +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") - -component("smbfs") { - sources = [ - "smbfs_host.cc", - "smbfs_host.h", - "smbfs_mounter.cc", - "smbfs_mounter.h", - ] - public_deps = [ "//ash/components/smbfs/mojom" ] - deps = [ - "//ash/components/disks", - "//base", - "//chromeos/ash/components/dbus/cros_disks", - "//chromeos/components/mojo_bootstrap", - "//mojo/public/cpp/bindings", - "//net", - ] - defines = [ "IS_SMBFS_IMPL" ] -} - -source_set("unit_tests") { - testonly = true - sources = [ - "smbfs_host_unittest.cc", - "smbfs_mounter_unittest.cc", - ] - - deps = [ - ":smbfs", - "//ash/components/disks:test_support", - "//ash/components/smbfs/mojom", - "//base", - "//base/test:test_support", - "//chromeos/components/mojo_bootstrap", - "//mojo/core/embedder", - "//mojo/public/cpp/bindings", - "//mojo/public/cpp/system", - "//testing/gmock", - "//testing/gtest", - ] -} diff --git a/chromium/ash/components/smbfs/mojom/BUILD.gn b/chromium/ash/components/smbfs/mojom/BUILD.gn deleted file mode 100644 index 2b5e3da98a5..00000000000 --- a/chromium/ash/components/smbfs/mojom/BUILD.gn +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash) - -mojom_component("mojom") { - sources = [ - "file_path.mojom", - "ip_address.mojom", - "smbfs.mojom", - ] - - cpp_typemaps = [ - { - types = [ - { - mojom = "smbfs.mojom.FilePath" - cpp = "::base::FilePath" - }, - ] - traits_headers = [ "//ash/components/smbfs/file_path_mojom_traits.h" ] - traits_sources = [ "//ash/components/smbfs/file_path_mojom_traits.cc" ] - traits_public_deps = [ "//base" ] - }, - { - types = [ - { - mojom = "smbfs.mojom.IPAddress" - cpp = "::net::IPAddress" - }, - ] - traits_headers = [ "//ash/components/smbfs/ip_address_mojom_traits.h" ] - traits_sources = [ "//ash/components/smbfs/ip_address_mojom_traits.cc" ] - traits_public_deps = [ "//net" ] - }, - ] - - public_deps = [ "//mojo/public/mojom/base" ] - - output_prefix = "smbfs_mojom" - macro_prefix = "SMBFS_MOJOM" -} diff --git a/chromium/ash/components/smbfs/mojom/file_path.mojom b/chromium/ash/components/smbfs/mojom/file_path.mojom deleted file mode 100644 index bbb1e24c7ac..00000000000 --- a/chromium/ash/components/smbfs/mojom/file_path.mojom +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module smbfs.mojom; - -// This file is shared between Chrome and Chrome OS. -// In Chrome, this file is located at: -// //ash/components/smbfs/mojom/file_path.mojom -// In Chrome OS, this file is located at: -// //platform2/smbfs/mojom/file_path.mojom - -// Stores the absolute path to a file or directory within the share. The path -// cannot contain any parent (..) references and must not end in a trailing -// slash. -struct FilePath { - // The absolute pathname to the file. - string path; -}; diff --git a/chromium/ash/components/smbfs/mojom/ip_address.mojom b/chromium/ash/components/smbfs/mojom/ip_address.mojom deleted file mode 100644 index 6391bcb8538..00000000000 --- a/chromium/ash/components/smbfs/mojom/ip_address.mojom +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module smbfs.mojom; - -// This file is shared between Chrome and Chrome OS. -// In Chrome, this file is located at: -// //ash/components/smbfs/mojom/ip_address.mojom -// In Chrome OS, this file is located at: -// //platform2/smbfs/mojom/ip_address.mojom - -// This file is a copy of //services/network/public/mojom/ip_address.mojom -// Mirror of net::IPAddress. -struct IPAddress { - // IP address as a numeric value from most to least significant byte. - // Will be of length 4 for IPv4 addresses and 16 for IPv6. - array<uint8> address_bytes; -}; diff --git a/chromium/ash/components/smbfs/mojom/smbfs.mojom b/chromium/ash/components/smbfs/mojom/smbfs.mojom deleted file mode 100644 index b2046155cc1..00000000000 --- a/chromium/ash/components/smbfs/mojom/smbfs.mojom +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module smbfs.mojom; - -import "ash/components/smbfs/mojom/file_path.mojom"; -import "ash/components/smbfs/mojom/ip_address.mojom"; - -// This file is shared between Chrome and Chrome OS. -// In Chrome, this file is located at: -// //ash/components/smbfs/mojom/smbfs.mojom -// In Chrome OS, this file is located at: -// //platform2/smbfs/mojom/smbfs.mojom - -// Name used to identify the bootstrap message pipe. To be used with -// mojo::{Incoming,Outgoing}Invitation. -const string kBootstrapPipeName = "smbfs-bootstrap"; - -// Implemented by SmbFs, used from Chrome. -interface SmbFsBootstrap { - // Connect to an SMB share. This method must only be called once. - MountShare(MountOptions options, pending_remote<SmbFsDelegate> delegate) => - (MountError error, pending_remote<SmbFs>? smbfs); -}; - -// Implemented by SmbFs, used from Chrome. -interface SmbFs { - // Deletes any credentials stored for this share mount. - RemoveSavedCredentials() => (bool success); - - // Recursively delete |path|, which is the absolute path (within the SMB - // share, ie. /dir_a/file_b) of a file or directory. - DeleteRecursively(FilePath path) => (DeleteRecursivelyError error); -}; - -// Implemented by Chrome, used from SmbFs. -interface SmbFsDelegate { - // Request authentication credentials. This request is made when accessing a - // share fails with an authentication error. If null is returned, this - // indicates the request was dismissed by the user. - RequestCredentials() => (Credentials? credentials); -}; - -enum MountError { - // Success. - kOk = 0, - - // Generic code for uncategorized errors. - kUnknown = 1, - - // Mount timeout. - kTimeout = 2, - - // Share URL is invalid. - kInvalidUrl = 3, - - // An invalid combination of mount options was specified, or required - // options were missing. - kInvalidOptions = 4, - - // Share not found. - kNotFound = 5, - - // Share access denied (i.e. username/password error). - kAccessDenied = 6, - - // Invalid protocol (i.e. SMB1). - kInvalidProtocol = 7, -}; - -enum DeleteRecursivelyError { - // Success. - kOk = 0, - - // Generic code for uncategorized errors. - kUnknown = 1, - - // The specified path for deletion was not found. - kPathNotFound = 2, - - // A file or directory within the tree could not be deleted. - kFailedToDeleteNode = 3, - - // A directory within the tree could not be listed. - kFailedToListDirectory = 4, - - // A recursive delete is already in progress. - kOperationInProgress = 5, -}; - -struct Password { - // The Samba client library uses an "fstring" type to obtain the password, - // which is limited to 256 bytes (See source3/include/includes.h in the Samba - // sources). Subtract one to account for a null terminator. - const int32 kMaxLength = 255; - - // File descriptor of pipe containing password. - handle fd; - // Length of password stored in |fd|. - int32 length; -}; - -struct KerberosConfig { - enum Source { - // Obtain credentials for Active Directory from authpolicyd. - kActiveDirectory = 0, - - // Obtain credentials from kerberosd. - kKerberos = 1, - }; - // Source of kerberos credentials. - Source source; - - // Kerberos identity. Will be account GUID for Active Directory, and - // principal name for non-AD kerberos. - string identity; -}; - -struct CredentialStorageOptions { - const int32 kMinSaltLength = 16; - - // Username hash of the mounting profile. - string account_hash; - - // A vector of random bytes to use to obfuscate the password being stored. - // Must be at least |kMinSaltLength| bytes in length and generated by a - // strong random byte generator. - array<uint8> salt; -}; - -struct MountOptions { - // Full share path. Must be in the form "smb://hostname/sharename", and must - // have the hostname as entered by the user and NOT resolved to an IP address - // (unless the user entered an IP address as the hostname). - string share_path; - - // Resolved IP address of the share's hostname. - IPAddress? resolved_host; - - // Authentication parameters. - string username; - string workgroup; - // Password is passed using an fd to avoid having the password in addressable - // memory while being transferred over IPC. This also allows the password to - // be stored using libpasswordprovider on the Chrome OS side. - Password? password; - KerberosConfig? kerberos_config; - - // Allow NTLM authentication. - bool allow_ntlm = false; - - // Skip attempting to connect to the share, and instead unconditionally mount - // the share. - bool skip_connect = false; - - // Options for saving password to the daemon store. If present, the password - // will be saved or restored based on whether the |password| field is present. - [MinVersion=1] CredentialStorageOptions? credential_storage_options; -}; - -struct Credentials { - string username; - string workgroup; - Password? password; -}; diff --git a/chromium/ash/components/tether/BUILD.gn b/chromium/ash/components/tether/BUILD.gn deleted file mode 100644 index 5e005105b9e..00000000000 --- a/chromium/ash/components/tether/BUILD.gn +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") - -static_library("tether") { - sources = [ - "active_host.cc", - "active_host.h", - "active_host_network_state_updater.cc", - "active_host_network_state_updater.h", - "asynchronous_shutdown_object_container.h", - "asynchronous_shutdown_object_container_impl.cc", - "asynchronous_shutdown_object_container_impl.h", - "connect_tethering_operation.cc", - "connect_tethering_operation.h", - "connection_preserver.cc", - "connection_preserver.h", - "connection_preserver_impl.cc", - "connection_preserver_impl.h", - "crash_recovery_manager.h", - "crash_recovery_manager_impl.cc", - "crash_recovery_manager_impl.h", - "device_id_tether_network_guid_map.cc", - "device_id_tether_network_guid_map.h", - "device_status_util.cc", - "device_status_util.h", - "disconnect_tethering_operation.cc", - "disconnect_tethering_operation.h", - "disconnect_tethering_request_sender.cc", - "disconnect_tethering_request_sender.h", - "disconnect_tethering_request_sender_impl.cc", - "disconnect_tethering_request_sender_impl.h", - "gms_core_notifications_state_tracker.cc", - "gms_core_notifications_state_tracker.h", - "gms_core_notifications_state_tracker_impl.cc", - "gms_core_notifications_state_tracker_impl.h", - "host_connection_metrics_logger.cc", - "host_connection_metrics_logger.h", - "host_scan_cache.cc", - "host_scan_cache.h", - "host_scan_cache_entry.cc", - "host_scan_cache_entry.h", - "host_scan_device_prioritizer.h", - "host_scan_device_prioritizer_impl.cc", - "host_scan_device_prioritizer_impl.h", - "host_scan_scheduler.h", - "host_scan_scheduler_impl.cc", - "host_scan_scheduler_impl.h", - "host_scanner.cc", - "host_scanner.h", - "host_scanner_impl.cc", - "host_scanner_impl.h", - "host_scanner_operation.cc", - "host_scanner_operation.h", - "hotspot_usage_duration_tracker.cc", - "hotspot_usage_duration_tracker.h", - "keep_alive_operation.cc", - "keep_alive_operation.h", - "keep_alive_scheduler.cc", - "keep_alive_scheduler.h", - "message_transfer_operation.cc", - "message_transfer_operation.h", - "message_wrapper.cc", - "message_wrapper.h", - "network_configuration_remover.cc", - "network_configuration_remover.h", - "network_connection_handler_tether_delegate.cc", - "network_connection_handler_tether_delegate.h", - "network_host_scan_cache.cc", - "network_host_scan_cache.h", - "network_list_sorter.cc", - "network_list_sorter.h", - "notification_presenter.h", - "notification_remover.cc", - "notification_remover.h", - "persistent_host_scan_cache.h", - "persistent_host_scan_cache_impl.cc", - "persistent_host_scan_cache_impl.h", - "pref_names.cc", - "pref_names.h", - "synchronous_shutdown_object_container.h", - "synchronous_shutdown_object_container_impl.cc", - "synchronous_shutdown_object_container_impl.h", - "tether_component.cc", - "tether_component.h", - "tether_component_impl.cc", - "tether_component_impl.h", - "tether_connector.h", - "tether_connector_impl.cc", - "tether_connector_impl.h", - "tether_disconnector.h", - "tether_disconnector_impl.cc", - "tether_disconnector_impl.h", - "tether_host_fetcher.cc", - "tether_host_fetcher.h", - "tether_host_fetcher_impl.cc", - "tether_host_fetcher_impl.h", - "tether_host_response_recorder.cc", - "tether_host_response_recorder.h", - "tether_network_disconnection_handler.cc", - "tether_network_disconnection_handler.h", - "tether_session_completion_logger.cc", - "tether_session_completion_logger.h", - "timer_factory.cc", - "timer_factory.h", - "top_level_host_scan_cache.cc", - "top_level_host_scan_cache.h", - "wifi_hotspot_connector.cc", - "wifi_hotspot_connector.h", - "wifi_hotspot_disconnector.h", - "wifi_hotspot_disconnector_impl.cc", - "wifi_hotspot_disconnector_impl.h", - ] - - deps = [ - "//ash/components/multidevice/logging", - "//ash/components/tether/proto", - "//ash/constants", - "//ash/services/device_sync/public/cpp", - "//ash/services/multidevice_setup/public/cpp:cpp", - "//ash/services/secure_channel/public/cpp/client", - "//ash/services/secure_channel/public/cpp/shared", - "//ash/services/secure_channel/public/mojom", - "//base", - "//chromeos/ash/components/network", - "//chromeos/dbus/power", - "//chromeos/login/login_state", - "//components/pref_registry", - "//components/prefs", - "//components/session_manager/core", - "//device/bluetooth", - "//ui/gfx", - "//ui/message_center", - ] - - public_deps = [ - "//ash/services/device_sync/proto", - "//ash/services/multidevice_setup/public/mojom", - ] -} - -static_library("test_support") { - testonly = true - - sources = [ - "fake_active_host.cc", - "fake_active_host.h", - "fake_asynchronous_shutdown_object_container.cc", - "fake_asynchronous_shutdown_object_container.h", - "fake_connection_preserver.cc", - "fake_connection_preserver.h", - "fake_crash_recovery_manager.cc", - "fake_crash_recovery_manager.h", - "fake_disconnect_tethering_request_sender.cc", - "fake_disconnect_tethering_request_sender.h", - "fake_gms_core_notifications_state_tracker.cc", - "fake_gms_core_notifications_state_tracker.h", - "fake_host_scan_cache.cc", - "fake_host_scan_cache.h", - "fake_host_scan_scheduler.cc", - "fake_host_scan_scheduler.h", - "fake_host_scanner.cc", - "fake_host_scanner.h", - "fake_network_configuration_remover.cc", - "fake_network_configuration_remover.h", - "fake_notification_presenter.cc", - "fake_notification_presenter.h", - "fake_synchronous_shutdown_object_container.cc", - "fake_synchronous_shutdown_object_container.h", - "fake_tether_component.cc", - "fake_tether_component.h", - "fake_tether_connector.cc", - "fake_tether_connector.h", - "fake_tether_disconnector.cc", - "fake_tether_disconnector.h", - "fake_tether_host_fetcher.cc", - "fake_tether_host_fetcher.h", - "fake_tether_session_completion_logger.cc", - "fake_tether_session_completion_logger.h", - "fake_wifi_hotspot_connector.cc", - "fake_wifi_hotspot_connector.h", - "fake_wifi_hotspot_disconnector.cc", - "fake_wifi_hotspot_disconnector.h", - "host_scan_test_util.cc", - "host_scan_test_util.h", - "mock_host_connection_metrics_logger.cc", - "mock_host_connection_metrics_logger.h", - "mock_tether_host_response_recorder.cc", - "mock_tether_host_response_recorder.h", - "proto_test_util.cc", - "proto_test_util.h", - "test_timer_factory.cc", - "test_timer_factory.h", - ] - - public_deps = [ ":tether" ] - - deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", - "//ash/components/tether/proto", - "//ash/services/device_sync/public/cpp:test_support", - "//ash/services/secure_channel/public/cpp/client:test_support", - "//ash/services/secure_channel/public/cpp/shared", - "//base", - "//base/test:test_support", - "//chromeos/ash/components/network:test_support", - "//device/bluetooth", - "//testing/gmock", - "//testing/gtest", - "//ui/message_center:test_support", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "active_host_network_state_updater_unittest.cc", - "active_host_unittest.cc", - "asynchronous_shutdown_object_container_impl_unittest.cc", - "connect_tethering_operation_unittest.cc", - "connection_preserver_impl_unittest.cc", - "crash_recovery_manager_impl_unittest.cc", - "device_status_util_unittest.cc", - "disconnect_tethering_operation_unittest.cc", - "disconnect_tethering_request_sender_impl_unittest.cc", - "gms_core_notifications_state_tracker_impl_unittest.cc", - "host_connection_metrics_logger_unittest.cc", - "host_scan_cache_unittest.cc", - "host_scan_device_prioritizer_impl_unittest.cc", - "host_scan_scheduler_impl_unittest.cc", - "host_scanner_impl_unittest.cc", - "host_scanner_operation_unittest.cc", - "hotspot_usage_duration_tracker_unittest.cc", - "keep_alive_operation_unittest.cc", - "keep_alive_scheduler_unittest.cc", - "message_transfer_operation_unittest.cc", - "message_wrapper_unittest.cc", - "network_configuration_remover_unittest.cc", - "network_connection_handler_tether_delegate_unittest.cc", - "network_host_scan_cache_unittest.cc", - "network_list_sorter_unittest.cc", - "notification_remover_unittest.cc", - "persistent_host_scan_cache_impl_unittest.cc", - "tether_component_impl_unittest.cc", - "tether_connector_impl_unittest.cc", - "tether_disconnector_impl_unittest.cc", - "tether_host_fetcher_impl_unittest.cc", - "tether_host_response_recorder_unittest.cc", - "tether_network_disconnection_handler_unittest.cc", - "tether_session_completion_logger_unittest.cc", - "top_level_host_scan_cache_unittest.cc", - "wifi_hotspot_connector_unittest.cc", - "wifi_hotspot_disconnector_impl_unittest.cc", - ] - - deps = [ - ":test_support", - ":tether", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", - "//ash/components/tether/proto", - "//ash/services/device_sync:test_support", - "//ash/services/device_sync/public/cpp", - "//ash/services/device_sync/public/cpp:test_support", - "//ash/services/device_sync/public/mojom", - "//ash/services/multidevice_setup/public/cpp:test_support", - "//ash/services/multidevice_setup/public/mojom:mojom", - "//ash/services/secure_channel:test_support", - "//ash/services/secure_channel/public/cpp/client:test_support", - "//ash/services/secure_channel/public/cpp/shared", - "//base/test:test_support", - "//chromeos/ash/components/network:test_support", - "//chromeos/dbus/power", - "//chromeos/login/login_state", - "//components/prefs:test_support", - "//components/session_manager/core", - "//components/sync_preferences:test_support", - "//device/bluetooth", - "//device/bluetooth:mocks", - "//testing/gmock", - "//testing/gtest", - "//ui/message_center:test_support", - ] -} diff --git a/chromium/ash/components/tether/proto/BUILD.gn b/chromium/ash/components/tether/proto/BUILD.gn deleted file mode 100644 index fe3744ce01c..00000000000 --- a/chromium/ash/components/tether/proto/BUILD.gn +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//third_party/protobuf/proto_library.gni") - -assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") - -proto_library("proto") { - sources = [ "tether.proto" ] -} diff --git a/chromium/ash/components/timezone/BUILD.gn b/chromium/ash/components/timezone/BUILD.gn deleted file mode 100644 index 26ff4ceabac..00000000000 --- a/chromium/ash/components/timezone/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//testing/test.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("timezone") { - defines = [ "IS_ASH_TIMEZONE_IMPL" ] - deps = [ - "//ash/components/geolocation", - "//base", - "//components/prefs", - "//google_apis", - "//net", - "//services/network/public/cpp", - ] - sources = [ - "timezone_provider.cc", - "timezone_provider.h", - "timezone_request.cc", - "timezone_request.h", - "timezone_resolver.cc", - "timezone_resolver.h", - ] -} - -source_set("unit_tests") { - testonly = true - deps = [ - ":timezone", - "//ash/components/geolocation", - "//base", - "//base/test:test_support", - "//net", - "//services/network:test_support", - "//services/network/public/cpp", - "//testing/gtest", - ] - sources = [ "timezone_unittest.cc" ] -} diff --git a/chromium/ash/components/tpm/BUILD.gn b/chromium/ash/components/tpm/BUILD.gn deleted file mode 100644 index d74a2ac0d8f..00000000000 --- a/chromium/ash/components/tpm/BUILD.gn +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//ash/components/tpm/buildflags.gni") -import("//build/buildflag_header.gni") -import("//build/config/chromeos/ui_mode.gni") -import("//testing/test.gni") - -assert(is_chromeos_ash) - -buildflag_header("buildflags") { - header = "buildflags.h" - flags = [ "NSS_SLOTS_SOFTWARE_FALLBACK=$nss_slots_software_fallback" ] -} - -component("tpm") { - defines = [ "IS_ASH_COMPONENTS_TPM_IMPL" ] - deps = [ - ":buildflags", - "//base", - "//chromeos/ash/components/cryptohome", - "//chromeos/ash/components/dbus/cryptohome", - "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", - "//chromeos/ash/components/dbus/userdataauth", - "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", - "//chromeos/dbus/constants", - "//chromeos/dbus/tpm_manager", - "//chromeos/dbus/tpm_manager:tpm_manager_proto", - "//chromeos/login/login_state", - "//components/account_id", - "//crypto", - ] - sources = [ - "prepare_tpm.cc", - "prepare_tpm.h", - "tpm_token_info_getter.cc", - "tpm_token_info_getter.h", - "tpm_token_loader.cc", - "tpm_token_loader.h", - ] -} - -source_set("unit_tests") { - testonly = true - deps = [ - ":tpm", - "//base/test:test_support", - "//chromeos/ash/components/cryptohome", - "//chromeos/ash/components/dbus:test_support", - "//chromeos/ash/components/dbus/cryptohome", - "//chromeos/ash/components/dbus/cryptohome:cryptohome_proto", - "//chromeos/ash/components/dbus/userdataauth", - "//chromeos/ash/components/dbus/userdataauth:userdataauth_proto", - "//chromeos/dbus/constants", - "//chromeos/dbus/tpm_manager", - "//chromeos/dbus/tpm_manager:tpm_manager_proto", - "//testing/gtest", - ] - sources = [ - "prepare_tpm_unittest.cc", - "tpm_token_info_getter_unittest.cc", - ] -} diff --git a/chromium/ash/components/tpm/buildflags.gni b/chromium/ash/components/tpm/buildflags.gni deleted file mode 100644 index d59029ac280..00000000000 --- a/chromium/ash/components/tpm/buildflags.gni +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -declare_args() { - # True if the NSS slots should fall back to software-backed initialization - # in case of a disabled TPM. - nss_slots_software_fallback = false -} diff --git a/chromium/ash/components/trial_group/BUILD.gn b/chromium/ash/components/trial_group/BUILD.gn deleted file mode 100644 index e7546201916..00000000000 --- a/chromium/ash/components/trial_group/BUILD.gn +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash") - -component("trial_group") { - sources = [ - "trial_group_checker.cc", - "trial_group_checker.h", - ] - - deps = [ - "//base", - "//net", - "//services/network/public/cpp", - "//services/network/public/cpp:cpp_base", - "//url", - ] - - defines = [ "IS_TRIAL_GROUP_CHECKER_IMPL" ] -} - -source_set("unit_tests") { - testonly = true - sources = [ - "trial_group_checker_unittest.cc", - ] - - deps = [ - ":trial_group", - "//base", - "//net:test_support", - "//services/network:test_support", - "//testing/gtest", - ] -} diff --git a/chromium/ash/constants/BUILD.gn b/chromium/ash/constants/BUILD.gn index 9543aa5732e..e092630c6e6 100644 --- a/chromium/ash/constants/BUILD.gn +++ b/chromium/ash/constants/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -27,6 +27,8 @@ component("constants") { "devicetype.h", "notifier_catalogs.h", "personalization_entry_point.h", + "quick_settings_catalogs.h", + "tray_background_view_catalog.h", "url_constants.cc", "url_constants.h", ] diff --git a/chromium/ash/dbus/BUILD.gn b/chromium/ash/dbus/BUILD.gn index e270f9967e4..3394ee0e3bf 100644 --- a/chromium/ash/dbus/BUILD.gn +++ b/chromium/ash/dbus/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/in_session_auth/BUILD.gn b/chromium/ash/in_session_auth/BUILD.gn index 11ec8772445..52349127d40 100644 --- a/chromium/ash/in_session_auth/BUILD.gn +++ b/chromium/ash/in_session_auth/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -23,13 +23,14 @@ source_set("in_session_auth") { ] deps = [ - "//ash/components/login/auth", "//ash/login/resources", "//ash/public/cpp", "//ash/resources/vector_icons", "//ash/strings", "//base", + "//chromeos/ash/components/cryptohome/", "//chromeos/ash/components/dbus/userdataauth", + "//chromeos/ash/components/login/auth", "//chromeos/components/webauthn", "//ui/views", ] diff --git a/chromium/ash/keyboard/ui/BUILD.gn b/chromium/ash/keyboard/ui/BUILD.gn index 02d043df768..113c6c81f0f 100644 --- a/chromium/ash/keyboard/ui/BUILD.gn +++ b/chromium/ash/keyboard/ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/login/resources/BUILD.gn b/chromium/ash/login/resources/BUILD.gn index 0d6187e0ca2..a61f61ca6b0 100644 --- a/chromium/ash/login/resources/BUILD.gn +++ b/chromium/ash/login/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn index 4288eae6758..1cadc7bbeda 100644 --- a/chromium/ash/public/cpp/BUILD.gn +++ b/chromium/ash/public/cpp/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. +# Copyright 2016 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -14,6 +14,8 @@ component("cpp") { "accelerator_configuration.h", "accelerators.cc", "accelerators.h", + "accelerators_util.cc", + "accelerators_util.h", "accessibility_controller.cc", "accessibility_controller.h", "accessibility_controller_client.h", @@ -148,6 +150,8 @@ component("cpp") { "holding_space/holding_space_prefs.h", "holding_space/holding_space_progress.cc", "holding_space/holding_space_progress.h", + "holding_space/holding_space_section.cc", + "holding_space/holding_space_section.h", "holding_space/holding_space_util.cc", "holding_space/holding_space_util.h", "image_downloader.cc", @@ -236,6 +240,7 @@ component("cpp") { "power_utils.h", "presentation_time_recorder.cc", "presentation_time_recorder.h", + "privacy_hub_delegate.h", "privacy_screen_dlp_helper.cc", "privacy_screen_dlp_helper.h", "projector/annotator_tool.cc", @@ -370,14 +375,14 @@ component("cpp") { "//ash/constants", "//ash/public/cpp/ambient/proto", "//ash/resources/vector_icons", - "//ash/services/cellular_setup:in_process_esim_manager", "//ash/strings", "//base", "//chromeos/ash/components/audio", "//chromeos/ash/components/audio:in_process_audio_config", "//chromeos/ash/services/assistant/public/cpp", + "//chromeos/ash/services/bluetooth_config:in_process_bluetooth_config", + "//chromeos/ash/services/cellular_setup:in_process_esim_manager", "//chromeos/dbus/power:power_manager_proto", - "//chromeos/services/bluetooth_config:in_process_bluetooth_config", "//chromeos/services/network_config:in_process_instance", "//chromeos/strings:strings_grit", "//chromeos/ui/base", @@ -395,10 +400,14 @@ component("cpp") { "//services/network/public/cpp:cpp", "//skia/public/mojom", "//ui/aura", + "//ui/base", "//ui/chromeos/strings", "//ui/compositor_extra", "//ui/display", + "//ui/events", + "//ui/events:dom_keycode_converter", "//ui/events/devices", + "//ui/events/ozone/layout", "//ui/message_center/public/cpp", "//ui/strings:ui_strings_grit", "//ui/views", @@ -408,16 +417,16 @@ component("cpp") { public_deps = [ "//ash/components/arc/mojom:notifications", - "//ash/components/login/auth", "//ash/public/mojom", - "//ash/services/cellular_setup/public/mojom", "//ash/webui/personalization_app/proto", "//base", "//chromeos/ash/components/audio/public/mojom", + "//chromeos/ash/components/login/auth", "//chromeos/ash/services/assistant/public/mojom", + "//chromeos/ash/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/cellular_setup/public/mojom", "//chromeos/components/security_token_pin", "//chromeos/crosapi/mojom", - "//chromeos/services/bluetooth_config/public/mojom", "//chromeos/services/network_config/public/mojom", "//components/app_restore", "//components/session_manager:base", @@ -433,6 +442,7 @@ component("cpp") { source_set("unit_tests") { testonly = true sources = [ + "accelerators_util_unittest.cc", "ambient/ambient_metrics_unittest.cc", "android_intent_helper_unittest.cc", "app_list/app_list_config_provider_unittest.cc", @@ -440,6 +450,8 @@ source_set("unit_tests") { "holding_space/holding_space_item_unittest.cc", "holding_space/holding_space_model_unittest.cc", "holding_space/holding_space_progress_unittest.cc", + "holding_space/holding_space_section_unittest.cc", + "holding_space/holding_space_util_unittest.cc", "metrics_util_unittest.cc", "pagination/pagination_model_unittest.cc", "power_utils_unittest.cc", @@ -462,6 +474,10 @@ source_set("unit_tests") { "//ui/aura:test_support", "//ui/chromeos/styles:cros_styles_views", "//ui/compositor_extra", + "//ui/events", + "//ui/events:dom_keycode_converter", + "//ui/events/devices", + "//ui/events/ozone/layout", "//ui/gfx:test_support", "//ui/views", "//ui/views:test_support", diff --git a/chromium/ash/public/cpp/ambient/proto/BUILD.gn b/chromium/ash/public/cpp/ambient/proto/BUILD.gn index 3d91205db35..00cbc466d2d 100644 --- a/chromium/ash/public/cpp/ambient/proto/BUILD.gn +++ b/chromium/ash/public/cpp/ambient/proto/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn b/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn index baec855f9f1..4faf30f71e8 100644 --- a/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn +++ b/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. +# Copyright 2017 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/public/cpp/assistant/test_support/BUILD.gn b/chromium/ash/public/cpp/assistant/test_support/BUILD.gn index 4d52f09d79e..5456f8e92b5 100644 --- a/chromium/ash/public/cpp/assistant/test_support/BUILD.gn +++ b/chromium/ash/public/cpp/assistant/test_support/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/public/cpp/external_arc/BUILD.gn b/chromium/ash/public/cpp/external_arc/BUILD.gn index 64ae6dfb914..d2ec3f31957 100644 --- a/chromium/ash/public/cpp/external_arc/BUILD.gn +++ b/chromium/ash/public/cpp/external_arc/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/public/cpp/holding_space/BUILD.gn b/chromium/ash/public/cpp/holding_space/BUILD.gn index 36246bd54a9..944a6af2e98 100644 --- a/chromium/ash/public/cpp/holding_space/BUILD.gn +++ b/chromium/ash/public/cpp/holding_space/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/public/cpp/resources/BUILD.gn b/chromium/ash/public/cpp/resources/BUILD.gn index 78b55b2d185..8098444b07f 100644 --- a/chromium/ash/public/cpp/resources/BUILD.gn +++ b/chromium/ash/public/cpp/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/public/mojom/BUILD.gn b/chromium/ash/public/mojom/BUILD.gn index c56c5559f39..a611b3d786e 100644 --- a/chromium/ash/public/mojom/BUILD.gn +++ b/chromium/ash/public/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. +# Copyright 2015 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -15,11 +15,10 @@ mojom("mojom") { "accelerator_keys.mojom", "assistant_volume_control.mojom", "tray_action.mojom", - "voice_interaction_controller.mojom", ] public_deps = [ - "//ash/components/proximity_auth/public/mojom", + "//chromeos/ash/components/proximity_auth/public/mojom", "//components/account_id/mojom", "//components/sync/mojom", "//mojo/public/mojom/base", diff --git a/chromium/ash/public/mojom/accelerator_info.mojom b/chromium/ash/public/mojom/accelerator_info.mojom index d450fc8e908..ad0772c9a2c 100644 --- a/chromium/ash/public/mojom/accelerator_info.mojom +++ b/chromium/ash/public/mojom/accelerator_info.mojom @@ -1,9 +1,10 @@ -// Copyright 2022 The Chromium Authors. +// Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. module ash.mojom; +import "mojo/public/mojom/base/string16.mojom"; import "ui/base/accelerators/mojom/accelerator.mojom"; // AcceleratorInfo is a representation of an Accelerator with more information @@ -53,14 +54,64 @@ enum AcceleratorState { kDisabledByUser, }; +// Represents the style of layout for an accelerator. +// TODO(jimmyxgong): Add alternate layout styles. +enum AcceleratorLayoutStyle { + kDefault = 0, +}; + +// Enum of top-level accelerator categories. Used in the UI for categorization. +// TODO(jimmyxgong): These are not the final enums, update once final categories +// are available. +enum AcceleratorCategory { + kSystem, + kWindowsAndDesk, + kTabsAndPages, + kTextAndInput, + kDebug, + kDeveloper, +}; + +// Enum of secondary-level accelerator categories. Used in the UI for +// categorization. +// TODO(jimmyxgong): These are not the final enums, update once final +// subcategories are available. +enum AcceleratorSubcategory { + kGeneral, + kSystemControls, + kSystemApps, +}; + // Represents an accelerator in its entirety. Includes the keys, state, type, // and whether the accelerator is locked. struct AcceleratorInfo { // Underlying accelerator struct, contains keycode and modifier. ui.mojom.Accelerator accelerator; + // The user viewable string of the primary activation key for the accelerator. + mojo_base.mojom.String16 key_display; AcceleratorType type; AcceleratorState state; // True if the accelerator can not be customized by the user. // False if the accelerator can be customized by the user. bool locked; }; + +// Represents layout styling descriptors of an accelerator. Includes the +// description of the accelerator along with its category identifiers. +struct AcceleratorLayoutInfo { + // Top-level category used for categorization in the UI. + AcceleratorCategory category; + // Secondary-level category used for categorization in the UI. + AcceleratorSubcategory sub_category; + // Translated string for the action description. + mojo_base.mojom.String16 description; + // The way the AcceleratorRow should be styled. + AcceleratorLayoutStyle style; + + // The accelerator source, which help differentiate same action id's from + // different sources. + AcceleratorSource source; + // The accelerator id, used as part of the identifier to map + // `AcceleratorLayoutInfo` to an `AcceleratorInfo`. + uint32 action; +}; diff --git a/chromium/ash/public/mojom/accelerator_keys.mojom b/chromium/ash/public/mojom/accelerator_keys.mojom index c78dc5ec2c6..6d409aa7dd1 100644 --- a/chromium/ash/public/mojom/accelerator_keys.mojom +++ b/chromium/ash/public/mojom/accelerator_keys.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/public/mojom/assistant_volume_control.mojom b/chromium/ash/public/mojom/assistant_volume_control.mojom index a3660bec04a..209123bee2d 100644 --- a/chromium/ash/public/mojom/assistant_volume_control.mojom +++ b/chromium/ash/public/mojom/assistant_volume_control.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/public/mojom/tray_action.mojom b/chromium/ash/public/mojom/tray_action.mojom index 4c951576fd3..e7011c9ff09 100644 --- a/chromium/ash/public/mojom/tray_action.mojom +++ b/chromium/ash/public/mojom/tray_action.mojom @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/public/mojom/voice_interaction_controller.mojom b/chromium/ash/public/mojom/voice_interaction_controller.mojom deleted file mode 100644 index 64b3fc49889..00000000000 --- a/chromium/ash/public/mojom/voice_interaction_controller.mojom +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module ash.mojom; - -// There is another copy of the VoiceInteractionState definition in -// //components/arc/mojom/voice_interaction_framework.mojom -// Please also update the other one if you change it. -// The duplicate definition is because we do not use extensible widely -// (crbug.com/731893). - -// The initial state is NOT_READY, then it will either becomes STOPPED or -// RUNNING. If the mojo connection is lost, the state will be set back to -// NOT_READY. -enum VoiceInteractionState { - // Voice interaction service is not ready yet, request sent will be waiting. - NOT_READY = 0, - // Voice interaction session is stopped. - STOPPED, - // Voice interaction session is currently running. - RUNNING -}; diff --git a/chromium/ash/quick_pair/BUILD.gn b/chromium/ash/quick_pair/BUILD.gn index c614cdcdd3a..4705d2f2a15 100644 --- a/chromium/ash/quick_pair/BUILD.gn +++ b/chromium/ash/quick_pair/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/quick_pair/common/BUILD.gn b/chromium/ash/quick_pair/common/BUILD.gn index 5b1c7ba98d8..4ea07d99216 100644 --- a/chromium/ash/quick_pair/common/BUILD.gn +++ b/chromium/ash/quick_pair/common/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -27,8 +27,6 @@ component("common") { "fast_pair/fast_pair_http_result.h", "fast_pair/fast_pair_metrics.cc", "fast_pair/fast_pair_metrics.h", - "fast_pair/fast_pair_service_data_creator.cc", - "fast_pair/fast_pair_service_data_creator.h", "log_buffer.cc", "log_buffer.h", "logging.cc", @@ -43,9 +41,9 @@ component("common") { deps = [ "//ash/constants:constants", - "//ash/services/quick_pair/public/mojom", "//base", "//chromeos/ash/components/feature_usage", + "//chromeos/ash/services/quick_pair/public/mojom", "//components/prefs", "//device/bluetooth", "//device/bluetooth/public/cpp", @@ -63,12 +61,12 @@ static_library("test_support") { "fast_pair/fast_pair_service_data_creator.h", "mock_quick_pair_browser_delegate.cc", "mock_quick_pair_browser_delegate.h", - "quick_pair_browser_delegate.h", ] deps = [ - "//ash/services/quick_pair/public/mojom", + ":common", "//base/test:test_support", + "//chromeos/ash/services/quick_pair/public/mojom", "//components/image_fetcher/core", "//services/network/public/cpp", "//testing/gtest", diff --git a/chromium/ash/quick_pair/companion_app/BUILD.gn b/chromium/ash/quick_pair/companion_app/BUILD.gn index 157b3be95a6..187b37eb37d 100644 --- a/chromium/ash/quick_pair/companion_app/BUILD.gn +++ b/chromium/ash/quick_pair/companion_app/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/quick_pair/fast_pair_handshake/BUILD.gn b/chromium/ash/quick_pair/fast_pair_handshake/BUILD.gn index c6aa5192602..354ede6ac20 100644 --- a/chromium/ash/quick_pair/fast_pair_handshake/BUILD.gn +++ b/chromium/ash/quick_pair/fast_pair_handshake/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -33,9 +33,9 @@ source_set("fast_pair_handshake") { "//ash/quick_pair/common", "//ash/quick_pair/proto:fastpair_proto", "//ash/quick_pair/repository", - "//ash/services/quick_pair", - "//ash/services/quick_pair/public/cpp", "//base", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair/public/cpp", "//crypto:crypto", "//device/bluetooth", "//third_party/protobuf:protobuf_lite", @@ -60,9 +60,9 @@ static_library("test_support") { deps = [ "//ash/quick_pair/common", - "//ash/services/quick_pair/public/cpp", "//base", "//base/test:test_support", + "//chromeos/ash/services/quick_pair/public/cpp", "//device/bluetooth", "//testing/gtest", ] @@ -83,11 +83,11 @@ source_set("unit_tests") { ":test_support", "//ash/quick_pair/common", "//ash/quick_pair/repository:test_support", - "//ash/services/quick_pair", - "//ash/services/quick_pair:test_support", - "//ash/services/quick_pair/public/cpp", "//base", "//base/test:test_support", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair:test_support", + "//chromeos/ash/services/quick_pair/public/cpp", "//device/bluetooth", "//device/bluetooth:mocks", "//testing/gtest", @@ -100,7 +100,7 @@ fuzzer_test("fast_pair_encryption_fuzzer") { ":fast_pair_handshake", "//ash:test_support", "//ash/quick_pair/common", - "//ash/services/quick_pair", "//base", + "//chromeos/ash/services/quick_pair", ] } diff --git a/chromium/ash/quick_pair/feature_status_tracker/BUILD.gn b/chromium/ash/quick_pair/feature_status_tracker/BUILD.gn index eda971d440c..f5e34dec2bf 100644 --- a/chromium/ash/quick_pair/feature_status_tracker/BUILD.gn +++ b/chromium/ash/quick_pair/feature_status_tracker/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/quick_pair/keyed_service/BUILD.gn b/chromium/ash/quick_pair/keyed_service/BUILD.gn index e76755eff7d..68395450d30 100644 --- a/chromium/ash/quick_pair/keyed_service/BUILD.gn +++ b/chromium/ash/quick_pair/keyed_service/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -31,11 +31,11 @@ static_library("keyed_service") { "//ash/quick_pair/repository", "//ash/quick_pair/scanning", "//ash/quick_pair/ui", - "//ash/services/quick_pair", "//base", - "//chromeos/services/bluetooth_config", - "//chromeos/services/bluetooth_config/public/cpp", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/quick_pair", "//components/keyed_service/core", "//components/prefs", "//components/user_manager", @@ -68,13 +68,13 @@ source_set("unit_tests") { "//ash/quick_pair/repository:test_support", "//ash/quick_pair/scanning:test_support", "//ash/quick_pair/ui:test_support", - "//ash/services/quick_pair", - "//ash/services/quick_pair:test_support", "//base", "//base/test:test_support", - "//chromeos/services/bluetooth_config", - "//chromeos/services/bluetooth_config:test_support", - "//chromeos/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/bluetooth_config", + "//chromeos/ash/services/bluetooth_config:test_support", + "//chromeos/ash/services/bluetooth_config/public/mojom", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair:test_support", "//components/prefs:test_support", "//components/user_manager:test_support", "//device/bluetooth", diff --git a/chromium/ash/quick_pair/message_stream/BUILD.gn b/chromium/ash/quick_pair/message_stream/BUILD.gn index 27392f484ac..74a763005fe 100644 --- a/chromium/ash/quick_pair/message_stream/BUILD.gn +++ b/chromium/ash/quick_pair/message_stream/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -18,10 +18,10 @@ source_set("message_stream") { deps = [ "//ash/quick_pair/common", - "//ash/services/quick_pair", - "//ash/services/quick_pair/public/cpp", - "//ash/services/quick_pair/public/mojom", "//base", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair/public/cpp", + "//chromeos/ash/services/quick_pair/public/mojom", "//device/bluetooth", "//net", ] @@ -42,11 +42,11 @@ static_library("test_support") { deps = [ "//ash/quick_pair/common", - "//ash/services/quick_pair", - "//ash/services/quick_pair/public/cpp", - "//ash/services/quick_pair/public/mojom", "//base", "//base/test:test_support", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair/public/cpp", + "//chromeos/ash/services/quick_pair/public/mojom", "//device/bluetooth", "//device/bluetooth:mocks", "//testing/gtest", @@ -65,10 +65,10 @@ source_set("unit_tests") { ":message_stream", ":test_support", "//ash/quick_pair/common", - "//ash/services/quick_pair", - "//ash/services/quick_pair:test_support", "//base", "//base/test:test_support", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair:test_support", "//device/bluetooth", "//device/bluetooth:mocks", "//mojo/public/cpp/bindings", diff --git a/chromium/ash/quick_pair/pairing/BUILD.gn b/chromium/ash/quick_pair/pairing/BUILD.gn index ff7aab75981..a7c85d8f206 100644 --- a/chromium/ash/quick_pair/pairing/BUILD.gn +++ b/chromium/ash/quick_pair/pairing/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -30,9 +30,9 @@ source_set("pairing") { "//ash/quick_pair/message_stream", "//ash/quick_pair/proto:fastpair_proto", "//ash/quick_pair/repository", - "//ash/services/quick_pair", - "//ash/services/quick_pair/public/cpp", "//base", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair/public/cpp", "//crypto:crypto", "//device/bluetooth", "//third_party/protobuf:protobuf_lite", @@ -84,11 +84,11 @@ source_set("unit_tests") { "//ash/quick_pair/proto:fastpair_proto", "//ash/quick_pair/repository:repository", "//ash/quick_pair/repository:test_support", - "//ash/services/quick_pair", - "//ash/services/quick_pair:test_support", - "//ash/services/quick_pair/public/cpp", "//base", "//base/test:test_support", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair:test_support", + "//chromeos/ash/services/quick_pair/public/cpp", "//device/bluetooth", "//device/bluetooth:mocks", "//mojo/public/cpp/bindings", diff --git a/chromium/ash/quick_pair/proto/BUILD.gn b/chromium/ash/quick_pair/proto/BUILD.gn index 422401b9769..b8938f1ff6e 100644 --- a/chromium/ash/quick_pair/proto/BUILD.gn +++ b/chromium/ash/quick_pair/proto/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/quick_pair/repository/BUILD.gn b/chromium/ash/quick_pair/repository/BUILD.gn index 4a8058d0f5b..b45ca7e9be1 100644 --- a/chromium/ash/quick_pair/repository/BUILD.gn +++ b/chromium/ash/quick_pair/repository/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -47,12 +47,14 @@ source_set("repository") { deps = [ "//ash/quick_pair/common", "//ash/quick_pair/proto:fastpair_proto", - "//ash/services/quick_pair/public/cpp", "//base", - "//chromeos/services/bluetooth_config/public/cpp", + "//chromeos/ash/components/network", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/quick_pair/public/cpp", "//components/image_fetcher/core", "//components/prefs", "//components/signin/public/identity_manager", + "//crypto", "//device/bluetooth", "//google_apis", "//net/traffic_annotation", @@ -88,7 +90,8 @@ static_library("test_support") { "//ash/quick_pair/proto:fastpair_proto", "//base", "//base/test:test_support", - "//chromeos/services/bluetooth_config/public/cpp", + "//chromeos/ash/components/network:test_support", + "//chromeos/ash/services/bluetooth_config/public/cpp", "//device/bluetooth", "//net", "//net/traffic_annotation:test_support", @@ -110,6 +113,7 @@ source_set("unit_tests") { "fast_pair/pending_write_store_unittest.cc", "fast_pair/saved_device_registry_unittest.cc", "fast_pair_repository_impl_unittest.cc", + "fast_pair_repository_unittest.cc", "oauth_http_fetcher_unittest.cc", "unauthenticated_http_fetcher_unittest.cc", ] @@ -121,12 +125,13 @@ source_set("unit_tests") { "//ash/quick_pair/common", "//ash/quick_pair/common:test_support", "//ash/quick_pair/proto:fastpair_proto", - "//ash/services/quick_pair/public/cpp", "//base", "//base/test:test_support", - "//chromeos/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/bluetooth_config/public/cpp", + "//chromeos/ash/services/quick_pair/public/cpp", "//components/prefs:test_support", "//components/signin/public/identity_manager:test_support", + "//crypto", "//device/bluetooth:mocks", "//net", "//net/traffic_annotation:test_support", diff --git a/chromium/ash/quick_pair/scanning/BUILD.gn b/chromium/ash/quick_pair/scanning/BUILD.gn index 1e642ad2862..4050f58fa8c 100644 --- a/chromium/ash/quick_pair/scanning/BUILD.gn +++ b/chromium/ash/quick_pair/scanning/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -29,10 +29,10 @@ source_set("scanning") { "//ash/quick_pair/common", "//ash/quick_pair/fast_pair_handshake", "//ash/quick_pair/repository", - "//ash/services/quick_pair", - "//ash/services/quick_pair/public/cpp", "//base", "//chromeos/ash/components/network", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair/public/cpp", "//device/bluetooth", "//device/bluetooth/public/cpp", ] @@ -75,14 +75,15 @@ source_set("unit_tests") { "//ash:test_support", "//ash/constants", "//ash/quick_pair/common", + "//ash/quick_pair/common:test_support", "//ash/quick_pair/fast_pair_handshake:test_support", "//ash/quick_pair/proto:fastpair_proto", "//ash/quick_pair/repository:repository", "//ash/quick_pair/repository:test_support", - "//ash/services/quick_pair", - "//ash/services/quick_pair:test_support", "//base/test:test_support", "//chromeos/ash/components/network:test_support", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair:test_support", "//dbus:test_support", "//device/bluetooth", "//device/bluetooth:mocks", diff --git a/chromium/ash/quick_pair/ui/BUILD.gn b/chromium/ash/quick_pair/ui/BUILD.gn index 5053703a9e8..9a7e99b28b7 100644 --- a/chromium/ash/quick_pair/ui/BUILD.gn +++ b/chromium/ash/quick_pair/ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -78,11 +78,11 @@ source_set("unit_tests") { "//ash/quick_pair/proto:fastpair_proto", "//ash/quick_pair/repository:repository", "//ash/quick_pair/repository:test_support", - "//ash/services/quick_pair", - "//ash/services/quick_pair:test_support", - "//ash/services/quick_pair/public/cpp", "//base", "//base/test:test_support", + "//chromeos/ash/services/quick_pair", + "//chromeos/ash/services/quick_pair:test_support", + "//chromeos/ash/services/quick_pair/public/cpp", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager:test_support", "//testing/gtest", diff --git a/chromium/ash/resources/BUILD.gn b/chromium/ash/resources/BUILD.gn index 9aca38b23c5..0faba0b9c77 100644 --- a/chromium/ash/resources/BUILD.gn +++ b/chromium/ash/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn index 24b5307bac3..8ff57af7f45 100644 --- a/chromium/ash/resources/vector_icons/BUILD.gn +++ b/chromium/ash/resources/vector_icons/BUILD.gn @@ -1,5 +1,5 @@ -# Copyright 2016 The Chromium Authors.All rights reserved. -# Use of this source code is governed by a BSD - style license that can be +# Copyright 2016 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/chrome_build.gni") @@ -65,8 +65,10 @@ aggregate_vector_icons("ash_vector_icons") { "check.icon", "check_circle.icon", "chevron_down.icon", - "chevron_right.icon", + "chevron_down_small.icon", + "chevron_right_small.icon", "chevron_up.icon", + "chevron_up_small.icon", "clipboard.icon", "clipboard_empty.icon", "clipboard_launcher_inner.icon", @@ -102,6 +104,7 @@ aggregate_vector_icons("ash_vector_icons") { "hide_closed_caption.icon", "holding_space.icon", "holding_space_download.icon", + "holding_space_refresh.icon", "hollow_check_circle.icon", "ime_menu_emoticon.icon", "ime_menu_microphone.icon", @@ -196,7 +199,9 @@ aggregate_vector_icons("ash_vector_icons") { "notification_center_settings.icon", "notification_charging_usb_c.icon", "notification_chromevox.icon", + "notification_help_app.icon", "notification_keyboard.icon", + "notification_linux.icon", "notification_low_power_charger.icon", "notification_monitor_warning.icon", "notification_multi_device_setup.icon", @@ -242,8 +247,10 @@ aggregate_vector_icons("ash_vector_icons") { "phone_hub_silence_phone.icon", "pin_request_lock.icon", "pinned.icon", + "privacy_indicators.icon", "privacy_indicators_camera.icon", "privacy_indicators_microphone.icon", + "privacy_indicators_screen_share.icon", "privacy_screen.icon", "remove_outline.icon", "reorder.icon", @@ -394,6 +401,7 @@ aggregate_vector_icons("ash_vector_icons") { "system_power_button_menu_feedback.icon", "system_power_button_menu_lock_screen.icon", "system_power_button_menu_power_off.icon", + "system_power_button_menu_restart.icon", "system_power_button_menu_sign_out.icon", "system_tray_accessibility.icon", "system_tray_app_badging.icon", @@ -422,6 +430,7 @@ aggregate_vector_icons("ash_vector_icons") { "toolbar_position_top_center.icon", "touch_calibration_complete_check.icon", "touch_calibration_hand.icon", + "touch_indicator.icon", "trash_can.icon", "tray_action_new_lock_screen_note.icon", "two_files.icon", @@ -480,6 +489,8 @@ aggregate_vector_icons("ash_vector_icons") { "visibility.icon", "visibility_off.icon", "wallpaper.icon", + "wm_mode_off.icon", + "wm_mode_on.icon", "zoom_in.icon", "zoom_out.icon", ] diff --git a/chromium/ash/search_box/BUILD.gn b/chromium/ash/search_box/BUILD.gn index ab4422ea58c..7ccbf13a275 100644 --- a/chromium/ash/search_box/BUILD.gn +++ b/chromium/ash/search_box/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/services/BUILD.gn b/chromium/ash/services/BUILD.gn index b17963bc1a8..563bb9fcdaa 100644 --- a/chromium/ash/services/BUILD.gn +++ b/chromium/ash/services/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -16,15 +16,10 @@ assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") source_set("unit_tests") { testonly = true deps = [ - "//ash/services/cellular_setup:unit_tests", - "//ash/services/chromebox_for_meetings/public/cpp:unit_tests", "//ash/services/device_sync:unit_tests", "//ash/services/ime:services_unittests", "//ash/services/ime:unit_tests", "//ash/services/multidevice_setup:unit_tests", - "//ash/services/nearby/public/cpp:unit_tests", - "//ash/services/quick_pair:unit_tests", "//ash/services/secure_channel:unit_tests", - "//chromeos/services/machine_learning/public/cpp:ash_unit_tests", ] } diff --git a/chromium/ash/services/cellular_setup/BUILD.gn b/chromium/ash/services/cellular_setup/BUILD.gn deleted file mode 100644 index d24726acb46..00000000000 --- a/chromium/ash/services/cellular_setup/BUILD.gn +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash) - -static_library("cellular_setup") { - sources = [ - "cellular_setup_base.cc", - "cellular_setup_base.h", - "cellular_setup_impl.cc", - "cellular_setup_impl.h", - "ota_activator.cc", - "ota_activator.h", - "ota_activator_impl.cc", - "ota_activator_impl.h", - ] - - deps = [ - "//ash/services/cellular_setup/public/mojom", - "//base", - "//chromeos/ash/components/dbus/shill", - "//chromeos/ash/components/network", - "//dbus", - "//url", - ] -} - -static_library("esim_manager") { - sources = [ - "esim_manager.cc", - "esim_manager.h", - "esim_mojo_utils.cc", - "esim_mojo_utils.h", - "esim_profile.cc", - "esim_profile.h", - "euicc.cc", - "euicc.h", - ] - - deps = [ - "//ash/constants", - "//ash/services/cellular_setup/public/mojom", - "//base", - "//chromeos/ash/components/dbus/hermes", - "//chromeos/ash/components/network", - "//components/device_event_log", - "//components/qr_code_generator", - "//components/user_manager", - "//dbus", - ] -} - -component("in_process_esim_manager") { - sources = [ - "in_process_esim_manager.cc", - "in_process_esim_manager.h", - ] - - defines = [ "IS_IN_PROCESS_ESIM_MANAGER_IMPL" ] - - public_deps = [ - "//ash/services/cellular_setup/public/mojom", - "//mojo/public/cpp/bindings", - ] - - deps = [ - ":esim_manager", - "//ash/services/cellular_setup/public/mojom", - "//dbus", - "//mojo/public/cpp/bindings", - ] -} - -static_library("test_support") { - testonly = true - - sources = [ - "esim_test_utils.cc", - "esim_test_utils.h", - "fake_ota_activator.cc", - "fake_ota_activator.h", - ] - - public_deps = [ "//ash/services/cellular_setup/public/mojom:mojom_headers" ] - - deps = [ - ":cellular_setup", - "//ash/services/cellular_setup/public/cpp:test_support", - "//ash/services/cellular_setup/public/mojom", - "//base", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "cellular_setup_impl_unittest.cc", - "cellular_setup_service_unittest.cc", - "esim_manager_unittest.cc", - "esim_profile_unittest.cc", - "esim_test_base.cc", - "esim_test_base.h", - "euicc_unittest.cc", - "ota_activator_impl_unittest.cc", - ] - - deps = [ - ":cellular_setup", - ":esim_manager", - ":test_support", - "//ash/services/cellular_setup/public/cpp:test_support", - "//base", - "//base/test:test_support", - "//chromeos/ash/components/dbus/hermes", - "//chromeos/ash/components/dbus/shill", - "//chromeos/ash/components/network:test_support", - "//components/user_manager:test_support", - "//dbus", - "//testing/gmock", - "//testing/gtest", - ] -} diff --git a/chromium/ash/services/cellular_setup/public/cpp/BUILD.gn b/chromium/ash/services/cellular_setup/public/cpp/BUILD.gn deleted file mode 100644 index a617c26e4ca..00000000000 --- a/chromium/ash/services/cellular_setup/public/cpp/BUILD.gn +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash) - -static_library("test_support") { - testonly = true - - sources = [ - "esim_manager_test_observer.cc", - "esim_manager_test_observer.h", - "fake_activation_delegate.cc", - "fake_activation_delegate.h", - "fake_carrier_portal_handler.cc", - "fake_carrier_portal_handler.h", - "fake_cellular_setup.cc", - "fake_cellular_setup.h", - ] - - public_deps = [ - "//ash/services/cellular_setup", - "//ash/services/cellular_setup/public/mojom", - ] - - deps = [ "//base" ] -} diff --git a/chromium/ash/services/cellular_setup/public/mojom/BUILD.gn b/chromium/ash/services/cellular_setup/public/mojom/BUILD.gn deleted file mode 100644 index c98023237d5..00000000000 --- a/chromium/ash/services/cellular_setup/public/mojom/BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash) - -mojom("mojom") { - sources = [ - "cellular_setup.mojom", - "esim_manager.mojom", - ] - - public_deps = [ - "//mojo/public/mojom/base", - "//url/mojom:url_mojom_gurl", - ] -} diff --git a/chromium/ash/services/cellular_setup/public/mojom/cellular_setup.mojom b/chromium/ash/services/cellular_setup/public/mojom/cellular_setup.mojom deleted file mode 100644 index 6e95841bebd..00000000000 --- a/chromium/ash/services/cellular_setup/public/mojom/cellular_setup.mojom +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module ash.cellular_setup.mojom; - -import "url/mojom/url.mojom"; - -// The CellularSetup interface provides an API for clients to set up a cellular -// connection on this device. Specifically, the StartActivation() function -// provides an interface for activating a cold SIM (i.e., one which is not fully -// set up with a mobile carrier). Clients of the CellularSetup interface are -// expected to render carrier-provided UIs which allow users to sign into a -// carrier portal and pay for mobile service. - -// Status of the carrier portal; in this context, the portal refers to a website -// rendered by a carrier which allows the user to activate a cellular -// connection. -enum CarrierPortalStatus { - kPortalFailedToLoad, - kPortalLoadedWithoutPaidUser, - kPortalLoadedButErrorOccurredDuringPayment, - kPortalLoadedAndUserCompletedPayment, -}; - -// Potential results for an activation attempt. These values are persisted to -// logs. Entries should not be renumbered and numeric values should never be -// reused. -enum ActivationResult { - // Activation was initiated successfully by the attempt. Note that the device - // may not be fully activated by the time this result occurs since the process - // completes in the background. - kSuccessfullyStartedActivation = 0, - - // Activation was unnecessary because the SIM is already activated. - kAlreadyActivated = 1, - - // Activation failed (e.g., due to a failure within Shill). - kFailedToActivate = 2, -}; - -// Metadata corresponding to a cellular activation request which allows the -// carrier to associate the current device with an account with the carrier. -struct CellularMetadata { - // URL to which users should be directed in order to complete the - // carrier-based payment flow. - url.mojom.Url payment_url; - - // Data to be passed to the payment portal to verify the SIM. - string payment_post_data; - - // Human-readable name of the carrier associated with the SIM card. - string carrier; - - // The Mobile Equipment Identifier, a unique identifier for mobile devices. - string meid; - - // The International Mobile Equipment Identity, another unique identifier. - string imei; - - // The Mobile Directory Number, the carrier-provided number used to reach a - // mobile device. - string mdn; -}; - -// Interface for handling changes to the carrier payment portal; used by the UI -// to notify CellularSetup of updates to the portal. -interface CarrierPortalHandler { - OnCarrierPortalStatusChange(CarrierPortalStatus status); -}; - -// Delegate which is notified when activation starts and finishes. Used by the -// service to notify the UI of the state of the activation flow. -interface ActivationDelegate { - // Called when the flow has started; only called when the device is eligible - // for activation (i.e., has a valid, unactivated SIM). - OnActivationStarted(CellularMetadata metadata); - - // Called when the flow has finished, regardless of success or failure. - OnActivationFinished(ActivationResult result); -}; - -// Interface used to set up a cellular connection. -interface CellularSetup { - // Entrypoint to the activation flow. If |delegate| becomes disconnected - // during the activation process, activation is cancelled. - StartActivation(pending_remote<ActivationDelegate> delegate) - => (pending_remote<CarrierPortalHandler> observer); -}; diff --git a/chromium/ash/services/cellular_setup/public/mojom/esim_manager.mojom b/chromium/ash/services/cellular_setup/public/mojom/esim_manager.mojom deleted file mode 100644 index d42f2eae3cb..00000000000 --- a/chromium/ash/services/cellular_setup/public/mojom/esim_manager.mojom +++ /dev/null @@ -1,155 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module ash.cellular_setup.mojom; - -import "mojo/public/mojom/base/string16.mojom"; - -// Represents the current state of an ESimProfile -enum ProfileState { - kPending, // Profile is not installed on the device. - kInstalling, // Profile is being installed. - kInactive, // Profile is installed but inactive. - kActive, // Profile is installed and active. -}; - -// Result codes for ESimProfile installation. -enum ProfileInstallResult { - kSuccess, // Installation succeeded. - kFailure, // Installation failed. - kErrorNeedsConfirmationCode, // Installation requires a valid - // confirmation code. - kErrorInvalidActivationCode, // Given activation code is invalid. -}; - -// Result code for operations on Euicc and ESimProfile. -enum ESimOperationResult { - kSuccess, // Operation succeeded. - kFailure // Operation failed. -}; - -// Properties for an Euicc object. -struct EuiccProperties { - // A 32 digit unique id for the Euicc. - string eid; - // Boolean indicating whether the Euicc is active or not. - bool is_active; -}; - -// Properties of an eSIM profile object. -struct ESimProfileProperties { - // EID of the Euicc in which this profile is installed or available for - // installation. - string eid; - // A 19-20 character long numeric id that uniquely identifies this profile. - string iccid; - // Service provider’s name for this profile. e.g. “Verizon Plan 1” - mojo_base.mojom.String16 name; - // A user configurable nickname for this profile. e.g. “My Personal SIM” - mojo_base.mojom.String16 nickname; - // Name of the service provider. e.g. “Verizon Wireless” - mojo_base.mojom.String16 service_provider; - // State of the profile - ProfileState state; - // An alphanumeric code that can be used to install this profile. - string activation_code; -}; - -// Represents a QRCode image. -struct QRCode { - // Width and height (which are equal) of the generated QR Code image in - // number of tiles. - uint8 size; - // QRCode image data. This is an array of bytes representing tiles in the - // QRCode in row major order. Values can be 0 or 1 where 1 indicates that - // the corresponding tile should be filled. - array<uint8> data; -}; - -// ESimManagerObserver is implemented by any module that -// needs to observe changes to the eSIM module. -interface ESimManagerObserver { - // Called when a new Euicc is added or removed from the system. - OnAvailableEuiccListChanged(); - - // Called when a new eSIM profile is added to or removed from - // the |euicc|. - OnProfileListChanged(pending_remote<Euicc> euicc); - - // Called when an Euicc object's active state changes. - OnEuiccChanged(pending_remote<Euicc> euicc); - - // Called when an eSIM profile’s state or nickname changes. - OnProfileChanged(pending_remote<ESimProfile> profile); -}; - -// ESimManager interface provides eSIM management methods. An instance -// of this interface is owned in the browser process in Ash. It will be -// accessed from WebUI or System UI code in the browser process. -interface ESimManager { - // Adds an observer for eSIM changes. - AddObserver(pending_remote<ESimManagerObserver> observer); - - // Returns a list of Euiccs available on the device. - GetAvailableEuiccs() => (array<pending_remote<Euicc>> euiccs); -}; - -// Euicc interface represents an EUICC (Embedded Universal Integrated -// Circuit Card) hardware available on the device and provides operations -// on the EUICC. Each Euicc may have multiple ESimProfiles installed/pending -// under it. -interface Euicc { - // Returns properties struct for this Euicc. - GetProperties() => (EuiccProperties properties); - - // Returns a list of all profiles installed or pending on this Euicc. - // An empty list could be returned if there are no installed or pending - // profiles on the Euicc. - GetProfileList() => (array<pending_remote<ESimProfile>> profiles); - - // Starts a request for pending profiles for this Euicc from SMDS. - // Returns a status indicating result of the operation. This - // method updates the pending profiles list before succeeding. This method - // is used to allow the user to explicit trigger a request to check for - // new profiles that may have been pushed to SMDS. - RequestPendingProfiles() => (ESimOperationResult result); - - // Installs a profile with given |activation_code| and |confirmation_code| - // on this Euicc. Returns the result code and ESimProfile that was just - // installed. A non-success result code is returned in case of errors. - // |activation_code| may be obtained from ESimProfiles retrieved with a - // previous call to RequestPendingProfiles or directly from the user through - // a QR code. If |confirmation_code| is required but not supplied or if it’s - // invalid then a kErrorNeedsConfirmationCode result is returned. The - // |is_install_via_qr_code| value should indicate whether the activation_code - // was entered manually or scanned from QR Code. - InstallProfileFromActivationCode(string activation_code, - string confirmation_code, - bool is_install_via_qr_code) => - (ProfileInstallResult result, pending_remote<ESimProfile>? profile); - - // Returns a QR Code image representing the EID of this Euicc. A null value is - // returned if the QR Code could not be generated. - GetEidQRCode() => (QRCode? qr_code); -}; - -// ESimProfile interface represents and eSIM profile and provides operations -// on the profile. -interface ESimProfile { - // Returns properties struct for this ESimProfile. - GetProperties() => (ESimProfileProperties properties); - - // Installs this eSIM profile with given |confirmation_code|. - // A non success result code is returned in case of errors. - InstallProfile(string confirmation_code) => (ProfileInstallResult result); - - // Uninstalls this eSIM profile. Returns the result code for the operation. - UninstallProfile() => (ESimOperationResult result); - - // Sets a nickname for this eSIM profile. Returns the result code for the - // operation. - SetProfileNickname(mojo_base.mojom.String16 nickname) => - (ESimOperationResult result); -}; - diff --git a/chromium/ash/services/chromebox_for_meetings/public/cpp/BUILD.gn b/chromium/ash/services/chromebox_for_meetings/public/cpp/BUILD.gn deleted file mode 100644 index 4a2d12624d8..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/cpp/BUILD.gn +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromebox_for_meetings/buildflags.gni") -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") - -source_set("cpp") { - sources = [ - "appid_util.cc", - "appid_util.h", - ] - deps = [ - "//ash/services/chromebox_for_meetings/public/mojom", - "//base", - ] - if (is_cfm) { - sources += [ - "service_connection.cc", - "service_connection.h", - ] - deps += [ "//chromeos/ash/components/dbus/chromebox_for_meetings" ] - } -} - -if (is_cfm) { - source_set("test_support") { - testonly = true - sources = [ - "fake_service_connection.cc", - "fake_service_connection.h", - "fake_service_context.cc", - "fake_service_context.h", - ] - deps = [ - ":cpp", - "//ash/services/chromebox_for_meetings/public/mojom", - "//base", - "//chromeos/ash/components/dbus/chromebox_for_meetings", - "//mojo/public/cpp/bindings", - ] - } -} - -source_set("unit_tests") { - testonly = true - sources = [ "appid_util_unittest.cc" ] - deps = [ - ":cpp", - "//ash/services/chromebox_for_meetings/public/mojom", - "//base/test:test_support", - "//mojo/core/embedder", - "//mojo/public/cpp/bindings", - "//testing/gtest", - ] - if (is_cfm) { - sources += [ "service_connection_unittest.cc" ] - deps += [ - ":test_support", - "//chromeos/ash/components/dbus/chromebox_for_meetings", - ] - } -} diff --git a/chromium/ash/services/chromebox_for_meetings/public/mojom/BUILD.gn b/chromium/ash/services/chromebox_for_meetings/public/mojom/BUILD.gn deleted file mode 100644 index 46bb89b0599..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/mojom/BUILD.gn +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromebox_for_meetings/buildflags.gni") -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash") - -mojom("mojom") { - sources = [ "cfm_service_manager.mojom" ] - - public_deps = [ "//mojo/public/mojom/base" ] - - if (is_cfm) { - sources += [ - "cfm_browser.mojom", - "cfm_network_settings.mojom", - "external_display_brightness.mojom", - "meet_devices_diagnostics.mojom", - "meet_devices_info.mojom", - "meet_devices_logger.mojom", - ] - public_deps += [ "//chromeos/ash/services/cros_healthd/public/mojom" ] - } -} diff --git a/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom b/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom deleted file mode 100644 index 4b06cc77c9c..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_browser.mojom +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Next MinVersion: 1 - -module chromeos.cfm.mojom; - -// Interface defined by chromium specifically for the ChromeboxForMeetings -// platform to leverage required chromium services/APIS. -interface CfmBrowser { - // Returns a persistent representation of active FieldTrial information, which - // can be used to replicate the current state of the experimentation framework - // in another process. - GetVariationsData@0()=>(string field_trial_parameters, - string field_trial_states, - string enabled_features, - string disabled_features); - - // Returns detailed information on running processes as well system-wide - // graphics driver memory (-1 if error). - GetMemoryDetails@1()=>(array<ProcessData> process_data, - int64 gpu_memory_size); -}; - -struct ExtensionData { - string name@0; - string version@1; - string id@2; - string hashed_id@3; - string description@4; -}; - -// The data pertaining to an individual browser process. -struct ProcessMemoryInformation { - // The process id. - int32 pid@0; - - // The process version - string version@1; - - // The process product name. - string product_name@2; - - // The number of processes which this memory represents. - int32 num_processes@3; - - // If this is a child process of Chrome, what type (i.e. plugin) it is. - string process_type@4; - - // Number of open file descriptors in this process. - int32 num_open_fds@5; - - // Maximum number of file descriptors that can be opened in this process. - int32 open_fds_soft_limit@6; - - // If this is a renderer process, what type it is. - string renderer_type@7; - - // A collection of titles used, i.e. for a tab it'll show all the page titles. - array<string> titles@8; - - // Consistent memory metric for all platforms. - int32 private_memory_footprint_kb@9; - - // iff process is process_type extension add additional info - array<ExtensionData> extension_info@10; -}; - -// Browser Process Information. -struct ProcessData { - // The qualified name of the browser - string name@0; - - // The name of the process running - string process_name@1; - - // List of child processes. - array<ProcessMemoryInformation> processes@2; -}; diff --git a/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_network_settings.mojom b/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_network_settings.mojom deleted file mode 100644 index 5ee11c3dc28..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_network_settings.mojom +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Next MinVersion: 1 - -module chromeos.cfm.mojom; - -// Interface for opening a network settings dialog. -interface CfmNetworkSettings { - // Displays the dialog if not already open. - ShowDialog@0(); -}; diff --git a/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom b/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom deleted file mode 100644 index d906d9faf0a..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/mojom/cfm_service_manager.mojom +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// See ash/services/chromebox_for_meetings/public/mojom/README.md before -// changing this file. -// -// Next MinVersion: 1 - -module chromeos.cfm.mojom; - -// Interface used to store details regarding hotline mojom disconnect. -interface DisconnectReason { - // Indicates that the reason for disconnection is unknown - // Code for unknown disconnect reason - const int32 kUnknownCode = 0; - // Message for unknown disconnect reason - const string kUnknownMessage = "unknown"; - - // Indicates that the disconnect occurred due to the service being unavailable. - // Code for unavailable service - const int32 kServiceUnavailableCode = 1; - // Message for unavailable service - const string kServiceUnavailableMessage = "Hotline Disabled"; - - // Indicates that the disconnect occurred due to a disabled finch experiment. - // Code for disabled finch experiment - const int32 kFinchDisabledCode = 2; - // Message for disabled finch experiment - const string kFinchDisabledMessage = "Finch Disabled"; -}; - -// Interface used during bootstrapping in order to -// 1. Add services to the primary interface broker. -// 2. Obtain handle/s to the |CfmServiceRegistry| -interface CfmServiceContext { - // Request to add an |adaptor_remote| by its |interface_name|, - // to the service registry assuming it's |interface_name| is allowlisted. - // Note: |interface_name| MUST be the interface name, i.e. Interface::Name_ - ProvideAdaptor@0( - string interface_name, - pending_remote<CfmServiceAdaptor> adaptor_remote) => (bool success); - - // Attempt to bind the |receiver_pipe| of an intended mojo::Receiver - // to a remote service that is internally identified as |interface_name| - // Note: |interface_name| MUST be the interface name, i.e. Interface::Name_ - RequestBindService@1( - string interface_name, - handle<message_pipe> receiver_pipe) => (bool success); -}; - -// Interface implemented by interfaces that want to be registered with the Cfm -// interface broker. Services that intend to accept incoming connections MUST -// implement this interface and facilitate multiple connections, through the use -// of a BindingSet. The broker calls BindService when a bind request for -// interface comes. -interface CfmServiceAdaptor { - // Called by the CfmServiceRegistry to bind a |receiver_pipe| of an - // intended mojo::Receiver to a service's implementation. For example, - // this method should bind |receiver_pipe| to the interface Foo implemented by - // FooImpl assuming FooImpl also implements the CfmServiceAdaptor. - // Note: Ideally services should handle multiple clients (i.e BindingSet) - // unless explicitly stated. - OnBindService@0(handle<message_pipe> receiver_pipe); -}; diff --git a/chromium/ash/services/chromebox_for_meetings/public/mojom/external_display_brightness.mojom b/chromium/ash/services/chromebox_for_meetings/public/mojom/external_display_brightness.mojom deleted file mode 100644 index cc032af2df6..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/mojom/external_display_brightness.mojom +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Next MinVersion: 1 - -module chromeos.cfm.mojom; - -// Interface for controlling external displays with ambient light sensors. -interface ExternalDisplayBrightness { - - // Enables/disables ALS-based brightness control on all external displays with - // ambient light sensors. - SetExternalDisplayALSBrightness@0(bool enabled); - - // Gets whether or not the ALS-based brightness control feature is enabled. - GetExternalDisplayALSBrightness@1() => (bool enabled); - - // Sets the brightness of all external displays with ambient light sensors to - // |percent|. This method does nothing if ALS-based brightness control is - // enabled. - SetExternalDisplayBrightnessPercent@2(double percent); - - // Gets the brightness of all external displays with ambient light sensors. - // This method returns -1.0 if ALS-based brightness control is enabled. - GetExternalDisplayBrightnessPercent@3() => (double percent); -}; diff --git a/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_diagnostics.mojom b/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_diagnostics.mojom deleted file mode 100644 index 9996f7069c6..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_diagnostics.mojom +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module chromeos.cfm.mojom; - -import "chromeos/ash/services/cros_healthd/public/mojom/cros_healthd_probe.mojom"; - -// Interface defined by chromium specifically for the ChromeboxForMeetings -// platform to query system diagnostics of devices in the fleet. -interface MeetDevicesDiagnostics { - // Retrieves and forwards device telemetry from cros_healthd. - GetCrosHealthdTelemetry@0() - => (chromeos.cros_healthd.mojom.TelemetryInfo telemetry); - - // Retrieves information about a specific process from cros_healthd. - GetCrosHealthdProcessInfo@1(uint32 pid) - => (chromeos.cros_healthd.mojom.ProcessResult process_info); -}; diff --git a/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_info.mojom b/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_info.mojom deleted file mode 100644 index 2f02304ad9e..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_info.mojom +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module chromeos.cfm.mojom; - -// Interface defined by chromium specifically for the ChromeboxForMeetings -// platform to query relevant device system and policy information. -interface MeetDevicesInfo { - // Adds a DevicePolicyObserver for policy info change events. - // Returns unique id which can be used to remove the observer - // Note: Initial update using available policy if applicable upon registration - AddDeviceSettingsObserver@0(pending_remote<PolicyInfoObserver> observer); - - // Request device policy information - // Note: will return nullptr on failure to query policy information - GetPolicyInfo@1()=>(PolicyInfo? info); - - // Request device system information - GetSysInfo@2()=>(SysInfo info); - - // Request Machine Statistics Information - // Note: Will return nullptr on failure to query machine statistics info - GetMachineStatisticsInfo@3()=>(MachineStatisticsInfo? info); -}; - -// Inteface for an observer to monitor device policy changes -interface PolicyInfoObserver { - // Called whenever a devices policy change event is recieved. - OnPolicyInfoChange@0(PolicyInfo info); -}; - -// Device policy information -struct PolicyInfo { - // PolicyData::Timestamp - // Timestamp in milliseconds (javatime) - // From DMServer when server issued response (Java time) - int64 timestamp_ms@0; - - // PolicyData::DirectoryApiId - string? device_id@1; - - // PolicyData::ServiceAccountIdentity - string? service_account_email_address@2; - - // PolicyData::GaiaId - int64 service_account_gaia_id@3; - - // PolicyData::DeviceID - string? cros_device_id@4; - - // ChromeDeviceSettingsProto::AutoUpdateSettings::CohortHint - string? cohort_hint@5; - - // ChromeDeviceSettingsProto::ReleaseChannel::ReleaseChannelDelegated - bool release_channel_delegated@6; -}; - -// Basic system information -struct SysInfo { - // Returns the kernel version - string kernel_version@0; - - // /etc/lsb-release: CHROMEOS_RELEASE_VERSION - string? release_version@1; - - // /etc/lsb-release: CHROMEOS_RELEASE_BUILD_TYPE - string? release_build_type@2; - - // /etc/lsb-release: CHROMEOS_RELEASE_TRACK - string? release_track@3; - - // /etc/lsb-release: CHROMEOS_RELEASE_CHROME_MILESTONE - string? release_milestone@4; - - // The full browser version number - string? browser_version@5; - - // Returns the current channel name - string? channel_name@6; - - // /etc/lsb-release: CHROMEOS_RELEASE_BOARD - string? release_board@7; -}; - -struct MachineStatisticsInfo { - // Returns hwid (http://sites/chromeos-hwid) - string? hwid; -}; diff --git a/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_logger.mojom b/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_logger.mojom deleted file mode 100644 index 1495b6a45eb..00000000000 --- a/chromium/ash/services/chromebox_for_meetings/public/mojom/meet_devices_logger.mojom +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module chromeos.cfm.mojom; - -// Indicates the upload priority of the enqueued payload. -[Extensible] -enum EnqueuePriority { - // |kHigh| priority indicates the payload requires immediate upload - // Ex: Security Events, Failed Installation, High Disc Usage - kHigh = 0, - // |kMedium| priority indicates the payload does not require immediate upload - // Ex: telemetry such as uptime, power usage, etc - kMedium = 1, - // |kLow| priority indicates the payload can be large and can be uploaded with - // a slower frequency. - // Ex: Logs, Feedback - kLow = 2, -}; - -// A error code that matches values defined in google/rpc/code.proto -[Extensible] -enum LoggerErrorCode { - kOk = 0, - kCancelled = 1, - kUnknown = 2, - kInvalidArgument = 3, - kDeadlineExceeded = 4, - kNotFound = 5, - kAlreadyExists = 6, - kPermissionDenied = 7, - kUnauthenticated = 16, - kResourceExhausted = 8, - kFailedPrecondition = 9, - kAborted = 10, - kOutOfRange = 11, - kUnimplemented = 12, - kInternal = 13, - kUnavailable = 14, - kDataloss = 15, -}; - -// Provides information regarding the logger error status. -struct LoggerStatus { - LoggerErrorCode code@0; - - // A debug message with more information about the error. This string is not - // intended to be shown to the user. - string message@1; -}; - -// Indicates the current state of the |MeetDevicesLogger| service. -[Extensible] -enum LoggerState { - // |kDisabled| state indicates the service has been disabled - kDisabled = 0, - // |kReadyForRequests| state indicates the service can enqueue records. - kReadyForRequests = 1, - // |kUninitialized| state indicates the service has yet to be fully configured - kUninitialized = 2, -}; - -// Allows clients to be notified of changes in |MeetDevicesLogger| -interface LoggerStateObserver { - // Called when this observer is first added to |MeetDevicesLogger| service - // as well as whenever the status of |LoggerState| is updated. - OnNotifyState@0(LoggerState state); -}; - -// Interface used to enqueue CfM Telemetry data, using the Chrome Reporting API -interface MeetDevicesLogger { - // Allows a user to |Enqueue| a serialised message for delivery, using the, - // report handler specified by |Destination::MEET_DEVICE_TELEMETRY|. - Enqueue@0(string record, EnqueuePriority priority)=>(LoggerStatus status); - - // Adds a |LoggerStateObserver| to monitor |MeetDevicesLogger|'s state. - AddStateObserver@1(pending_remote<LoggerStateObserver> pending_observer); -}; diff --git a/chromium/ash/services/device_sync/BUILD.gn b/chromium/ash/services/device_sync/BUILD.gn index 840fa9b59c5..adefc16ddf0 100644 --- a/chromium/ash/services/device_sync/BUILD.gn +++ b/chromium/ash/services/device_sync/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -151,21 +151,21 @@ static_library("device_sync") { public_deps = [ ":feature_status_change", - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/services/device_sync/public/mojom", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", "//components/signin/public/identity_manager", "//services/network/public/cpp", ] deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/constants", "//ash/services/device_sync/proto:util", "//ash/services/device_sync/public/cpp", "//ash/services/device_sync/public/mojom", "//base", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", "//chromeos/ash/components/network", "//components/gcm_driver", "//components/prefs", @@ -263,8 +263,8 @@ source_set("stub_device_sync") { deps = [ ":device_sync", - "//ash/components/multidevice:stub_multidevice_util", "//base", + "//chromeos/ash/components/multidevice:stub_multidevice_util", ] } @@ -312,8 +312,6 @@ source_set("unit_tests") { ":device_sync", ":feature_status_change", ":test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", "//ash/constants", "//ash/services/device_sync/proto:test_support", "//ash/services/device_sync/proto:util", @@ -325,6 +323,8 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//chromeos/ash/components/dbus:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice:test_support", "//chromeos/ash/components/network", "//chromeos/ash/components/network:test_support", "//components/gcm_driver:test_support", diff --git a/chromium/ash/services/device_sync/proto/BUILD.gn b/chromium/ash/services/device_sync/proto/BUILD.gn index b4ae53f69bc..b97b8a1d090 100644 --- a/chromium/ash/services/device_sync/proto/BUILD.gn +++ b/chromium/ash/services/device_sync/proto/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/services/device_sync/public/cpp/BUILD.gn b/chromium/ash/services/device_sync/public/cpp/BUILD.gn index 857cdfe9ccb..310cb7585b8 100644 --- a/chromium/ash/services/device_sync/public/cpp/BUILD.gn +++ b/chromium/ash/services/device_sync/public/cpp/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -20,12 +20,12 @@ source_set("cpp") { ] public_deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/constants", "//ash/services/device_sync:feature_status_change", "//ash/services/device_sync/public/mojom", "//base", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", ] deps = [ "//mojo/public/cpp/bindings" ] @@ -38,12 +38,12 @@ source_set("prefs") { ] public_deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/constants", "//ash/services/device_sync:feature_status_change", "//ash/services/device_sync/public/mojom", "//base", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", ] deps = [ @@ -78,12 +78,12 @@ source_set("unit_tests") { ":cpp", ":prefs", ":test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", "//ash/services/device_sync", "//ash/services/device_sync:test_support", "//base", "//base/test:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice:test_support", "//components/gcm_driver:test_support", "//components/prefs:test_support", "//components/signin/public/identity_manager:test_support", diff --git a/chromium/ash/services/device_sync/public/mojom/BUILD.gn b/chromium/ash/services/device_sync/public/mojom/BUILD.gn index 228f51071fa..f4a0e7144e3 100644 --- a/chromium/ash/services/device_sync/public/mojom/BUILD.gn +++ b/chromium/ash/services/device_sync/public/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,10 +11,13 @@ mojom("mojom") { sources = [ "device_sync.mojom" ] public_deps = [ - "//ash/components/multidevice/mojom", + "//chromeos/ash/components/multidevice/mojom", "//mojo/public/mojom/base", ] + webui_module_path = + "chrome://resources/mojo/ash/services/device_sync/public/mojom" + cpp_typemaps = [ { types = [ diff --git a/chromium/ash/services/device_sync/public/mojom/device_sync.mojom b/chromium/ash/services/device_sync/public/mojom/device_sync.mojom index 27863f6b612..2398b2deb8b 100644 --- a/chromium/ash/services/device_sync/public/mojom/device_sync.mojom +++ b/chromium/ash/services/device_sync/public/mojom/device_sync.mojom @@ -1,10 +1,10 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2017 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. module ash.device_sync.mojom; -import "ash/components/multidevice/mojom/multidevice_types.mojom"; +import "chromeos/ash/components/multidevice/mojom/multidevice_types.mojom"; import "mojo/public/mojom/base/time.mojom"; // Denotes the outcome of an HTTP request, where results like kBadRequest map diff --git a/chromium/ash/services/ime/BUILD.gn b/chromium/ash/services/ime/BUILD.gn index d2fe81d49c8..cc18a394ee7 100644 --- a/chromium/ash/services/ime/BUILD.gn +++ b/chromium/ash/services/ime/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/services/ime/public/cpp/BUILD.gn b/chromium/ash/services/ime/public/cpp/BUILD.gn index 59cc5b5456b..8d846795ead 100644 --- a/chromium/ash/services/ime/public/cpp/BUILD.gn +++ b/chromium/ash/services/ime/public/cpp/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -31,6 +31,8 @@ source_set("rulebased") { "rulebased/def/fa.h", "rulebased/def/gu_phone.cc", "rulebased/def/gu_phone.h", + "rulebased/def/hi_inscript.cc", + "rulebased/def/hi_inscript.h", "rulebased/def/km.cc", "rulebased/def/km.h", "rulebased/def/kn_phone.cc", diff --git a/chromium/ash/services/ime/public/cpp/shared_lib/BUILD.gn b/chromium/ash/services/ime/public/cpp/shared_lib/BUILD.gn index 1497489ef96..ca3349deb62 100644 --- a/chromium/ash/services/ime/public/cpp/shared_lib/BUILD.gn +++ b/chromium/ash/services/ime/public/cpp/shared_lib/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/services/ime/public/mojom/BUILD.gn b/chromium/ash/services/ime/public/mojom/BUILD.gn index 1857a4f9548..1bb799a6277 100644 --- a/chromium/ash/services/ime/public/mojom/BUILD.gn +++ b/chromium/ash/services/ime/public/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/services/ime/public/mojom/connection_factory.mojom b/chromium/ash/services/ime/public/mojom/connection_factory.mojom index d15564f514a..c8379dc8d85 100644 --- a/chromium/ash/services/ime/public/mojom/connection_factory.mojom +++ b/chromium/ash/services/ime/public/mojom/connection_factory.mojom @@ -1,4 +1,4 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. +// Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/services/ime/public/mojom/ime_service.mojom b/chromium/ash/services/ime/public/mojom/ime_service.mojom index adf2723f373..fee660f36c1 100644 --- a/chromium/ash/services/ime/public/mojom/ime_service.mojom +++ b/chromium/ash/services/ime/public/mojom/ime_service.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/services/ime/public/mojom/input_engine.mojom b/chromium/ash/services/ime/public/mojom/input_engine.mojom index 4260dd5843c..83e48e97d6e 100644 --- a/chromium/ash/services/ime/public/mojom/input_engine.mojom +++ b/chromium/ash/services/ime/public/mojom/input_engine.mojom @@ -1,4 +1,4 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/services/ime/public/mojom/input_method.mojom b/chromium/ash/services/ime/public/mojom/input_method.mojom index 5fea38abe21..f1f9b39fd39 100644 --- a/chromium/ash/services/ime/public/mojom/input_method.mojom +++ b/chromium/ash/services/ime/public/mojom/input_method.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/services/ime/public/mojom/input_method_host.mojom b/chromium/ash/services/ime/public/mojom/input_method_host.mojom index d20601e57f0..23ae235757c 100644 --- a/chromium/ash/services/ime/public/mojom/input_method_host.mojom +++ b/chromium/ash/services/ime/public/mojom/input_method_host.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/services/multidevice_setup/BUILD.gn b/chromium/ash/services/multidevice_setup/BUILD.gn index 94b6b0da583..25481442758 100644 --- a/chromium/ash/services/multidevice_setup/BUILD.gn +++ b/chromium/ash/services/multidevice_setup/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -60,8 +60,6 @@ static_library("multidevice_setup") { ] deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/constants", "//ash/services/device_sync/proto:util", "//ash/services/device_sync/public/cpp", @@ -75,6 +73,8 @@ static_library("multidevice_setup") { "//ash/services/secure_channel/public/cpp/client", "//ash/services/secure_channel/public/mojom", "//base", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", "//components/pref_registry", "//components/prefs:prefs", "//components/session_manager/core", @@ -123,9 +123,9 @@ static_library("test_support") { deps = [ ":multidevice_setup", - "//ash/components/multidevice", "//ash/services/multidevice_setup/public/mojom", "//base", + "//chromeos/ash/components/multidevice", "//testing/gmock", "//testing/gtest", ] @@ -154,8 +154,6 @@ source_set("unit_tests") { deps = [ ":multidevice_setup", ":test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", "//ash/constants", "//ash/services/device_sync/public/cpp:test_support", "//ash/services/multidevice_setup/public/cpp:oobe_completion_tracker", @@ -166,6 +164,8 @@ source_set("unit_tests") { "//ash/services/secure_channel/public/cpp/client:test_support", "//base", "//base/test:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice:test_support", "//components/session_manager/core", "//components/sync_preferences:test_support", "//testing/gmock", diff --git a/chromium/ash/services/multidevice_setup/proto/BUILD.gn b/chromium/ash/services/multidevice_setup/proto/BUILD.gn index fefde276af8..1f4063864e7 100644 --- a/chromium/ash/services/multidevice_setup/proto/BUILD.gn +++ b/chromium/ash/services/multidevice_setup/proto/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/services/multidevice_setup/public/cpp/BUILD.gn b/chromium/ash/services/multidevice_setup/public/cpp/BUILD.gn index 5af24e77d8d..93cda20df6a 100644 --- a/chromium/ash/services/multidevice_setup/public/cpp/BUILD.gn +++ b/chromium/ash/services/multidevice_setup/public/cpp/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -15,10 +15,10 @@ source_set("cpp") { ] public_deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/services/multidevice_setup/public/mojom", "//base", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", "//mojo/public/cpp/bindings", ] } @@ -135,13 +135,13 @@ source_set("unit_tests") { deps = [ ":cpp", ":test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", "//ash/services/multidevice_setup", "//ash/services/multidevice_setup:test_support", "//ash/services/multidevice_setup/public/mojom", "//base", "//base/test:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice:test_support", "//testing/gtest", ] } diff --git a/chromium/ash/services/multidevice_setup/public/mojom/BUILD.gn b/chromium/ash/services/multidevice_setup/public/mojom/BUILD.gn index 0ddcfc47181..6e2e111b82a 100644 --- a/chromium/ash/services/multidevice_setup/public/mojom/BUILD.gn +++ b/chromium/ash/services/multidevice_setup/public/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,4 +11,7 @@ mojom("mojom") { sources = [ "multidevice_setup.mojom" ] public_deps = [ "//ash/services/device_sync/public/mojom" ] + + webui_module_path = + "chrome://resources/mojo/ash/services/multidevice_setup/public/mojom" } diff --git a/chromium/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom b/chromium/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom index 6048243f1a8..75bb24cd393 100644 --- a/chromium/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom +++ b/chromium/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom @@ -1,10 +1,10 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. module ash.multidevice_setup.mojom; -import "ash/components/multidevice/mojom/multidevice_types.mojom"; +import "chromeos/ash/components/multidevice/mojom/multidevice_types.mojom"; import "ash/services/device_sync/public/mojom/device_sync.mojom"; // Enumeration of possible opt-in entry points for Phone Hub Camera Roll @@ -60,7 +60,7 @@ enum HostStatus { // those in c/b/r/s/chromeos/multidevice_page/multidevice_constants.js, // and all features should be reflected in the FeatureStateMaps generated in // ash/services/multidevice_setup/public/cpp/multidevice_setup_client.cc -// and chrome/browser/ui/webui/settings/chromeos/multidevice_handler.cc +// and chrome/browser/ui/webui/settings/ash/multidevice_handler.cc enum Feature { kBetterTogetherSuite = 0, kInstantTethering = 1, diff --git a/chromium/ash/services/nearby/public/cpp/BUILD.gn b/chromium/ash/services/nearby/public/cpp/BUILD.gn deleted file mode 100644 index e9dade9fff4..00000000000 --- a/chromium/ash/services/nearby/public/cpp/BUILD.gn +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash) - -static_library("cpp") { - sources = [ - "nearby_client_uuids.cc", - "nearby_client_uuids.h", - "nearby_process_manager.cc", - "nearby_process_manager.h", - ] - - deps = [ - "//ash/services/nearby/public/mojom", - "//base", - "//components/keyed_service/core", - ] -} - -# Create separate build target to avoid circular dependencies with -# //ash/services/nearby/public/mojom -static_library("tcp_server_socket_port") { - sources = [ - "tcp_server_socket_port.cc", - "tcp_server_socket_port.h", - ] - - deps = [ "//base" ] -} - -static_library("test_support") { - testonly = true - - sources = [ - "fake_firewall_hole.h", - "fake_firewall_hole_factory.cc", - "fake_firewall_hole_factory.h", - "fake_nearby_process_manager.cc", - "fake_nearby_process_manager.h", - "fake_tcp_connected_socket.cc", - "fake_tcp_connected_socket.h", - "fake_tcp_server_socket.cc", - "fake_tcp_server_socket.h", - "fake_tcp_socket_factory.cc", - "fake_tcp_socket_factory.h", - "mock_nearby_connections.cc", - "mock_nearby_connections.h", - "mock_nearby_process_manager.cc", - "mock_nearby_process_manager.h", - "mock_nearby_sharing_decoder.cc", - "mock_nearby_sharing_decoder.h", - ] - - deps = [ - ":cpp", - ":tcp_server_socket_port", - "//ash/services/nearby/public/mojom", - "//base", - "//base/test:test_support", - "//mojo/public/cpp/bindings/", - "//services/network/public/mojom", - "//testing/gmock", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ "tcp_server_socket_port_unittest.cc" ] - - deps = [ - ":tcp_server_socket_port", - "//base", - "//testing/gtest", - ] -} diff --git a/chromium/ash/services/nearby/public/mojom/BUILD.gn b/chromium/ash/services/nearby/public/mojom/BUILD.gn deleted file mode 100644 index d731e886fec..00000000000 --- a/chromium/ash/services/nearby/public/mojom/BUILD.gn +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash) - -mojom("nearby_share_target_types") { - sources = [ "nearby_share_target_types.mojom" ] -} - -mojom("mojom") { - sources = [ - "firewall_hole.mojom", - "nearby_connections.mojom", - "nearby_connections_types.mojom", - "nearby_decoder.mojom", - "nearby_decoder_types.mojom", - "sharing.mojom", - "tcp_server_socket_port.mojom", - "tcp_socket_factory.mojom", - "webrtc.mojom", - "webrtc_signaling_messenger.mojom", - ] - - public_deps = [ - ":nearby_share_target_types", - "//chromeos/services/network_config/public/mojom", - "//device/bluetooth/public/mojom:deprecated_experimental_interfaces", - "//mojo/public/mojom/base", - "//sandbox/policy/mojom", - "//services/network/public/mojom", - "//url/mojom:url_mojom_gurl", - ] - - cpp_typemaps = [ - { - types = [ - { - mojom = "location.nearby.connections.mojom.LogSeverity" - cpp = "location::nearby::api::LogMessage::Severity" - }, - ] - traits_headers = [ "nearby_connections_mojom_traits.h" ] - traits_sources = [ "nearby_connections_mojom_traits.cc" ] - traits_deps = [ "//third_party/nearby:platform_api_types" ] - }, - { - types = [ - { - mojom = "sharing.mojom.TcpServerSocketPort" - cpp = "::ash::nearby::TcpServerSocketPort" - }, - ] - traits_headers = [ "tcp_server_socket_port_mojom_traits.h" ] - traits_sources = [ "tcp_server_socket_port_mojom_traits.cc" ] - traits_deps = - [ "//ash/services/nearby/public/cpp:tcp_server_socket_port" ] - }, - ] -} diff --git a/chromium/ash/services/nearby/public/mojom/firewall_hole.mojom b/chromium/ash/services/nearby/public/mojom/firewall_hole.mojom deleted file mode 100644 index af0df39d4be..00000000000 --- a/chromium/ash/services/nearby/public/mojom/firewall_hole.mojom +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module sharing.mojom; - -import "ash/services/nearby/public/mojom/tcp_server_socket_port.mojom"; - -// Represents the firewall hole owned by the browser process. Consumer closes -// the firewall hole by destroying the remote endpoint. -interface FirewallHole {}; - -// Opens a port in the Chrome OS system firewall. A firewall hole is necessary -// for a TCP server socket to accept connections. -interface FirewallHoleFactory { - // Opens a TCP firewall hole on |port|. The firewall hole's lifetime mirrors - // that of |firewall_hole|. Returns null on failure. - OpenFirewallHole(TcpServerSocketPort port) - => (pending_remote<FirewallHole>? firewall_hole); -}; diff --git a/chromium/ash/services/nearby/public/mojom/nearby_connections.mojom b/chromium/ash/services/nearby/public/mojom/nearby_connections.mojom deleted file mode 100644 index 1abe867ca92..00000000000 --- a/chromium/ash/services/nearby/public/mojom/nearby_connections.mojom +++ /dev/null @@ -1,357 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module location.nearby.connections.mojom; - -import "ash/services/nearby/public/mojom/nearby_connections_types.mojom"; -import "mojo/public/mojom/base/file.mojom"; -import "mojo/public/mojom/base/read_only_file.mojom"; - -// Listener invoked during endpoint discovery. This interface is used by the -// browser process to listen for remote endpoints status during endpoint -// discovery. -interface EndpointDiscoveryListener { - // Called when a remote endpoint is discovered. - // - // endpoint_id - The ID of the remote endpoint that was discovered. - // info - Further information about the remote endpoint which may - // include the human readable name if it is advertising in high - // visibility mode. - OnEndpointFound(string endpoint_id, DiscoveredEndpointInfo info); - - // Called when a remote endpoint is no longer discoverable; only called for - // endpoints that previously had been passed to OnEndpointFound(). - // - // endpoint_id - The ID of the remote endpoint that was lost. - OnEndpointLost(string endpoint_id); -}; - -// Listener for lifecycle events associated with a connection to a remote -// endpoint. Methods in this interface are called from utiltiiy process, and is -// used by the browser process to listen for connection status associated with -// remote endpoints. -interface ConnectionLifecycleListener { - // A basic encrypted channel has been created between this device and the - // the remote endpoint. Both sides are now asked if they wish to accept or - // reject the connection before any data can be sent over this channel. - // - // Optionally, caller can verify if this device is connected to the correct - // remote before accepting the connection. Typically this involves showing - // ConnectionInfo::authentication_token on both devices and having the users - // manually compare and confirm. Both devices are given an identical - // authentication token. - // - // Call NearbyConnections::AcceptConnection() to accept the connection, or - // NearbyConnections::RejectConnection() to close the connection. - // - // endpoint_id - The identifier for the remote endpoint. - // info - Other relevant information about the connection. - OnConnectionInitiated(string endpoint_id, ConnectionInfo info); - - // Called after both sides have accepted the connection. - // - // endpoint_id - The identifier for the remote endpoint. - OnConnectionAccepted(string endpoint_id); - - // Called when either side rejected the connection. - // Call NearbyConnections::DisconnectFromEndpoint() to terminate connection. - // - // endpoint_id - The identifier for the remote endpoint. - // status - The result of the connection. Valid values are - // Status::kSuccess and Status::kConnectionRejected}. - OnConnectionRejected(string endpoint_id, Status status); - - // Called when a remote endpoint is disconnected or has become unreachable. - // At this point service (re-)discovery may start again. - // - // endpoint_id - The identifier for the remote endpoint. - OnDisconnected(string endpoint_id); - - // Called when the connection's available bandwidth has changed. - // - // endpoint_id - The identifier for the remote endpoint. - // quality - The new quality for the connection. - OnBandwidthChanged(string endpoint_id, Medium medium); -}; - -// Listener for payload status. Methods in this interface are called from -// utiltiiy process, and is used by the browser process to listen for payload -// status associated with remote endpoints. -interface PayloadListener { - // Called when a Payload is received from a remote endpoint. Depending on the - // type of the Payload, all of the data may or may not have been received at - // the time of this call. Use OnPayloadTransferUpdate() to get updates on the - // status of the data received. - // - // endpoint_id - The identifier for the remote endpoint that sent the - // payload. - // payload - The Payload object received. - OnPayloadReceived(string endpoint_id, Payload payload); - - // Called with progress information about an active Payload transfer, either - // incoming or outgoing. - // - // endpoint_id - The identifier for the remote endpoint that is sending or - // receiving this payload. - // update - The PayloadTransferUpdate structure describing the status of - // the transfer. - OnPayloadTransferUpdate(string endpoint_id, PayloadTransferUpdate update); -}; - -// Main interface to control the NearbyConnections library. Implemented in a -// sandboxed process. This interface is used by the browser process to connect -// to remote devices and send / receive raw data packets. Parsing of those -// packets is not part of the NearbyConnections library and is done in a -// separate interface. -interface NearbyConnections { - // Starts advertising an endpoint with the specified service ID. Only one - // advertisement can be active at a time and calling StartAdvertising() while - // advertising will fail and return Status::kAlreadyAdvertising. - // - // service_id - An identifier to advertise your app to other endpoints. - // This can be an arbitrary string, so long as it uniquely - // identifies your service. A good default is to use your - // app's package name. - // endpoint_info - The local info to be broadcasted. May contain a human - // readable name to appear on other devices if broadcasting - // in high visibility mode. - // options - The options for advertising. - // listener - An interface notified when remote endpoints request a - // connection to this endpoint. - // Possible return values include: - // Status::kSuccess if advertising started successfully. - // Status::kAlreadyAdvertising if the app is already advertising. - // Status::kOutOfOrderApiCall if the app is currently connected to remote - // endpoints; call StopAllEndpoints first. - StartAdvertising(string service_id, array<uint8> endpoint_info, - AdvertisingOptions options, - pending_remote<ConnectionLifecycleListener> listener) - => (Status status); - - // Stops advertising the local endpoint. Should be called after calling - // StartAdvertising, as soon as the application no longer needs to advertise - // itself or goes inactive. Payloads can still be sent to connected - // endpoints after advertising ends. - // - // service_id - Identifier used in the preceding StartAdvertising() call. - // - // Possible return values include: - // Status::kSuccess returned after advertising got stopped. - StopAdvertising(string service_id) => (Status status); - - // Starts discovery for remote endpoints with the specified service ID. - // - // service_id - The ID for the service to be discovered, as specified in - // the corresponding call to StartAdvertising. - // options - The options for discovery. - // listener - An interface notified when a remote endpoint is discovered. - // Possible status codes include: - // Status::kSuccess if discovery started successfully. - // Status::kAlreadyDiscovering if the app is already - // discovering the specified service. - // Status::kOutOfOrderApiCall if the app is currently - // connected to remote endpoints; call StopAllEndpoints first. - StartDiscovery(string service_id, DiscoveryOptions options, - pending_remote<EndpointDiscoveryListener> listener) - => (Status status); - - // Stops discovery for remote endpoints, after a previous call to - // StartDiscovery, when the client no longer needs to discover endpoints or - // goes inactive. Payloads can still be sent to connected endpoints after - // discovery ends. - // - // service_id - Identifier used in the preceding StartDiscovery() call. - // - // Possible return values include: - // Status::kSuccess returned after discovery got stopped. - StopDiscovery(string service_id) => (Status status); - - // Attempts an out-of-band discovery from a previous call to StartDiscovery() - // which included the is_out_of_band_discovery option. If successful, this - // call results in the EndpointDiscoveryListener::OnEndpointFound() callback - // corresponding to the |listener| parameter to StartDiscovery() being - // invoked. - // - // Before invoking this function, StartDiscovery() should have been called - // with DiscoveryOptions that set |is_out_of_band_connection| to true. - // After this call completes, it is safe to invoke StopDiscovery(). - // - // service_id - Identifier used in the preceding - // StartDiscovery() call. - // endpoint_id - String of length 4 which should be randomly - // generated to uniquely identify this request. - // Note that there is only a single caller of - // this function, so collisions are highly - // unlikely since this field is randomly- - // generated. - // endpoint_info - Describes the injected endpoint; will be - // passed to the OnEndpointFound() callback. - // Should uniquely identify this request so - // that clients can identify the injected - // endpoint. Must be >0 bytes and <131 bytes. - // remote_bluetooth_mac_address - MAC address of the injected device. - // Possible return values include: - // Status::kSuccess if endpoint injection was attempted. - // Status::kError if |remote_bluetooth_mac_address| is malformed. - // Status::kOutOfOrderApiCall if the app is not discovering. - InjectBluetoothEndpoint( - string service_id, - string endpoint_id, - array<uint8> endpoint_info, - array<uint8, 6> remote_bluetooth_mac_address) => (Status status); - - // Sends a request to connect to a remote endpoint. - // - // service_id - Service ID used to discover the endpoint. - // endpoint_info - The local info including a human readable name to appear on - // the remote endpoint. - // endpoint_id - The identifier for the remote endpoint to which a - // connection request will be sent. Should match the value - // provided in a call to - // EndpointDiscoveryListener::OnEndpointFound(). - // options - The options for connection. - // listener - An interface notified when the remote endpoint sends a - // response to the connection request. - // Possible return values include: - // Status::kSuccess if the connection request was sent. - // Status::kAlreadyConnectedToEndpoint if the app already - // has a connection to the specified endpoint. - // Status::kBluetoothError if we failed to connect because of an - // issue with Bluetooth. - // Status::kWifiLanError if we failed to connect because of an - // issue with WiFi. - // Status::kError if we failed to connect for any other reason. - RequestConnection(string service_id, - array<uint8> endpoint_info, - string endpoint_id, - ConnectionOptions options, - pending_remote<ConnectionLifecycleListener> listener) - => (Status status); - - // Accepts a connection to a remote endpoint. This method must be called - // before Payloads can be exchanged with the remote endpoint. - // - // service_id - Service ID used to bootstrap the connection. - // endpoint_id - The identifier for the remote endpoint. Should match the - // value provided in a call to - // ConnectionsLifecycleListener::OnConnectionInitiated(). - // listener - An interface for payloads exchanged with the remote endpoint. - // Possible return values include: - // Status::kSuccess if the connection request was accepted. - // Status::kAlreadyConnectedToEndpoint if the app already as a connection - // to the specified endpoint. - // Status::kOutOfOrderApiCall if - // ConnectionsLifecycleListener::OnConnectionInitiated() has not been - // called for the |endpoint_id|. - AcceptConnection(string service_id, - string endpoint_id, - pending_remote<PayloadListener> listener) - => (Status status); - - // Rejects a connection to a remote endpoint. - // - // service_id - Service ID used to bootstrap the connection. - // endpoint_id - The identifier for the remote endpoint. Should match the - // value provided in a call to - // ConnectionsLifecycleListener::OnConnectionInitiated(). - // Possible return values include: - // Status::kSuccess if the connection request was rejected. - // Status::kAlreadyConnectedToEndpoint if the app already has a connection - // to the specified endpoint. - // Status::kOutOfOrderApiCall if - // ConnectionsLifecycleListener::OnConnectionInitiated() has not been - // called for the |endpoint_id|. - RejectConnection(string service_id, string endpoint_id) => (Status status); - - // Disconnects from a remote endpoint. Payloads can no longer be sent - // to or received from the endpoint after this method is called. - // - // service_id - Service ID used to bootstrap the connection. - // endpoint_id - The identifier for the remote endpoint to disconnect from. - // Possible return values include: - // Status::kSuccess disconnected successfully. - DisconnectFromEndpoint(string service_id, - string endpoint_id) => (Status status); - - // Sends a Payload to a list of remote endpoints. Payloads can only be sent to - // remote endpoints once a notice of connection acceptance has been delivered - // via ConnectionsLifecycleListener::OnConnectionResult(). - // - // service_id - Service ID used to bootstrap the connection. - // endpoint_ids - Array of remote endpoint identifiers for to which the - // payload should be sent. - // payload - The Payload to be sent. - // Possible return values include: - // Status::kOutOfOrderApiCall if the device has not first performed - // advertisement or discovery (to set the Strategy). - // Status::kEndpointUnknown if there's no active (or pending) connection to - // the remote endpoint. - // Status::kSuccess if none of the above errors occurred. Note that this - // indicates that Nearby Connections will attempt to send the Payload, - // but not that the send has successfully completed yet. Errors might - // still occur during transmission (and at different times for different - // endpoints), and will be delivered via - // PayloadListener::OnPayloadTransferUpdate(). - SendPayload(string service_id, - array<string> endpoint_ids, - Payload payload) => (Status status); - - // Cancels a Payload currently in-flight to or from remote endpoint(s). - // - // service_id - Service ID used to bootstrap the connection. - // - // payload_id - The identifier for the Payload to be cancelled. - // Possible return values include: - // Status::kSuccess if the payload got cancelled. - CancelPayload(string service_id, int64 payload_id) => (Status status); - - // Disconnects from, and removes all traces of, all connected and/or - // discovered endpoints. As a side effect of this call, both - // StopAdvertising and StopDiscovery are invoked. After calling - // StopAllEndpoints, no further operations with remote endpoints will - // be possible until a new call to one of StartAdvertising or - // StartDiscovery. - // - // service_id - Service ID used to discover endpoints. - // - // Possible return values include: - // Status::kSuccess disconnected from all endpoints successfully. - StopAllEndpoints(string service_id) => (Status status); - - // Sends a request to initiate connection bandwidth upgrade. - // - // Important note: Bandwidth upgrades may expose stable identifiers, - // which are only safe to expose after the caller has verified - // the sender's identity. If the caller is already performing - // high-visibility advertising (and thus already leaking the device - // name), then calling this method introduces no further privacy - // leaks -- in fact, the caller should consider instead requesting - // to auto-upgrade bandwidth when invoking StartAdvertising(). - // - // service_id - Service ID used to discover the endpoint. - // endpoint_id - The identifier for the remote endpoint which will be - // switching to a higher connection data rate and possibly - // different wireless protocol. On success, calls - // ConnectionLifecycleListener::OnBandwidthChanged. - // Possible return values include: - // Status::kSuccess if upgraded successfully. - InitiateBandwidthUpgrade(string service_id, - string endpoint_id) => (Status status); - - // Register a pair of input and output file for handling incoming file - // payload associated with |payload_id_|, which is determined by feature - // specific design. The |input_file| should be opened for read access, and - // |output_file| should be opened for write access. - // - // service_id - Service ID used to discover the endpoint. - // - // Possible return values include: - // Status::kSuccess if file is registered successfully. - // Status::kError if file is not opened correctly. - RegisterPayloadFile(string service_id, - int64 payload_id, - mojo_base.mojom.ReadOnlyFile input_file, - mojo_base.mojom.File output_file) - => (Status status); -}; diff --git a/chromium/ash/services/nearby/public/mojom/nearby_connections_types.mojom b/chromium/ash/services/nearby/public/mojom/nearby_connections_types.mojom deleted file mode 100644 index e18b85af7ed..00000000000 --- a/chromium/ash/services/nearby/public/mojom/nearby_connections_types.mojom +++ /dev/null @@ -1,288 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module location.nearby.connections.mojom; - -import "device/bluetooth/public/mojom/uuid.mojom"; -import "mojo/public/mojom/base/file.mojom"; -import "mojo/public/mojom/base/time.mojom"; - -// Generic result status of NearbyConnections API calls. These values are -// persisted to logs. Entries should not be renumbered and numeric values should -// never be reused. -enum Status { - // The operation was successful. - kSuccess = 0, - // The operation failed, without any more information. - kError = 1, - // The app called an API method out of order (i.e. another method is expected - // to be called first). - kOutOfOrderApiCall = 2, - // The app already has active operations (advertising, discovering, or - // connected to other devices) with another Strategy. Stop these operations on - // the current Strategy before trying to advertise or discover with a new - // Strategy. - kAlreadyHaveActiveStrategy = 3, - // The app is already advertising; call StopAdvertising() before trying to - // advertise again. - kAlreadyAdvertising = 4, - // The app is already discovering; call StopDiscovery() before trying to - // discover again. - kAlreadyDiscovering = 5, - // An attempt to read from/write to a connected remote endpoint failed. If - // this occurs repeatedly, consider invoking DisconnectFromEndpoint(). - kEndpointIOError = 6, - // An attempt to interact with a remote endpoint failed because it's unknown - // to us -- it's either an endpoint that was never discovered, or an endpoint - // that never connected to us (both of which are indicative of bad input from - // the client app). - kEndpointUnknown = 7, - // The remote endpoint rejected the connection request. - kConnectionRejected = 8, - // The app is already connected to the specified endpoint. Multiple - // connections to a remote endpoint cannot be maintained simultaneously. - kAlreadyConnectedToEndpoint = 9, - // The remote endpoint is not connected; messages cannot be sent to it. - kNotConnectedToEndpoint = 10, - // There was an error trying to use the device's Bluetooth capabilities. - kBluetoothError = 11, - // There was an error trying to use the device's Bluetooth Low Energy - // capabilities. - kBleError = 12, - // There was an error trying to use the device's WiFi capabilities. - kWifiLanError = 13, - // An attempt to interact with an in-flight Payload failed because it's - // unknown to us. - kPayloadUnknown = 14, -}; - -// Information about a connection that is being initiated. -struct ConnectionInfo { - // A short human-readable authentication token that has been given to both - // devices. - string authentication_token; - // The raw (significantly longer) version of the authentication token of - // authentication_token -- this is intended for headless authentication, - // typically on devices with no output capabilities, where the authentication - // is purely programmatic and does not have the luxury of human intervention. - array<uint8> raw_authentication_token; - // Information that represents the remote device. - array<uint8> endpoint_info; - // True if the connection request was initiated from a remote device. False if - // this device was the one to try and initiate the connection. - bool is_incoming_connection; -}; - -// Information about an endpoint when it's discovered. -struct DiscoveredEndpointInfo { - // Information advertised by the remote endpoint. - array<uint8> endpoint_info; - // The ID of the service advertised by the remote endpoint. - string service_id; -}; - -// The Strategy to be used when discovering or advertising to Nearby devices. -// The Strategy defines the connectivity requirements for the device, and the -// topology constraints of the connection. -enum Strategy { - // Peer-to-peer strategy that supports an M-to-N, or cluster-shaped, - // connection topology. In other words, this enables connecting amorphous - // clusters of devices within radio range (~100m), where each device can both - // initiate outgoing connections to M other devices and accept incoming - // connections from N other devices. - kP2pCluster, - // Peer-to-peer strategy that supports a 1-to-N, or star-shaped, connection - // topology. In other words, this enables connecting devices within radio - // range (~100m) in a star shape, where each device can, at any given time, - // play the role of either a hub (where it can accept incoming connections - // from N other devices), or a spoke (where it can initiate an outgoing - // connection to a single hub), but not both. - kP2pStar, - // Peer-to-peer strategy that supports a 1-to-1 connection topology. In other - // words, this enables connecting to a single device within radio range - // (~100m). This strategy will give the absolute highest bandwidth, but will - // not allow multiple connections at a time. - kP2pPointToPoint, -}; - -// A selection of on/off toggles to define a set of allowed mediums. -struct MediumSelection { - // Whether Bluetooth should be allowed. - bool bluetooth; - // Whether BLE should be allowed. - bool ble; - // Whether WebRTC should be allowed. - bool web_rtc; - // Whether WiFi LAN should be allowed. - bool wifi_lan; -}; - -// Options for a call to NearbyConnections::StartAdvertising(). -struct AdvertisingOptions { - // The strategy to use for advertising. Must match the strategy used in - // DiscoveryOptions for remote devices to see this advertisement. - Strategy strategy; - // Describes which mediums are allowed to be used for advertising. Note that - // allowing an otherwise unsupported medium is ok. Only the intersection of - // allowed and supported mediums will be used to advertise. - MediumSelection allowed_mediums; - // By default, this option is true. If false, we will not attempt to upgrade - // the bandwidth until a call to InitiateBandwidthUpgrade() is made. - bool auto_upgrade_bandwidth = true; - // By default, this option is true. If false, restrictions on topology will be - // ignored. This allows you treat all strategies as kP2pCluster (N to M), - // although bandwidth will be severely throttled if you don't maintain the - // original topology. When used in conjunction with auto_upgrade_bandwidth, - // you can initially connect as a kP2pCluster and then trim connections until - // you match kP2pStar or kP2pPointToPoint before upgrading the bandwidth. - bool enforce_topology_constraints = true; - // By default, this option is false. If true, this allows listening on - // incoming Bluetooth Classic connections while BLE advertising. - bool enable_bluetooth_listening = false; - // By default, this option is false. If true, this allows listening on - // incoming Web RTC connections while advertising. - bool enable_webrtc_listening = false; - // Optional. If set, BLE advertisements will be in their "fast advertisement" - // form, use this UUID, and non-connectable; if empty, BLE advertisements - // will otherwise be normal and connectable. - bluetooth.mojom.UUID fast_advertisement_service_uuid; -}; - -// Options for a call to NearbyConnections::StartDiscovery(). -struct DiscoveryOptions { - // The strategy to use for discovering. Must match the strategy used in - // AdvertisingOptions in order to see advertisements. - Strategy strategy; - // Describes which mediums are allowed to be used for scanning/discovery. Note - // that allowing an otherwise unsupported medium is ok. Only the intersection - // of allowed and supported mediums will be used to scan. - MediumSelection allowed_mediums; - // The fast advertisement service id to scan for in BLE. - bluetooth.mojom.UUID? fast_advertisement_service_uuid; - // Whether this connection request skips over the normal discovery flow to - // inject discovery information synced outside the Nearby Connections library. - // Intended to be used in conjunction with InjectEndpoint(). - bool is_out_of_band_connection = false; -}; - -// Options for a call to NearbyConnections::RequestConnection(). -struct ConnectionOptions { - // Describes which mediums are allowed to be used for connection. Note that - // allowing an otherwise unsupported medium is ok. Only the intersection of - // allowed and supported mediums will be used to connect. - MediumSelection allowed_mediums; - // Bluetooth MAC address of remote device in byte format. - array<uint8, 6>? remote_bluetooth_mac_address; - // How often to send a keep alive message on the channel. An unspecified or - // negative value will result in the Nearby Connections default of 5 seconds - // being used. - mojo_base.mojom.TimeDelta? keep_alive_interval; - // The connection will time out if no message is received on the channel - // for this length of time. An unspecified or negative value will result in - // the Nearby Connections default of 30 seconds being used. - mojo_base.mojom.TimeDelta? keep_alive_timeout; -}; - -// A simple payload containing raw bytes. -struct BytesPayload { - // The bytes of this payload. - array<uint8> bytes; -}; - -// A file payload representing a file. -struct FilePayload { - // The file to which this payload points to. When sending this payload, the - // NearbyConnections library reads from this file. When receiving a file - // payload it writes to this file. - mojo_base.mojom.File file; -}; - -// Union of all supported payload types. -union PayloadContent { - // A Payload consisting of a single byte array. - BytesPayload bytes; - // A Payload representing a file on the device. - FilePayload file; -}; - -// A Payload sent between devices. Payloads sent with a particular content type -// will be received as that same type on the other device, e.g. the content for -// a Payload of type BytesPayload must be received by reading from the bytes -// field returned by Payload::content::bytes. -struct Payload { - // A unique identifier for this payload. Generated by the sender of the - // payload and used to keep track of the transfer progress. - int64 id; - // The content of this payload which is one of multiple types, see - // PayloadContent for all possible types. - PayloadContent content; -}; - -// The status of the payload transfer at the time of this update. -enum PayloadStatus { - // The payload transfer has completed successfully. - kSuccess, - // The payload transfer failed. - kFailure, - // The payload transfer is still in progress. - kInProgress, - // The payload transfer has been canceled. - kCanceled, -}; - -// Describes the status for an active Payload transfer, either incoming or -// outgoing. Delivered to PayloadListener::OnPayloadTransferUpdate. -struct PayloadTransferUpdate { - // The ID for the payload related to this update. Clients should match this - // with Payload::id. - int64 payload_id; - // The status of this payload transfer. Always starts with kInProgress and - // ends with one of kSuccess, kFailure or kCanceled. - PayloadStatus status; - // The total expected bytes of this transfer. - uint64 total_bytes; - // The number of bytes transferred so far. - uint64 bytes_transferred; -}; - -// Bandwidth quality of a connection. -enum BandwidthQuality { - // Unknown connection quality. - kUnknown, - // Low quality, e.g. connected via NFC or BLE. - kLow, - // Medium quality, e.g. connected via Bluetooth Classic. - kMedium, - // High quality, e.g. connected via WebRTC or WiFi LAN. - kHigh, -}; - -// These values are persisted to logs. Entries should not be renumbered and -// numeric values should never be reused. -enum Medium { - kUnknown = 0, - kMdns = 1, - kBluetooth = 2, - kWifiHotspot = 3, - kBle = 4, - kWifiLan = 5, - kWifiAware = 6, - kNfc = 7, - kWifiDirect = 8, - kWebRtc = 9, - kBleL2Cap = 10, - kUsb = 11, -}; - -// Log severity levels. This is passed as a member of -// NearbyConnectionsDependencies to set the minimum log level in the Nearby -// Connections library. Entries should be kept in sync with the values in -// location::nearby::api::LogMessage::Severity. -enum LogSeverity { - kVerbose = -1, - kInfo = 0, - kWarning = 1, - kError = 2, - kFatal = 3, -}; diff --git a/chromium/ash/services/nearby/public/mojom/nearby_decoder.mojom b/chromium/ash/services/nearby/public/mojom/nearby_decoder.mojom deleted file mode 100644 index 85a48af1b71..00000000000 --- a/chromium/ash/services/nearby/public/mojom/nearby_decoder.mojom +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module sharing.mojom; - -import "ash/services/nearby/public/mojom/nearby_decoder_types.mojom"; -import "mojo/public/mojom/base/time.mojom"; - -// Decode raw data into structured. Runs in the sharing utility process. -// Called by the NearbySharingService running in the browser process. -interface NearbySharingDecoder { - // Decode the advertisement. The advertisement is sent by a device in - // the receiver mode, and may be advertising to everyone or only - // known contacts. - DecodeAdvertisement(array<uint8> data) => (Advertisement? advertisement); - - // Decode a payload frame. The frame may be one of several types, and is - // used by NearbySharingService to manage the connections protocol. - DecodeFrame(array<uint8> data) => (Frame? frame); -}; diff --git a/chromium/ash/services/nearby/public/mojom/nearby_decoder_types.mojom b/chromium/ash/services/nearby/public/mojom/nearby_decoder_types.mojom deleted file mode 100644 index 1e4be3cd229..00000000000 --- a/chromium/ash/services/nearby/public/mojom/nearby_decoder_types.mojom +++ /dev/null @@ -1,232 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module sharing.mojom; - -import "ash/services/nearby/public/mojom/nearby_share_target_types.mojom"; -import "mojo/public/mojom/base/time.mojom"; - -// An advertisement send by a device in receiving mode. -struct Advertisement { - // Random bytes that were used as salt during encryption of public - // certificate metadata. - array<uint8, 2> salt; - - // An encrypted symmetric key that was used to encrypt public certificate - // metadata. The key can be decrypted using |salt| and the corresponding - // public certificate's secret/authenticity key. - array<uint8, 14> encrypted_metadata_key; - - // Type of the device. - nearby_share.mojom.ShareTargetType device_type; - - // If present, the device is visible to everyone rather than contacts only. - string? device_name; -}; - -// A frame used when sending messages over the wire. -union Frame { - // A frame of one possible type. - V1Frame v1; -}; - -// The possible types of a frame. -union V1Frame { - IntroductionFrame introduction; - - ConnectionResponseFrame connection_response; - - PairedKeyEncryptionFrame paired_key_encryption; - - PairedKeyResultFrame paired_key_result; - - CertificateInfoFrame certificate_info; - - CancelFrame cancel_frame; -}; - -// An introduction packet sent by the sending side. Contains a list of files -// they'd like to share. -struct IntroductionFrame { - // Description of a file to be sent. - array<FileMetadata> file_metadata; - - // Description of text to be sent. - array<TextMetadata> text_metadata; - - // The required app package to open the content. May be null. - string? required_package; - - // Credentials of the wifi network. - array<WifiCredentialsMetadata> wifi_credentials_metadata; -}; - -// File metadata. Does not include the actual bytes of the shared file -// in transit. -struct FileMetadata { - enum Type { - kUnknown = 0, - kImage = 1, - kVideo = 2, - kApp = 3, - kAudio = 4 - }; - - // The human readable name of this file (eg. 'Cookbook.pdf'). - string name; - - // The type of file (eg. 'kImage' from 'dog.jpg'). Specifying a type helps - // provide a richer experience on the receiving side. - Type type = kUnknown; - - // The FILE payload id that will be sent as a follow up containing the actual - // bytes of the file. - int64 payload_id; - - // The total size of the file. - uint64 size; - - // The mimeType of file (eg. 'image/jpeg' from 'dog.jpg'). Specifying a - // mimeType helps provide a richer experience on receiving side. - string mime_type = "application/octet-stream"; - - // A uuid for the attachment. Should be unique across all attachments. - int64 id; -}; - -// Text metadata. Does not include the actual bytes of the text in transit. -struct TextMetadata { - enum Type { - kUnknown = 0, - kText = 1, - // Open with browsers. - kUrl = 2, - // Open with map apps. - kAddress = 3, - // Dial. - kPhoneNumber = 4 - }; - - // The title of the text content. - string text_title; - - // The type of text (phone number, url, address, or plain text). - Type type = kUnknown; - - // The BYTE payload id that will be sent as a follow up containing the actual - // bytes of the text. - int64 payload_id; - - // The size of the text content. - uint64 size; - - // A uuid for the attachment. Should be unique across all attachments. - int64 id; -}; - -// Wifi credentails metadata. Describes the wifi network to be used by the -// connection. -struct WifiCredentialsMetadata { - enum SecurityType { - kUnknownSecurityType = 0, - kOpen = 1, - kWpaPsk = 2, - kWep = 3 - }; - - // The Wifi network name. This will be sent in introduction. - string ssid; - - // The security type of network (OPEN, WPA_PSK, WEP). - SecurityType security_type = kUnknownSecurityType; - - // The BYTE payload id that will be sent as a follow up containing the - // password. - int64 payload_id; - - // A uuid for the attachment. Should be unique across all attachments. - int64 id; -}; - -// A response packet sent by the receiving side. Accepts or rejects the list of -// files. -struct ConnectionResponseFrame { - enum Status { - kUnknown = 0, - kAccept = 1, - kReject = 2, - kNotEnoughSpace = 3, - kUnsupportedAttachmentType = 4, - kTimedOut = 5 - }; - - // The receiving side's response. - Status status; -}; - -// A paired key encryption packet sent between devices, contains signed data. -struct PairedKeyEncryptionFrame { - // The encrypted data in byte array format. - // The size of byte array generated by signing should be 72. - array<uint8> signed_data; - - // The HMAC 256 based HKDF of UKEY2 authentication key with - // authenticity_key salt. - // The size of bytes of secret id after hash should be 6. - array<uint8> secret_id_hash; -}; - -// A paired key verification result packet sent between devices. -struct PairedKeyResultFrame { - enum Status { - kUnknown = 0, - kSuccess = 1, - kFail = 2, - kUnable = 3 - }; - - // The verification result. - Status status; -}; - -// A package containing certificate info to be shared to remote device offline. -struct CertificateInfoFrame { - // The public certificates to be shared with remote devices. - array<PublicCertificate> public_certificate; -}; - -// A public certificate from the local device. -struct PublicCertificate { - // The unique id of the public certificate. - array<uint8> secret_id; - - // A bytes representation of a Secret Key owned by contact, to decrypt the - // metadata_key stored within the advertisement. - // The size should be 32. - array<uint8> authenticity_key; - - // A bytes representation a public key of X509Certificate, owned by contact, - // to decrypt UKEY2 (from Nearby Connections API) as a hand shake in - // contact verification phase. - array<uint8> public_key; - - // Time from epoch when this certificate becomes effective. - mojo_base.mojom.Time start_time; - - // Time from epoch when this certificate expires. - mojo_base.mojom.Time end_time; - - // The encrypted metadata in bytes, contains personal information of the - // device/user who created this certificate. Needs to be decrypted into bytes, - // and converted back to EncryptedMetadata object to access fields. - array<uint8> encrypted_metadata_bytes; - - // The tag for verifying metadata_encryption_key. - // The size should be 32. - array<uint8> metadata_encryption_key_tag; -}; - -// Frame sent by remote device to cancel the share action. -struct CancelFrame { -}; diff --git a/chromium/ash/services/nearby/public/mojom/nearby_share_target_types.mojom b/chromium/ash/services/nearby/public/mojom/nearby_share_target_types.mojom deleted file mode 100644 index 6674615c758..00000000000 --- a/chromium/ash/services/nearby/public/mojom/nearby_share_target_types.mojom +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module nearby_share.mojom; - -// Describes the type of device for a share target. -// The numeric values are used to encode/decode advertisement bytes, and must -// kept in sync with Android implementation. -// These values are persisted to logs. Entries should not be renumbered and -// numeric values should never be reused. -enum ShareTargetType { - // Unknown device type. - kUnknown = 0, - // A phone. - kPhone = 1, - // A tablet. - kTablet = 2, - // A laptop. - kLaptop = 3, -}; diff --git a/chromium/ash/services/nearby/public/mojom/sharing.mojom b/chromium/ash/services/nearby/public/mojom/sharing.mojom deleted file mode 100644 index e615d17b35f..00000000000 --- a/chromium/ash/services/nearby/public/mojom/sharing.mojom +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module sharing.mojom; - -import "ash/services/nearby/public/mojom/firewall_hole.mojom"; -import "ash/services/nearby/public/mojom/nearby_connections.mojom"; -import "ash/services/nearby/public/mojom/nearby_connections_types.mojom"; -import "ash/services/nearby/public/mojom/nearby_decoder.mojom"; -import "ash/services/nearby/public/mojom/tcp_socket_factory.mojom"; -import "ash/services/nearby/public/mojom/webrtc.mojom"; -import "chromeos/services/network_config/public/mojom/cros_network_config.mojom"; -import "device/bluetooth/public/mojom/adapter.mojom"; -import "sandbox/policy/mojom/sandbox.mojom"; - -// Collection of dependencies required by WifiLan medium. -struct WifiLanDependencies { - // Used to fetch the local device's IP address; needed for TCP server sockets. - pending_remote<chromeos.network_config.mojom.CrosNetworkConfig> - cros_network_config; - // Used to open a firewall hole for a TCP server socket. - pending_remote<FirewallHoleFactory> firewall_hole_factory; - // A proxy for NetworkContext, used to create TCP sockets. - pending_remote<TcpSocketFactory> tcp_socket_factory; -}; - -// A collection of dependencies required by the Nearby Presence and -// Nearby Connections libraries. These are generally system resources that -// the utility process (which the Nearby libraries are hosted in) does not -// have privileges to directly access. This collection is provided once -// during start-up of the utility process and its hosted libraries. -struct NearbyDependencies { - pending_remote<bluetooth.mojom.Adapter>? bluetooth_adapter; - - WebRtcDependencies webrtc_dependencies; - - // Null if the WifiLan feature flag is disabled. - WifiLanDependencies? wifilan_dependencies; - - location.nearby.connections.mojom.LogSeverity min_log_severity = - location.nearby.connections.mojom.LogSeverity.kInfo; -}; - -// Interface for sharing related services. Lives in a sandboxed utility process -// and is used by the browser process to offload unsafe protocol parsing. -[ServiceSandbox=sandbox.mojom.Sandbox.kService] -interface Sharing { - // Connects to Nearby functionality: Nearby Connections and the Nearby Share - // decoder. All dependencies should be provided via the |dependencies| struct. - // Shutdown of Nearby functionality is asynchronous; to shut down the process, - // call ShutDown() and wait for the operation to complete before disconnecting - // the Sharing Mojo connection. - Connect( - NearbyDependencies deps, - pending_receiver< - location.nearby.connections.mojom.NearbyConnections> - nearby_connections, - pending_receiver<sharing.mojom.NearbySharingDecoder> - decoder); - - // Shuts down Nearby functionality; once this operation returns, it is safe to - // disconnect active Mojo connections. - ShutDown() => (); -}; diff --git a/chromium/ash/services/nearby/public/mojom/tcp_server_socket_port.mojom b/chromium/ash/services/nearby/public/mojom/tcp_server_socket_port.mojom deleted file mode 100644 index 9a6efe6307d..00000000000 --- a/chromium/ash/services/nearby/public/mojom/tcp_server_socket_port.mojom +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module sharing.mojom; - -// See //ash/services/nearby/public/cpp/tcp_server_socket_port.h. -struct TcpServerSocketPort { - uint16 port; -}; diff --git a/chromium/ash/services/nearby/public/mojom/tcp_socket_factory.mojom b/chromium/ash/services/nearby/public/mojom/tcp_socket_factory.mojom deleted file mode 100644 index 289198b751c..00000000000 --- a/chromium/ash/services/nearby/public/mojom/tcp_socket_factory.mojom +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module sharing.mojom; - -import "ash/services/nearby/public/mojom/tcp_server_socket_port.mojom"; -import "mojo/public/mojom/base/time.mojom"; -import "services/network/public/mojom/address_list.mojom"; -import "services/network/public/mojom/ip_address.mojom"; -import "services/network/public/mojom/ip_endpoint.mojom"; -import "services/network/public/mojom/mutable_network_traffic_annotation_tag.mojom"; -import "services/network/public/mojom/tcp_socket.mojom"; - -// Wraps TCP socket creation functions from -// //services/network/public/mojom/network_context.mojom. We need this wrapper -// to create TCP sockets from the Nearby Connections utility process because -// network::mojom::NetworkContext can only be used by the browser process. -interface TcpSocketFactory { - // See //services/network/public/mojom/network_context.mojom. One slight - // modification is the use of sharing.mojom.TcpServerSocketPort; this - // restricts the range of allowed ports. - CreateTCPServerSocket( - network.mojom.IPAddress local_addr, - TcpServerSocketPort port, - uint32 backlog, - network.mojom.MutableNetworkTrafficAnnotationTag traffic_annotation, - pending_receiver<network.mojom.TCPServerSocket> socket) - => (int32 result, network.mojom.IPEndPoint? local_addr_out); - - // See //services/network/public/mojom/network_context.mojom. One - // modification is a user-defined |timeout|. There is timeout logic in the - // networking stack, but it is not configurable and can be too long in - // practice (over 2 minutes). The networking stack timeout can still be - // triggered if |timeout| is too long. - CreateTCPConnectedSocket( - mojo_base.mojom.TimeDelta timeout, - network.mojom.IPEndPoint? local_addr, - network.mojom.AddressList remote_addr_list, - network.mojom.TCPConnectedSocketOptions? tcp_connected_socket_options, - network.mojom.MutableNetworkTrafficAnnotationTag traffic_annotation, - pending_receiver<network.mojom.TCPConnectedSocket> socket, - pending_remote<network.mojom.SocketObserver>? observer) - => (int32 result, - network.mojom.IPEndPoint? local_addr, - network.mojom.IPEndPoint? peer_addr, - handle<data_pipe_consumer>? receive_stream, - handle<data_pipe_producer>? send_stream); -}; - diff --git a/chromium/ash/services/nearby/public/mojom/webrtc.mojom b/chromium/ash/services/nearby/public/mojom/webrtc.mojom deleted file mode 100644 index 6d3f37d2823..00000000000 --- a/chromium/ash/services/nearby/public/mojom/webrtc.mojom +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module sharing.mojom; - -import "ash/services/nearby/public/mojom/webrtc_signaling_messenger.mojom"; -import "url/mojom/url.mojom"; -import "services/network/public/mojom/mdns_responder.mojom"; -import "services/network/public/mojom/p2p.mojom"; - -// Represents an ICE server to be used for communication. -struct IceServer { - // URLs of this server. - array<url.mojom.Url> urls; - // Username for authentication with this server. - string? username; - // Credential for authentication with this server. - string? credential; -}; - -// Used to fetch ice servers for WebRtc communication. Implemented in browser -// process. -interface IceConfigFetcher { - // Returns a list of ice servers for WebRtc communication. - GetIceServers() => (array<IceServer> ice_servers); -}; - -// Hosted in the browser process to allow the Sharing utility process to create -// an MdnsResponder on demand. -interface MdnsResponderFactory { - // Creates an MdnsResponder instance. - CreateMdnsResponder( - pending_receiver<network.mojom.MdnsResponder> responder_receiver); -}; - -// Collection of dependencies required by WebRTC medium. -struct WebRtcDependencies { - // Used to allocate p2p sockets via Chromium's network service. - pending_remote<network.mojom.P2PSocketManager> socket_manager; - // Used to create an mDNS responder interface on demand. - pending_remote<MdnsResponderFactory> mdns_responder_factory; - // Used to fetch STUN and TURN servers for establishing WebRTC connection. - pending_remote<IceConfigFetcher> ice_config_fetcher; - // Used to send and receive SDP messages for establishing WebRTC connection. - pending_remote<WebRtcSignalingMessenger> messenger; -}; diff --git a/chromium/ash/services/nearby/public/mojom/webrtc_signaling_messenger.mojom b/chromium/ash/services/nearby/public/mojom/webrtc_signaling_messenger.mojom deleted file mode 100644 index 572965e4d66..00000000000 --- a/chromium/ash/services/nearby/public/mojom/webrtc_signaling_messenger.mojom +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module sharing.mojom; - -// Listens for incoming webrtc signaling messages from other peers. -interface IncomingMessagesListener { - // Called by the browser process when a new message is received. - OnMessage(string message); - // Called by the browser process when message receiving is complete. - OnComplete(bool success); -}; - -// Runs in the browser process and called by the Nearby utility process. -// Returned by |WebRtcSignalingMessenger| when StartReceivingMessages() is -// called. This interface can be used to stop the receiving of messages. -interface ReceiveMessagesSession { - // Stop receiving messages on this session. - StopReceivingMessages(); -}; - -// NOTE: Keep in sync with: -// third_party/nearby/src/proto/connections/offline_wire_formats.proto -enum LocationStandardFormat { - // NOTE: UNKNOWN = 0 is intentionally omitted. - - // E164 country codes: - // https://en.wikipedia.org/wiki/List_of_country_calling_codes - // e.g. +1 for USA - E164_CALLING = 1, - - // ISO 3166-1 alpha-2 country codes: - // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 - ISO_3166_1_ALPHA_2 = 2, -}; - -// |LocationHint| is used by Tachyon to choose the right geo shard. During -// bandwidth upgrade the requester sends its location hint over the connection -// and this is used to ensure both parties are talking to the same Tachyon -// instance. -// NOTE: Keep in sync with: -// third_party/nearby/src/proto/connections/offline_wire_formats.proto -struct LocationHint { - // The location as an E164_CALLING code or an ISO 3166-1 alpha-2 country code. - string location; - // Defines the format of the location string. - LocationStandardFormat format; -}; - -// Runs in browser process and is used by the nearby library to send and -// receive messages. -// TODO(crbug.com/1106387) : Update Nearby library to use async callbacks -// instead of blocking calls. -interface WebRtcSignalingMessenger { - // Sends a signaling message |message| to |peer_id|. - [Sync] - SendMessage(string self_id, string peer_id, LocationHint location_hint, - string message) => (bool success); - - // Registers |listener| to start receiving messages from other devices. - [Sync] - StartReceivingMessages(string self_id, LocationHint location_hint, - pending_remote<IncomingMessagesListener> listener) => - (bool success, pending_remote<ReceiveMessagesSession>? session); -}; diff --git a/chromium/ash/services/quick_pair/BUILD.gn b/chromium/ash/services/quick_pair/BUILD.gn deleted file mode 100644 index 511a5cd1bc2..00000000000 --- a/chromium/ash/services/quick_pair/BUILD.gn +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//testing/libfuzzer/fuzzer_test.gni") - -assert(is_chromeos_ash, - "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only") - -source_set("quick_pair") { - sources = [ - "fast_pair_data_parser.cc", - "fast_pair_data_parser.h", - "fast_pair_decryption.cc", - "fast_pair_decryption.h", - "quick_pair_process.cc", - "quick_pair_process.h", - "quick_pair_process_manager.cc", - "quick_pair_process_manager.h", - "quick_pair_process_manager_impl.cc", - "quick_pair_process_manager_impl.h", - "quick_pair_process_shutdown_controller.cc", - "quick_pair_process_shutdown_controller.h", - "quick_pair_service.cc", - "quick_pair_service.h", - ] - - deps = [ - "//ash/quick_pair/common", - "//ash/services/quick_pair/public/cpp", - "//ash/services/quick_pair/public/mojom", - "//crypto:crypto", - "//device/bluetooth", - "//mojo/public/cpp/bindings", - "//third_party/abseil-cpp:absl", - ] -} - -static_library("test_support") { - testonly = true - - sources = [ - "mock_quick_pair_process_manager.cc", - "mock_quick_pair_process_manager.h", - "quick_pair_process_manager.h", - ] - - deps = [ - "//ash/services/quick_pair/public/cpp", - "//ash/services/quick_pair/public/mojom", - "//base/test:test_support", - "//testing/gtest", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "fast_pair_data_parser_unittest.cc", - "fast_pair_decryption_unittest.cc", - "quick_pair_process_manager_impl_unittest.cc", - "quick_pair_process_shutdown_controller_unittest.cc", - "quick_pair_process_unittest.cc", - "quick_pair_service_unittest.cc", - ] - - deps = [ - ":quick_pair", - "//ash/quick_pair/common:test_support", - "//ash/quick_pair/fast_pair_handshake", - "//ash/services/quick_pair/public/cpp", - "//ash/services/quick_pair/public/cpp:unit_tests", - "//ash/services/quick_pair/public/mojom", - "//base/test:test_support", - "//testing/gmock", - "//testing/gtest", - ] -} - -fuzzer_test("fast_pair_data_parser_fuzzer") { - sources = [ "fast_pair_data_parser_fuzzer.cc" ] - deps = [ - ":quick_pair", - "//ash/quick_pair/common", - "//ash/services/quick_pair/public/mojom", - "//base/test:test_support", - "//device/bluetooth/public/cpp", - "//mojo/core/embedder", - ] -} - -fuzzer_test("fast_pair_decryption_fuzzer") { - sources = [ "fast_pair_decryption_fuzzer.cc" ] - deps = [ - ":quick_pair", - "//ash:test_support", - "//ash/quick_pair/common", - "//ash/quick_pair/fast_pair_handshake", - "//base/test:test_support", - ] -} diff --git a/chromium/ash/services/quick_pair/public/cpp/BUILD.gn b/chromium/ash/services/quick_pair/public/cpp/BUILD.gn deleted file mode 100644 index b96e73ff25e..00000000000 --- a/chromium/ash/services/quick_pair/public/cpp/BUILD.gn +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash, - "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only") - -source_set("cpp") { - sources = [ - "account_key_filter.cc", - "account_key_filter.h", - "battery_notification.cc", - "battery_notification.h", - "decrypted_passkey.cc", - "decrypted_passkey.h", - "decrypted_response.cc", - "decrypted_response.h", - "fast_pair_message_type.h", - "not_discoverable_advertisement.cc", - "not_discoverable_advertisement.h", - ] - - deps = [ - "//base", - "//crypto", - "//third_party/abseil-cpp:absl", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ "account_key_filter_unittest.cc" ] - - deps = [ - ":cpp", - "//base/test:test_support", - "//crypto", - "//testing/gmock", - "//testing/gtest", - ] -} diff --git a/chromium/ash/services/quick_pair/public/mojom/BUILD.gn b/chromium/ash/services/quick_pair/public/mojom/BUILD.gn deleted file mode 100644 index 84fb9fb588b..00000000000 --- a/chromium/ash/services/quick_pair/public/mojom/BUILD.gn +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash, - "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only") - -mojom("mojom") { - sources = [ - "fast_pair_data_parser.mojom", - "quick_pair_service.mojom", - ] - - public_deps = [ "//sandbox/policy/mojom" ] - - cpp_typemaps = [ - { - types = [ - { - mojom = "ash.quick_pair.mojom.DecryptedResponse" - cpp = "::ash::quick_pair::DecryptedResponse" - }, - { - mojom = "ash.quick_pair.mojom.DecryptedPasskey" - cpp = "::ash::quick_pair::DecryptedPasskey" - }, - { - mojom = "ash.quick_pair.mojom.MessageType" - cpp = "::ash::quick_pair::FastPairMessageType" - }, - { - mojom = "ash.quick_pair.mojom.NotDiscoverableAdvertisement" - cpp = "::ash::quick_pair::NotDiscoverableAdvertisement" - }, - ] - traits_headers = - [ "//ash/services/quick_pair/public/mojom/fast_pair_traits.h" ] - traits_sources = - [ "//ash/services/quick_pair/public/mojom/fast_pair_traits.cc" ] - traits_public_deps = [ "//ash/services/quick_pair/public/cpp" ] - }, - ] -} diff --git a/chromium/ash/services/quick_pair/public/mojom/fast_pair_data_parser.mojom b/chromium/ash/services/quick_pair/public/mojom/fast_pair_data_parser.mojom deleted file mode 100644 index e9095eaf5b7..00000000000 --- a/chromium/ash/services/quick_pair/public/mojom/fast_pair_data_parser.mojom +++ /dev/null @@ -1,202 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module ash.quick_pair.mojom; - -// Type values for Fast Pair messages. -enum MessageType { - // Key-based Pairing Request. - kKeyBasedPairingRequest, - // Key-based Pairing Response. - kKeyBasedPairingResponse, - // Seeker's passkey. - kSeekersPasskey, - // Provider's passkey. - kProvidersPasskey, -}; - -// Decrypted response value. -struct DecryptedResponse { - // Message type. - MessageType message_type; - // Provider's public (BR/EDR) address. - array<uint8, 6> address_bytes; - // Random value. - array<uint8, 9> salt; -}; - -// Decrypted passkey value. -struct DecryptedPasskey { - // Message type. - MessageType message_type; - // 6 digit passkey. - uint32 passkey; - // Random value. - array<uint8, 12> salt; -}; - -// 'Not discoverable' advertisements and MessageStreamMessages may contain -// battery information, see -// https://developers.google.com/nearby/fast-pair/spec#BatteryNotification. -struct BatteryInfo { - // Whether or not the device is charging. - bool is_charging; - // Battery level ranging from 0 to 100. -1 if unknown. - int8 percentage; -}; - -// 'Not discoverable' advertisements may contain battery information, see -// https://developers.google.com/nearby/fast-pair/spec#BatteryNotification. -struct BatteryNotification { - // Whether or not to show UI based on this notification. - bool show_ui; - // Battery information for the left bud. - BatteryInfo left_bud_info; - // Battery information for the right bud. - BatteryInfo right_bud_info; - // Battery information for the case. - BatteryInfo case_info; -}; - -// MessageStreamMessages may contain battery update information, see -// https://developers.google.com/nearby/fast-pair/spec#battery_updated. -struct BatteryUpdate { - // Battery information for the left bud. - BatteryInfo left_bud_info; - // Battery information for the right bud. - BatteryInfo right_bud_info; - // Battery information for the case. - BatteryInfo case_info; -}; - -// Indication of whether or not the Acknowledgement message in a -// MessageStreamMessage is a Ack or a Nak, with reasons for Nak. See -// https://developers.google.com/nearby/fast-pair/spec#MessageStreamAcknowledgements. -enum Acknowledgement { - // Acknowledgement. - kAck, - // Not Acknowledgement, not supported. - kNotSupportedNak, - // Not Acknowledgement, device busy. - kDeviceBusyNak, - // Not Acknowledgement, not allowed due to current state. - kNotAllowedDueToCurrentStateNak, -}; - -// All the message groups for the MessageStreamMessage to be used in -// Acknowledgement. See -// https://developers.google.com/nearby/fast-pair/spec#MessageStream. -enum MessageGroup { - // Bluetooth event. - kBluetoothEvent, - // Companion App event. - kCompanionAppEvent, - // Device information event. - kDeviceInformationEvent, - // Device action event. - kDeviceActionEvent, - // Acknowledgement. - kAcknowledgementEvent, -}; - -// MessageStreamMessages may contain RingDevice events, see -// https://developers.google.com/nearby/fast-pair/spec#ringing_a_device. -struct RingDevice { - // Since the MessageStreamMessage does not contain - // information about how many components are on the device, this byte needs - // to be understood by consumers. - uint8 ring_device_byte; - // Timeout for how long the device should ring for. This is an optional field, - // and a timeout of -1 implies no timeout. - int8 timeout_in_seconds; -}; - -// MessageStreamMessages may contain Acknowledgement events, see -// https://developers.google.com/nearby/fast-pair/spec#MessageStreamAcknowledgements. -struct AcknowledgementMessage { - // The byte representation of the message code in the message group being - // acknowledged or not acknowledged. - uint8 action_message_code; - // Acknowledgement or the reason for not acknowledgement. - Acknowledgement acknowledgement; - // The message group being acknowledged or not acknowledged. - MessageGroup action_message_group; -}; - -// Parsed message stream message value which may take the value of any single -// one of these fields at a time, see -// https://developers.google.com/nearby/fast-pair/spec#MessageStream. -union MessageStreamMessage { - // Model id information for Retroactively Writing Account Key. - string model_id; - // BLE address information for Retroactively Writing Account Key. - string ble_address_update; - // Battery updates for battery notifications. - BatteryUpdate battery_update; - // Remaining battery time, in minutes. - uint16 remaining_battery_time; - // Enable/Disable silence mode. If true, enable silence mode. If false, - // disable silence mode. - bool enable_silence_mode; - // Companion app log buffer full. - bool companion_app_log_buffer_full; - // Active components byte. Since the MessageStreamMessage does not contain - // information about how many components are on the device, this byte needs - // to be understood by consumers. See - // https://developers.google.com/nearby/fast-pair/spec#MessageStreamActiveComponents. - uint8 active_components_byte; - // Ring device event. - RingDevice ring_device_event; - // Acknowledgement event for an action. - AcknowledgementMessage acknowledgement; - // Sdk version for Android platform. - int8 sdk_version; -}; - -// Advertisement payload for Fast Pair 'not discoverable' devices. See -// https://developers.google.com/nearby/fast-pair/spec#advertising_payload_fast_pair_account_data -// for additional details (note: not all fields in the spec are in use, thus -// aren't included in this struct). -struct NotDiscoverableAdvertisement { - // Bytes in the account key filter. - array<uint8> account_key_filter; - // Random value generate by the Bluetooth device. - array<uint8> salt; - // Whether or not to show UI based on this advertisement. - bool show_ui; - // Optional battery notification information. - BatteryNotification? battery_notification; -}; - -// Parses untrusted bytes from a Bluetooth device during Fast Pair. Lives in a -// sandboxed utility process which is launched by Ash. Instances should be -// retrieved via QuickPairService. -interface FastPairDataParser { - // Gets the hex string representation of the device's model ID from the - // service data. - GetHexModelIdFromServiceData(array<uint8> service_data) => (string? model_id); - - // Decrypts |encrypted_response_bytes| using |aes_key| and parses a - // DecryptedResponse instance if possible. - ParseDecryptedResponse( - array<uint8, 16> aes_key, - array<uint8, 16> encrypted_response_bytes) => (DecryptedResponse? response); - - // Decrypts |encrypted_passkey_bytes| using |aes_key| and parses a - // DecryptedPasskey instance if possible. - ParseDecryptedPasskey( - array<uint8, 16> aes_key, - array<uint8, 16> encrypted_passkey_bytes) => (DecryptedPasskey? passkey); - - // Parses a 'not discoverable' advertisement instance from |service_data| if - // possible. If there is not salt information in the advertisement, use - // |address| as salt instead. - ParseNotDiscoverableAdvertisement(array<uint8> service_data, string address) - => (NotDiscoverableAdvertisement? advertisement); - - // Parses MessageStreamMessage instances from |message_bytes| if - // possible. - ParseMessageStreamMessages(array<uint8> message_bytes) - => (array<MessageStreamMessage> messages); -}; diff --git a/chromium/ash/services/quick_pair/public/mojom/quick_pair_service.mojom b/chromium/ash/services/quick_pair/public/mojom/quick_pair_service.mojom deleted file mode 100644 index 0b91a3aa7b6..00000000000 --- a/chromium/ash/services/quick_pair/public/mojom/quick_pair_service.mojom +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module ash.quick_pair.mojom; - -import "ash/services/quick_pair/public/mojom/fast_pair_data_parser.mojom"; -import "sandbox/policy/mojom/sandbox.mojom"; - -// Interface for Quick Pair related services. Lives in a sandboxed utility -// process which is launched by Ash. -[ServiceSandbox=sandbox.mojom.Sandbox.kService] -interface QuickPairService { - // Initializes and connects everything needed to start the service. - Connect(pending_receiver<FastPairDataParser> fast_pair_data_parser); -}; diff --git a/chromium/ash/services/recording/BUILD.gn b/chromium/ash/services/recording/BUILD.gn deleted file mode 100644 index e5ee5200f8b..00000000000 --- a/chromium/ash/services/recording/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") - -assert(is_chromeos_ash) - -source_set("recording") { - sources = [ - "recording_encoder_muxer.cc", - "recording_encoder_muxer.h", - "recording_service.cc", - "recording_service.h", - "recording_service_constants.h", - "video_capture_params.cc", - "video_capture_params.h", - ] - - deps = [ - "//ash/constants", - "//ash/services/recording/public/mojom", - "//base", - "//media", - "//services/audio/public/cpp", - ] -} - -source_set("test_support") { - testonly = true - - sources = [ - "recording_service_test_api.cc", - "recording_service_test_api.h", - ] - - deps = [ - "//ash/services/recording", - "//ash/services/recording/public/mojom", - "//base", - "//media", - ] -} diff --git a/chromium/ash/services/recording/public/mojom/BUILD.gn b/chromium/ash/services/recording/public/mojom/BUILD.gn deleted file mode 100644 index d6cf4cd4b33..00000000000 --- a/chromium/ash/services/recording/public/mojom/BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//mojo/public/tools/bindings/mojom.gni") - -assert(is_chromeos_ash) - -mojom("mojom") { - sources = [ "recording_service.mojom" ] - - public_deps = [ "//sandbox/policy/mojom" ] - - deps = [ - "//media/mojo/mojom", - "//services/viz/privileged/mojom/compositing", - "//ui/gfx/image/mojom", - ] -} diff --git a/chromium/ash/services/recording/public/mojom/recording_service.mojom b/chromium/ash/services/recording/public/mojom/recording_service.mojom deleted file mode 100644 index 6e2fc3ce337..00000000000 --- a/chromium/ash/services/recording/public/mojom/recording_service.mojom +++ /dev/null @@ -1,222 +0,0 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -module recording.mojom; - -import "media/mojo/mojom/audio_stream_factory.mojom"; -import "mojo/public/mojom/base/big_string.mojom"; -import "mojo/public/mojom/base/file_path.mojom"; -import "sandbox/policy/mojom/sandbox.mojom"; -import "services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom"; -import "services/viz/public/mojom/compositing/frame_sink_id.mojom"; -import "services/viz/public/mojom/compositing/subtree_capture_id.mojom"; -import "ui/gfx/geometry/mojom/geometry.mojom"; -import "ui/gfx/image/mojom/image.mojom"; - -// Defines the status of recording to be provided to the client at the end of -// recording. -enum RecordingStatus { - // Ended successfully with no errors. - kSuccess, - // Ended due to the recording service process was being terminated while - // recording is still in progress (which is considered a failure). - kServiceClosing, - // Ended due to a failure when the mojo pipe to the video capturer on Viz was - // disconnected. - kVizVideoCapturerDisconnected, - // Ended due to a failure to initialize the audio encoder. - kAudioEncoderInitializationFailure, - // Ended due to a failure to initialize the video encoder. - kVideoEncoderInitializationFailure, - // Ended due to an error occurring while encoding audio. - kAudioEncodingError, - // Ended due to an error occurring while encoding video. - kVideoEncodingError, - // Ended due to an IO error causing a failure to write to the webm file. - kIoError, - // Ended due to reaching a critically low disk space. - kLowDiskSpace, - // Ended due to reaching a critically low DriveFS quota. - kLowDriveFsQuota, -}; - -// Defines the interface for retrieving the remaining amount of DriveFS free -// space. The implementation of this interface lives in ash, and a remote end -// point to it will be provided to the recording service only when the video -// file is being written to a path on DriveFS. The implementation of this -// delegate lives in ash-chrome (DriveFS integration lives in Chrome and cannot -// be used directly by the recording service). -interface DriveFsQuotaDelegate { - // Gets the free space available in Drive (see - // `drivefs.mojom.QuotaUsage.free_cloud_bytes`). `free_remaining_bytes` will - // be set to -1 if there's an error in computing the DriveFS quota. - GetDriveFsFreeSpaceBytes() => (int64 free_remaining_bytes); -}; - -// Defines the interface for the recording service client (e.g. ash), which -// lives in a remote process other than that of the recording service itself. -// The recording service consumes this interface to communicate with the client. -interface RecordingServiceClient { - // Called by the service to inform the client that an in-progress video - // recording ended. If |status| is anything other than |kSuccess|, then - // recording is being terminated by the service itself due to an internal - // failure. The service can provide an RGB image |thumbnail| representing - // the recorded video. It can be empty in case of a failure. - OnRecordingEnded(RecordingStatus status, gfx.mojom.ImageSkia? thumbnail); -}; - -// Defines the interface of the recording service which is implemented by -// |recording::RecordingService| and runs in its own utility process. It is -// launched by Ash on which the |RecordingServiceClient| resides, and is used to -// perform audio/video recording of the whole screen, a partial region of it, or -// an individual window. The service captures, encodes, and muxes the audio and -// video frames, and writes the WebM muxed video chunks to directly to a file -// whose path was given to the Record*() functions. -// Note that a maximum of one screen recording can be done at any time. -// TODO(https://crbug.com/1147991) Explore alternative sandboxing. -[ServiceSandbox=sandbox.mojom.Sandbox.kNoSandbox] -interface RecordingService { - // All the below Record*() interfaces, take a pending remote to a client (e.g. - // Ash) which will be notified when recording finishes and all the webm - // chuncks are written to the file, a pending remote bound to the video - // capturer on Viz on the GPU process, another *optional* pending remote - // to the audio stream factory on the Audio Service, which if not provided, - // the service will not record audio, and a path to the webm file where the - // video content should be saved. - // - // The *optional* pending_remote `drive_fs_quota_delegate`, if provided, that - // means that the given `webm_file_path` lives on DriveFS, and the remaining - // free space calculations has to be done through this delegate. - // - // Note that we pass a FilePath rather than a File, since: - // - Passing a File means the caller has to create and open the file itself, - // which has to be done asynchronously on the ash UI side, resulting in a - // longer delay before recording can start. However, this wasn't a major - // concern. - // - The recording service process is not sandboxed, so it can create and open - // the file itself. - // - Since the recording service will be writing to the file directly, it's - // easier to poll the remaining disk space after write operations, rather - // than relying on the caller to repeatedly do this polling. - // TODO(https://crbug.com/1211480): Explore a different architecture if - // possible. - - // Starts a fullscreen recording of a root window which has the given - // |frame_sink_id|. Using the given |frame_sink_size_dip| and - // |device_scale_factor|, the resulting video will have a resolution equal to - // the pixel size of the recorded frame sink. Note that calling - // OnFrameSinkSizeChanged() will do nothing in this recording mode, and the - // output video will maintain the same size as the initial pixel size of the - // frame sink. The content of the video will letterbox within that size as - // needed. This is desired in Fullscreen recording, as it makes it clear when - // the recorded display changes its rotation. - // |frame_sink_id| must be valid. - RecordFullscreen( - pending_remote<RecordingServiceClient> client, - pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer, - pending_remote<media.mojom.AudioStreamFactory>? audio_stream_factory, - pending_remote<DriveFsQuotaDelegate>? drive_fs_quota_delegate, - mojo_base.mojom.FilePath webm_file_path, - viz.mojom.FrameSinkId frame_sink_id, - gfx.mojom.Size frame_sink_size_dip, - float device_scale_factor); - - // Starts a recording of a window. If this window has a valid |frame_sink_id|, - // and submits its own compositor frames independently, then - // |subtree_capture_id| can be default-constructed and won't be used. - // Otherwise, for windows that don't submit compositor frames (e.g. non-root - // windows), the given |frame_sink_id| must be of the root window they're - // descendant from, and they must be made capturable by tagging the them with - // a valid |subtree_capture_id| before calling this (see - // aura::Window::MakeWindowCapturable()). - // |window_size_dip| is the initial size of the recorded window, and can be - // updated by calling OnRecordedWindowSizeChanged() when the window gets - // resized by the user (e.g. resized, maximized, fullscreened, ... etc.). - // Unlike fullscreen recording, updating the window size will update the - // output video size, since it is desired for the video dimensions to always - // match those of the window in pixels without letterboxing. Hence, the - // current |device_scale_factor| is provided to perform the dip-to-pixel - // conversion. |frame_sink_size_dip| is the current size of the frame sink - // whose |frame_sink_id| was given. This can be updated by calling - // OnFrameSinkSizeChanged() which will update the resolution constraints on - // the capturer to avoid letterboxing, so the resulting video frames are sharp - // and crisp, and their size match that of the window in pixels. - RecordWindow( - pending_remote<RecordingServiceClient> client, - pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer, - pending_remote<media.mojom.AudioStreamFactory>? audio_stream_factory, - pending_remote<DriveFsQuotaDelegate>? drive_fs_quota_delegate, - mojo_base.mojom.FilePath webm_file_path, - viz.mojom.FrameSinkId frame_sink_id, - gfx.mojom.Size frame_sink_size_dip, - float device_scale_factor, - viz.mojom.SubtreeCaptureId subtree_capture_id, - gfx.mojom.Size window_size_dip); - - // Starts a recording of a partial region of a root window which has the given - // |frame_sink_id|. Using the given |frame_sink_size_dip| and - // |device_scale_factor|, the video will be captured at a resolution equal to - // the size of the frame sink in pixels, but the resulting video frames will - // be cropped to the pixel bounds that corresponds to the given - // |crop_region_dip|. - // If the root window gets resized (due to e.g. rotation, device scale factor - // change ... etc.) OnFrameSinkSizeChanged() must be called to update the - // resolution constraints on the capturer in order to avoid letterboxing. - // Letterboxing breaks the relation between the crop region bounds and - // generated video frame sizes, which results in the wrong region being shown - // in the video. - // |frame_sink_id| must be valid. - RecordRegion( - pending_remote<RecordingServiceClient> client, - pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer, - pending_remote<media.mojom.AudioStreamFactory>? audio_stream_factory, - pending_remote<DriveFsQuotaDelegate>? drive_fs_quota_delegate, - mojo_base.mojom.FilePath webm_file_path, - viz.mojom.FrameSinkId frame_sink_id, - gfx.mojom.Size frame_sink_size_dip, - float device_scale_factor, - gfx.mojom.Rect crop_region_dip); - - // Stops an on-going video recording. The remaining frames will continue to be - // written to the webm file until OnRecordingEnded() is called on the client. - StopRecording(); - - // Called by the client to let the service know that a window being recorded - // is about to move to a different display (i.e a different root window), - // giving it the |new_frame_sink_id| of that new root window. It also provides - // the |new_frame_sink_size_dip| and |new_device_scale_factor| (since the new - // display may have different bounds). - // Note that changing the window's root doesn't affect the window's - // SubtreeCaptureId, and therefore it doesn't need to be reprovided. - // This can *only* be called when the service is already recording a window - // (i.e. RecordWindow() has already been called to start the recording of a - // window). - OnRecordedWindowChangingRoot( - viz.mojom.FrameSinkId new_frame_sink_id, - gfx.mojom.Size new_frame_sink_size_dip, - float new_device_scale_factor); - - // Called by the client to let the service know that a window being recorded - // has been resized (e.g. due to snapping, maximizing, user resizing, ... - // etc.). |new_window_size_dip| is the new size in DIPs which will be used to - // change the dimensions of the output video to match the new size in pixels - // according to the current value of the device scale factor. Therefore, it's - // better to throttle such changes to avoid having to change the size of the - // video repeatedly. - // This can *only* be called when the service is already recording a window - // (i.e. RecordWindow() has already been called to start the recording of a - // window). - OnRecordedWindowSizeChanged(gfx.mojom.Size new_window_size_dip); - - // Called by the client to let the service know that the frame sink being - // recorded (whose |frame_sink_id| was provided to the above functions) has - // changed its size to or its device scale factor to |new_frame_sink_size_dip| - // or |new_device_scale_factor| respectively, resulting in a potential change - // in the resolution of the output video. - // This does nothing when recording a fullscreen display, as the capturer - // already takes care of centering and letter-boxing the video content within - // the initial requested video resolution. - OnFrameSinkSizeChanged(gfx.mojom.Size new_frame_sink_size_dip, - float new_device_scale_factor); -}; diff --git a/chromium/ash/services/secure_channel/BUILD.gn b/chromium/ash/services/secure_channel/BUILD.gn index c6ae8a2625f..0c04b7ee427 100644 --- a/chromium/ash/services/secure_channel/BUILD.gn +++ b/chromium/ash/services/secure_channel/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -172,14 +172,14 @@ static_library("secure_channel") { ] deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/constants", "//ash/services/device_sync/proto", "//ash/services/secure_channel/public/cpp/shared", "//ash/services/secure_channel/public/mojom", "//base", "//chromeos", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", "//crypto", "//device/bluetooth", "//device/bluetooth/public/cpp", @@ -276,12 +276,12 @@ static_library("test_support") { public_deps = [ ":secure_channel" ] deps = [ - "//ash/components/multidevice", - "//ash/components/multidevice/logging", "//ash/services/secure_channel/public/cpp/shared", "//ash/services/secure_channel/public/mojom", "//base", "//base/test:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice/logging", "//device/bluetooth", "//testing/gmock", ] @@ -340,15 +340,15 @@ source_set("unit_tests") { deps = [ ":test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", - "//ash/components/multidevice/logging", "//ash/services/secure_channel/public/cpp/client:test_support", "//ash/services/secure_channel/public/cpp/client:unit_tests", "//ash/services/secure_channel/public/cpp/shared", "//ash/services/secure_channel/public/mojom", "//ash/services/secure_channel/public/mojom:unit_tests", "//base/test:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice:test_support", + "//chromeos/ash/components/multidevice/logging", "//device/bluetooth:mocks", "//testing/gmock", "//testing/gtest", diff --git a/chromium/ash/services/secure_channel/public/cpp/client/BUILD.gn b/chromium/ash/services/secure_channel/public/cpp/client/BUILD.gn index 77421935024..8a47a241422 100644 --- a/chromium/ash/services/secure_channel/public/cpp/client/BUILD.gn +++ b/chromium/ash/services/secure_channel/public/cpp/client/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -33,13 +33,13 @@ source_set("client") { ] deps = [ - "//ash/components/multidevice/logging", "//ash/constants", "//ash/services/device_sync/public/cpp", "//ash/services/multidevice_setup/public/cpp", "//ash/services/secure_channel/public/cpp/shared", "//ash/services/secure_channel/public/mojom", "//base", + "//chromeos/ash/components/multidevice/logging", "//mojo/public/cpp/bindings", ] } @@ -82,8 +82,6 @@ source_set("unit_tests") { deps = [ ":client", ":test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", "//ash/constants", "//ash/services/device_sync/public/cpp:test_support", "//ash/services/multidevice_setup/public/cpp:test_support", @@ -93,6 +91,8 @@ source_set("unit_tests") { "//ash/services/secure_channel/public/mojom", "//base", "//base/test:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice:test_support", "//testing/gtest", ] } diff --git a/chromium/ash/services/secure_channel/public/cpp/shared/BUILD.gn b/chromium/ash/services/secure_channel/public/cpp/shared/BUILD.gn index 424b8c28dd6..78aa5e111cc 100644 --- a/chromium/ash/services/secure_channel/public/cpp/shared/BUILD.gn +++ b/chromium/ash/services/secure_channel/public/cpp/shared/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/services/secure_channel/public/mojom/BUILD.gn b/chromium/ash/services/secure_channel/public/mojom/BUILD.gn index 8db7f85be5f..4b0d2976460 100644 --- a/chromium/ash/services/secure_channel/public/mojom/BUILD.gn +++ b/chromium/ash/services/secure_channel/public/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -15,7 +15,7 @@ mojom("mojom") { ] public_deps = [ - "//ash/components/multidevice/mojom", + "//chromeos/ash/components/multidevice/mojom", "//mojo/public/mojom/base", ] diff --git a/chromium/ash/services/secure_channel/public/mojom/nearby_connector.mojom b/chromium/ash/services/secure_channel/public/mojom/nearby_connector.mojom index 2145cd78b43..b1fbcb37f72 100644 --- a/chromium/ash/services/secure_channel/public/mojom/nearby_connector.mojom +++ b/chromium/ash/services/secure_channel/public/mojom/nearby_connector.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/services/secure_channel/public/mojom/secure_channel.mojom b/chromium/ash/services/secure_channel/public/mojom/secure_channel.mojom index 37eb622372a..9aa56d99f20 100644 --- a/chromium/ash/services/secure_channel/public/mojom/secure_channel.mojom +++ b/chromium/ash/services/secure_channel/public/mojom/secure_channel.mojom @@ -1,10 +1,10 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. module ash.secure_channel.mojom; -import "ash/components/multidevice/mojom/multidevice_types.mojom"; +import "chromeos/ash/components/multidevice/mojom/multidevice_types.mojom"; import "ash/services/secure_channel/public/mojom/nearby_connector.mojom"; import "ash/services/secure_channel/public/mojom/secure_channel_types.mojom"; import "mojo/public/mojom/base/time.mojom"; diff --git a/chromium/ash/services/secure_channel/public/mojom/secure_channel_types.mojom b/chromium/ash/services/secure_channel/public/mojom/secure_channel_types.mojom index a03130040e5..374bbc524b6 100644 --- a/chromium/ash/services/secure_channel/public/mojom/secure_channel_types.mojom +++ b/chromium/ash/services/secure_channel/public/mojom/secure_channel_types.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/shortcut_viewer/BUILD.gn b/chromium/ash/shortcut_viewer/BUILD.gn index fd98cd303c9..7e1490af10b 100644 --- a/chromium/ash/shortcut_viewer/BUILD.gn +++ b/chromium/ash/shortcut_viewer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/shortcut_viewer/strings/BUILD.gn b/chromium/ash/shortcut_viewer/strings/BUILD.gn index 2973ece3c10..0804fd71f27 100644 --- a/chromium/ash/shortcut_viewer/strings/BUILD.gn +++ b/chromium/ash/shortcut_viewer/strings/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/strings/BUILD.gn b/chromium/ash/strings/BUILD.gn index 2c75cbaeedb..df10d2865e7 100644 --- a/chromium/ash/strings/BUILD.gn +++ b/chromium/ash/strings/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2014 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/style/BUILD.gn b/chromium/ash/style/BUILD.gn new file mode 100644 index 00000000000..8c073aa8dcc --- /dev/null +++ b/chromium/ash/style/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chromeos/ui_mode.gni") + +assert(is_chromeos_ash) + +source_set("style") { + sources = [ "ash_color_id.h" ] + + public_deps = [ + "//ui/chromeos/styles:cros_tokens_color_mappings", + "//ui/color:color_headers", + ] +} diff --git a/chromium/ash/system/machine_learning/BUILD.gn b/chromium/ash/system/machine_learning/BUILD.gn index 683885035b7..ef5e1843654 100644 --- a/chromium/ash/system/machine_learning/BUILD.gn +++ b/chromium/ash/system/machine_learning/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/BUILD.gn b/chromium/ash/webui/BUILD.gn index 14e6b981da6..0e4ae773212 100644 --- a/chromium/ash/webui/BUILD.gn +++ b/chromium/ash/webui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -21,6 +21,7 @@ test("ash_webui_unittests") { deps = [ "//ash/webui/common/backend:unit_tests", + "//ash/webui/demo_mode_app_ui:unit_tests", "//ash/webui/diagnostics_ui:unit_tests", "//ash/webui/diagnostics_ui/backend:unit_tests", "//ash/webui/diagnostics_ui/mojom:unit_tests", @@ -32,6 +33,7 @@ test("ash_webui_unittests") { "//ash/webui/personalization_app:unit_tests", "//ash/webui/projector_app:unit_tests", "//ash/webui/scanning:unit_tests", + "//ash/webui/scanning/mojom:unit_tests", "//ash/webui/shimless_rma/backend:unit_tests", "//ash/webui/shimless_rma/mojom:unit_tests", "//ash/webui/shortcut_customization_ui/backend:unit_tests", @@ -46,10 +48,6 @@ test("ash_webui_unittests") { "//ui/gl:test_support", ] - if (!is_official_build) { - deps += [ "//ash/webui/demo_mode_app_ui:unit_tests" ] - } - # Tests for Camera App only work on Chrome OS device but not linux-chromeos. if (is_chromeos_device) { deps += [ "//ash/webui/camera_app_ui:unit_tests" ] @@ -68,7 +66,7 @@ group("closure_compile") { deps = [ "//ash/webui/common:closure_compile", "//ash/webui/connectivity_diagnostics:closure_compile", - "//ash/webui/diagnostics_ui:closure_compile", + "//ash/webui/demo_mode_app_ui:closure_compile", "//ash/webui/eche_app_ui:closure_compile", "//ash/webui/file_manager/resources:closure_compile", "//ash/webui/file_manager/untrusted_resources:closure_compile", @@ -77,14 +75,9 @@ group("closure_compile") { "//ash/webui/media_app_ui:closure_compile", "//ash/webui/multidevice_debug/resources:closure_compile", "//ash/webui/os_feedback_ui:closure_compile", - "//ash/webui/print_management:closure_compile", "//ash/webui/projector_app/resources:closure_compile", "//ash/webui/scanning:closure_compile", "//ash/webui/shimless_rma:closure_compile", "//ash/webui/system_apps:closure_compile", ] - - if (!is_official_build) { - deps += [ "//ash/webui/demo_mode_app_ui:closure_compile" ] - } } diff --git a/chromium/ash/webui/camera_app_ui/BUILD.gn b/chromium/ash/webui/camera_app_ui/BUILD.gn index 82def910f56..d0d8fe97b25 100644 --- a/chromium/ash/webui/camera_app_ui/BUILD.gn +++ b/chromium/ash/webui/camera_app_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -84,8 +84,8 @@ source_set("document_scanning") { deps = [ "//ash/constants", "//base", - "//chromeos/dbus/dlcservice", - "//chromeos/dbus/dlcservice:dlcservice_proto", + "//chromeos/ash/components/dbus/dlcservice", + "//chromeos/ash/components/dbus/dlcservice:dlcservice_proto", "//chromeos/services/machine_learning/public/cpp", "//chromeos/services/machine_learning/public/mojom", "//components/device_event_log", diff --git a/chromium/ash/webui/camera_app_ui/camera_app_helper.mojom b/chromium/ash/webui/camera_app_ui/camera_app_helper.mojom index a8f385a76f5..1620b0e4d88 100644 --- a/chromium/ash/webui/camera_app_ui/camera_app_helper.mojom +++ b/chromium/ash/webui/camera_app_ui/camera_app_helper.mojom @@ -1,4 +1,4 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -193,8 +193,9 @@ interface CameraAppHelper { // Registers a callback which will be resolved once the document scanner is // ready or when it fails to load. If the document scanner is not supported on - // the device, it returns false immediately. - RegisterDocumentScannerReadyCallback() => (bool is_loaded); + // the device, it returns false immediately. If the document scanner fails to + // load in the previous round, it retries upon the call. + CheckDocumentModeReadiness() => (bool is_loaded); // Returns the detected document corners from given |jpeg_data|. // The amount of corners will be either 0, indicating there are no corners @@ -217,6 +218,12 @@ interface CameraAppHelper { DocumentOutputFormat output_format) => (array<uint8> doc_data); - // Converts the given |jpeg_data| to PDF format. - ConvertToPdf(array<uint8> jpeg_data) => (array<uint8> pdf_data); + // Converts the given |jpegs_data| to PDF format. + ConvertToPdf(array<array<uint8>> jpegs_data) => (array<uint8> pdf_data); + + // Triggers HaTS survey for the camera app if all the conditions match: + // 1. The camera app session is longer than 15 seconds + // 2. The user is chosen to take the survey + // 3. The user hasn't done any survey recently + MaybeTriggerSurvey(); }; diff --git a/chromium/ash/webui/camera_app_ui/resources/css/css.gni b/chromium/ash/webui/camera_app_ui/resources/css/css.gni index f3d0a2d1a78..231b1895590 100644 --- a/chromium/ash/webui/camera_app_ui/resources/css/css.gni +++ b/chromium/ash/webui/camera_app_ui/resources/css/css.gni @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/camera_app_ui/resources/images/images.gni b/chromium/ash/webui/camera_app_ui/resources/images/images.gni index 3890ce6ba54..1858c7ecb0a 100644 --- a/chromium/ash/webui/camera_app_ui/resources/images/images.gni +++ b/chromium/ash/webui/camera_app_ui/resources/images/images.gni @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -43,7 +43,11 @@ in_app_images = [ "crop_document_counterclockwise_rotate.svg", "document_mode_dialog_icon.svg", "document_mode_spinner.svg", + "document_review_share.svg", "download_dlc_toast_icon.svg", + "document_review_add_page.svg", + "document_review_delete_page.svg", + "document_review_fix_page.svg", "new_feature_toast_icon.svg", "ptz_pan_left.svg", "ptz_pan_right.svg", diff --git a/chromium/ash/webui/camera_app_ui/resources/js/BUILD.gn b/chromium/ash/webui/camera_app_ui/resources/js/BUILD.gn index bc994bd471c..8c1e7c28254 100644 --- a/chromium/ash/webui/camera_app_ui/resources/js/BUILD.gn +++ b/chromium/ash/webui/camera_app_ui/resources/js/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -122,7 +122,10 @@ ts_library("build_ts") { ":preload_images", ] - definitions = [ "externs/types.d.ts" ] + definitions = [ + "externs/types.d.ts", + "//tools/typescript/definitions/pending.d.ts", + ] foreach(file, get_target_outputs(":build_mojo_dts")) { # Only take the .d.ts files, and ignoring the manifest.json that is also # listed as output file. diff --git a/chromium/ash/webui/camera_app_ui/resources/js/js.gni b/chromium/ash/webui/camera_app_ui/resources/js/js.gni index 765cbb90d71..5440943cf4d 100644 --- a/chromium/ash/webui/camera_app_ui/resources/js/js.gni +++ b/chromium/ash/webui/camera_app_ui/resources/js/js.gni @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -92,6 +92,9 @@ compile_js_files = [ "views/camera/video_encoder_options.ts", "views/crop_document.ts", "views/dialog.ts", + "views/document_review.ts", + "views/document_fix_mode.ts", + "views/document_preview_mode.ts", "views/option_panel.ts", "views/ptz_panel.ts", "views/review.ts", diff --git a/chromium/ash/webui/camera_app_ui/resources/sounds/sounds.gni b/chromium/ash/webui/camera_app_ui/resources/sounds/sounds.gni index 71e96468dd5..71f93d3f4d0 100644 --- a/chromium/ash/webui/camera_app_ui/resources/sounds/sounds.gni +++ b/chromium/ash/webui/camera_app_ui/resources/sounds/sounds.gni @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/camera_app_ui/resources/strings/BUILD.gn b/chromium/ash/webui/camera_app_ui/resources/strings/BUILD.gn index 2bed2146edf..a5132fa21c8 100644 --- a/chromium/ash/webui/camera_app_ui/resources/strings/BUILD.gn +++ b/chromium/ash/webui/camera_app_ui/resources/strings/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/camera_app_ui/resources/views/views.gni b/chromium/ash/webui/camera_app_ui/resources/views/views.gni index d6224294be0..3245e5fa5ef 100644 --- a/chromium/ash/webui/camera_app_ui/resources/views/views.gni +++ b/chromium/ash/webui/camera_app_ui/resources/views/views.gni @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/color_internals/BUILD.gn b/chromium/ash/webui/color_internals/BUILD.gn index 061195ec771..b68499d8096 100644 --- a/chromium/ash/webui/color_internals/BUILD.gn +++ b/chromium/ash/webui/color_internals/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/color_internals/resources/BUILD.gn b/chromium/ash/webui/color_internals/resources/BUILD.gn index 4dccea63db0..9d70373755a 100644 --- a/chromium/ash/webui/color_internals/resources/BUILD.gn +++ b/chromium/ash/webui/color_internals/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -13,6 +13,7 @@ ts_library("color_internals_ts") { out_dir = "$target_gen_dir/tsc" in_files = [ "index.ts" ] + deps = [ "//ui/webui/resources/cr_components/color_change_listener:build_ts" ] composite = true tsconfig_base = "tsconfig_base.json" diff --git a/chromium/ash/webui/common/BUILD.gn b/chromium/ash/webui/common/BUILD.gn index 79aae54c2e7..87e58acf513 100644 --- a/chromium/ash/webui/common/BUILD.gn +++ b/chromium/ash/webui/common/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/common/backend/BUILD.gn b/chromium/ash/webui/common/backend/BUILD.gn index 60bde011a4a..d0bb348a904 100644 --- a/chromium/ash/webui/common/backend/BUILD.gn +++ b/chromium/ash/webui/common/backend/BUILD.gn @@ -1,5 +1,5 @@ -# Copyright 2021 The Chromium Authors.All rights reserved. -# Use of this source code is governed by a BSD - style license that can be +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") diff --git a/chromium/ash/webui/common/mojom/BUILD.gn b/chromium/ash/webui/common/mojom/BUILD.gn index b42b2f06d89..f44c388bc72 100644 --- a/chromium/ash/webui/common/mojom/BUILD.gn +++ b/chromium/ash/webui/common/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/common/mojom/accessibility_features.mojom b/chromium/ash/webui/common/mojom/accessibility_features.mojom index 34e360973c3..fd916159784 100644 --- a/chromium/ash/webui/common/mojom/accessibility_features.mojom +++ b/chromium/ash/webui/common/mojom/accessibility_features.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/common/resources/BUILD.gn b/chromium/ash/webui/common/resources/BUILD.gn index 2d42dc0f733..3246600ae4a 100644 --- a/chromium/ash/webui/common/resources/BUILD.gn +++ b/chromium/ash/webui/common/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -17,26 +17,138 @@ preprocessed_dir = "preprocessed" preprocessed_manifest = "preprocessed_manifest.json" web_component_files = [ - "cr_picture/cr_camera.js", - "cr_picture/cr_picture_list.js", - "cr_picture/cr_picture_pane.js", "keyboard_diagram.js", "keyboard_key.js", "navigation_selector.js", "navigation_view_panel.js", "page_toolbar.js", + + "bluetooth/bluetooth_icon.js", + "bluetooth/bluetooth_pairing_confirm_code_page.js", + "bluetooth/bluetooth_pairing_enter_code_page.js", + "bluetooth/bluetooth_pairing_device_selection_page.js", + "bluetooth/bluetooth_pairing_request_code_page.js", + "bluetooth/bluetooth_pairing_device_item.js", + "bluetooth/bluetooth_pairing_ui.js", + "bluetooth/bluetooth_base_page.js", + "bluetooth/bluetooth_battery_icon_percentage.js", + "bluetooth/bluetooth_device_battery_info.js", + "bluetooth/bluetooth_spinner_page.js", + + "cellular_setup/activation_code_page.js", + "cellular_setup/activation_verification_page.js", + "cellular_setup/base_page.js", + "cellular_setup/button_bar.js", + "cellular_setup/cellular_setup.js", + "cellular_setup/confirmation_code_page.js", + "cellular_setup/esim_flow_ui.js", + "cellular_setup/final_page.js", + "cellular_setup/profile_discovery_list_item.js", + "cellular_setup/profile_discovery_list_page.js", + "cellular_setup/provisioning_page.js", + "cellular_setup/psim_flow_ui.js", + "cellular_setup/cellular_eid_dialog.js", + "cellular_setup/setup_loading_page.js", + "cr_picture/cr_camera.js", + "cr_picture/cr_picture_list.js", + "cr_picture/cr_picture_pane.js", + "multidevice_setup/button_bar.js", + "multidevice_setup/multidevice_setup.js", + "multidevice_setup/password_page.js", + "multidevice_setup/setup_succeeded_page.js", + "multidevice_setup/start_setup_page.js", + "multidevice_setup/ui_page.js", + "network_health/network_diagnostics.js", + "network_health/network_health_container.js", + "network_health/network_health_summary.js", + "network_health/routine_group.js", + "network/cr_policy_network_indicator_mojo.js", + "network/network_apnlist.js", + "network/network_choose_mobile.js", + "network/network_config_input.js", + "network/network_config.js", + "network/network_config_select.js", + "network/network_config_toggle.js", + "network/network_icon.js", + "network/network_ip_config.js", + "network/network_list_item.js", + "network/network_list.js", + "network/network_nameservers.js", + "network/network_password_input.js", + "network/network_property_list_mojo.js", + "network/network_proxy_exclusions.js", + "network/network_proxy_input.js", + "network/network_proxy.js", + "network/network_select.js", + "network/network_siminfo.js", + "network/sim_lock_dialogs.js", + "quick_unlock/pin_keyboard.js", + "quick_unlock/setup_pin_keyboard.js", + "smb_shares/add_smb_share_dialog.js", + "traffic_counters/traffic_counters.js", ] non_web_component_files = [ + "cr.js", + "bluetooth/bluetooth_metrics_utils.js", + "bluetooth/bluetooth_types.js", + "bluetooth/bluetooth_utils.js", + "bluetooth/cros_bluetooth_config.js", + "cellular_setup/cellular_types.js", + "cellular_setup/cellular_setup_delegate.js", + "cellular_setup/esim_manager_listener_behavior.js", + "cellular_setup/esim_manager_utils.js", + "cellular_setup/mojo_interface_provider.js", + "cellular_setup/subflow_behavior.js", + "cellular_setup/webview_post_util.js", + "cr_container_shadow_behavior.js", "cr_picture/cr_picture_types.js", "cr_picture/png.js", "cr_picture/webcam_utils.js", + "cr_policy_indicator_behavior.js", + "cr_scrollable_behavior.js", + "event_tracker.js", + "focus_row_js.js", + "focus_row_behavior.js", + "focus_without_ink_js.js", + "i18n_behavior.js", + "keyboard_shortcut_list_js.js", + "list_property_update_behavior.js", + "multidevice_setup/fake_mojo_service.js", + "multidevice_setup/mojo_api.js", + "multidevice_setup/multidevice_setup_browser_proxy.js", + "multidevice_setup/multidevice_setup_delegate.js", + "multidevice_setup/ui_page_container_behavior.js", + "network/cellular_utils.js", + "network/cr_policy_network_behavior_mojo.js", + "network/mojo_interface_provider.js", + "network/network_config_element_behavior.js", + "network/network_listener_behavior.js", + "network/network_list_types.js", + "network/onc_mojo.js", + "network_health/mojo_interface_provider.js", + "network_health/network_diagnostics_types.js", + "post_message_api/post_message_api_client.js", + "post_message_api/post_message_api_request_handler.js", + "post_message_api/post_message_api_server.js", + "smb_shares/smb_browser_proxy.js", + "store/store.js", + "store/store_client.js", + "traffic_counters/traffic_counters_adapter.js", + "quick_unlock/lock_screen_constants.js", + "web_ui_listener_behavior.js", ] icons_html_files = [ "keyboard_icons.html", + "multidevice_setup/icons.html", "navigation_icons.html", + + "bluetooth/bluetooth_icons.html", + "cellular_setup/cellular_setup_icons.html", "cr_picture/icons.html", + "network/network_icons.html", + "quick_unlock/pin_keyboard_icons.html", ] # Files that are passed as input to html_to_wrapper(). @@ -51,7 +163,11 @@ foreach(f, html_files + icons_html_files) { html_wrapper_files += [ f + ".js" ] } -css_files = [ "navigation_shared_vars.css" ] +css_files = [ + "multidevice_setup/multidevice_setup_shared.css", + "navigation_shared_vars.css", + "network/network_shared.css", +] # Files that are generated by css_to_wrapper(). css_wrapper_files = [] @@ -102,6 +218,42 @@ generate_grd("build_grdp") { "fake_observables.js", "keyboard_layouts.js", "mojo_utils.js", + + "cellular_setup/sim_detect_error.svg", + "cellular_setup/sim_detect_error_dark.svg", + "cellular_setup/error.svg", + "cellular_setup/error_dark.svg", + "cellular_setup/final_page_success.svg", + "cellular_setup/final_page_success_dark.svg", + "cellular_setup/default_esim_profile.svg", + "cellular_setup/default_esim_profile_dark.svg", + "multidevice_setup/all_set_1x_dark.svg", + "multidevice_setup/all_set_1x_light.svg", + "multidevice_setup/all_set_2x_dark.svg", + "multidevice_setup/all_set_2x_light.svg", + "network/cellular_0.svg", + "network/cellular_0_with_x.svg", + "network/cellular_1.svg", + "network/cellular_2.svg", + "network/cellular_3.svg", + "network/cellular_4.svg", + "network/cellular_locked.svg", + "network/cellular_off.svg", + "network/ethernet.svg", + "network/roaming_badge.svg", + "network/vpn.svg", + "network/wifi_0.svg", + "network/wifi_0_with_x.svg", + "network/wifi_1.svg", + "network/wifi_2.svg", + "network/wifi_3.svg", + "network/wifi_4.svg", + "network/wifi_off.svg", + "network_health/test_canceled.png", + "network_health/test_failed.png", + "network_health/test_not_run.png", + "network_health/test_passed.png", + "network_health/test_warning.png", ] input_files_base_dir = rebase_path(".", "//") public_deps = [ ":preprocess" ] @@ -112,34 +264,117 @@ generate_grd("build_grdp") { } generate_definitions_js_files = [ + "bluetooth/bluetooth_metrics_utils.js", + "bluetooth/bluetooth_types.js", + "bluetooth/bluetooth_utils.js", + "bluetooth/cros_bluetooth_config.js", + "cellular_setup/cellular_setup_icons.html.js", + "cellular_setup/esim_manager_utils.js", + "cellular_setup/mojo_interface_provider.js", "cr_picture/cr_camera.html.js", - "cr_picture/cr_camera.js", "cr_picture/cr_picture_list.html.js", "cr_picture/cr_picture_list.js", "cr_picture/cr_picture_pane.html.js", - "cr_picture/cr_picture_pane.js", "cr_picture/cr_picture_types.js", "cr_picture/icons.html.js", "cr_picture/png.js", "cr_picture/webcam_utils.js", + "event_tracker.js", + "focus_row_js.js", + "focus_without_ink_js.js", + "keyboard_shortcut_list_js.js", + "navigation_shared_vars.css.js", + "network/network_shared.css.js", + "network/onc_mojo.js", + "quick_unlock/lock_screen_constants.js", + "quick_unlock/pin_keyboard_icons.html.js", + "store/store.js", + "store/store_client.js", ] ts_definitions("generate_definitions") { root_dir = "$target_gen_dir/$preprocessed_dir" out_dir = "$target_gen_dir/$preprocessed_dir" js_files = generate_definitions_js_files + deps = [ "//ui/webui/resources:library" ] extra_deps = [ + ":copy_checked_in_dts_files", ":css_wrapper_files", ":html_wrapper_files", ":preprocess", - "//ui/webui/resources:library", ] } checked_in_dts_files = [ + "cr_container_shadow_behavior.d.ts", + "cr_scrollable_behavior.d.ts", + "cr_policy_indicator_behavior.d.ts", + "fake_method_resolver.d.ts", + "fake_observables.d.ts", + "focus_row_behavior.d.ts", + "i18n_behavior.d.ts", + "keyboard_diagram.d.ts", + "keyboard_key.d.ts", + "list_property_update_behavior.d.ts", + "page_toolbar.d.ts", "navigation_view_panel.d.ts", "navigation_selector.d.ts", + "web_ui_listener_behavior.d.ts", + + "bluetooth/bluetooth_base_page.d.ts", + "bluetooth/bluetooth_battery_icon_percentage.d.ts", + "bluetooth/bluetooth_device_battery_info.d.ts", + "bluetooth/bluetooth_icon.d.ts", + "bluetooth/bluetooth_pairing_confirm_code_page.d.ts", + "bluetooth/bluetooth_pairing_device_item.d.ts", + "bluetooth/bluetooth_pairing_device_selection_page.d.ts", + "bluetooth/bluetooth_pairing_enter_code_page.d.ts", + "bluetooth/bluetooth_pairing_request_code_page.d.ts", + "bluetooth/bluetooth_pairing_ui.d.ts", + "bluetooth/bluetooth_spinner_page.d.ts", + + "cellular_setup/base_page.d.ts", + "cellular_setup/button_bar.d.ts", + "cellular_setup/cellular_eid_dialog.d.ts", + "cellular_setup/cellular_setup.d.ts", + "cellular_setup/cellular_setup_delegate.d.ts", + "cellular_setup/cellular_types.d.ts", + "cellular_setup/esim_flow_ui.d.ts", + "cellular_setup/esim_manager_listener_behavior.d.ts", + "cellular_setup/profile_discovery_list_page.d.ts", + "cellular_setup/provisioning_page.d.ts", + "cellular_setup/psim_flow_ui.d.ts", + "cellular_setup/setup_loading_page.d.ts", + "cr_picture/cr_camera.d.ts", + "cr_picture/cr_picture_pane.d.ts", + "smb_shares/add_smb_share_dialog.d.ts", + "smb_shares/smb_browser_proxy.d.ts", + "traffic_counters/traffic_counters_adapter.d.ts", + "traffic_counters/traffic_counters.d.ts", + "quick_unlock/pin_keyboard.d.ts", + "quick_unlock/setup_pin_keyboard.d.ts", + + "network/cellular_utils.d.ts", + "network/cr_policy_network_behavior_mojo.d.ts", + "network/cr_policy_network_indicator_mojo.d.ts", + "network/mojo_interface_provider.d.ts", + "network/network_apnlist.d.ts", + "network/network_choose_mobile.d.ts", + "network/network_config.d.ts", + "network/network_config_input.d.ts", + "network/network_config_toggle.d.ts", + "network/network_icon.d.ts", + "network/network_ip_config.d.ts", + "network/network_list.d.ts", + "network/network_list_item.d.ts", + "network/network_list_types.d.ts", + "network/network_listener_behavior.d.ts", + "network/network_nameservers.d.ts", + "network/network_property_list_mojo.d.ts", + "network/network_proxy.d.ts", + "network/network_siminfo.d.ts", + "network/sim_lock_dialogs.d.ts", ] copy("copy_checked_in_dts_files") { @@ -150,18 +385,34 @@ copy("copy_checked_in_dts_files") { group("closure_compile") { deps = [ ":closure_compile_local", + "bluetooth:closure_compile_module", + "cellular_setup:closure_compile_module", "cr_picture:closure_compile_module", + "multidevice_setup:closure_compile_module", + "network:closure_compile_module", + "network_health:closure_compile_module", + "post_message_api:closure_compile", + "quick_unlock:closure_compile_module", + "smb_shares:closure_compile_module", + "store:closure_compile_module", + "traffic_counters:closure_compile_module", ] } js_type_check("closure_compile_local") { is_polymer3 = true deps = [ + ":event_tracker", ":fake_method_resolver", ":fake_observables", + ":focus_row_behavior", + ":focus_row_js", + ":focus_without_ink_js", ":keyboard_diagram", ":keyboard_key", ":keyboard_layouts", + ":keyboard_shortcut_list_js", + ":list_property_update_behavior", ":mojo_utils", ":navigation_selector", ":navigation_view_panel", @@ -169,6 +420,24 @@ js_type_check("closure_compile_local") { ] } +js_library("cr_container_shadow_behavior") { + deps = [ "//ui/webui/resources/js:assert" ] +} + +js_library("cr_policy_indicator_behavior") { + deps = [ "//ui/webui/resources/js:assert" ] +} + +js_library("cr_scrollable_behavior") { + deps = [ + "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("event_tracker") { +} + js_library("fake_observables") { deps = [ "//ui/webui/resources/js:cr.m" ] } @@ -177,19 +446,50 @@ js_library("fake_method_resolver") { deps = [ "//ui/webui/resources/js:cr.m" ] } +js_library("focus_row_js") { + deps = [ + ":event_tracker", + "//ui/webui/resources/js:assert", + "//ui/webui/resources/js:util", + ] +} + +js_library("focus_row_behavior") { + deps = [ + ":focus_row_js", + ":focus_without_ink_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] +} + +js_library("focus_without_ink_js") { + deps = [ + "//ui/webui/resources/js:assert", + "//ui/webui/resources/js:cr.m", + ] +} + +js_library("i18n_behavior") { + deps = [ + "//ui/webui/resources/js:load_time_data.m", + "//ui/webui/resources/js:parse_html_subset", + ] +} + js_library("keyboard_diagram") { deps = [ ":keyboard_key", ":keyboard_layouts", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("keyboard_key") { deps = [ + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -197,6 +497,15 @@ js_library("keyboard_layouts") { sources = [ "keyboard_layouts.js" ] } +js_library("keyboard_shortcut_list_js") { +} + +js_library("list_property_update_behavior") { + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + js_library("mojo_utils") { deps = [ "//ash/webui/common/mojom:mojom_js_library_for_compile" ] } @@ -219,3 +528,7 @@ js_library("page_toolbar") { "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", ] } + +js_library("web_ui_listener_behavior") { + deps = [ "//ui/webui/resources/js:cr.m" ] +} diff --git a/chromium/ash/webui/common/resources/bluetooth/BUILD.gn b/chromium/ash/webui/common/resources/bluetooth/BUILD.gn new file mode 100644 index 00000000000..f66b70114dd --- /dev/null +++ b/chromium/ash/webui/common/resources/bluetooth/BUILD.gn @@ -0,0 +1,159 @@ +# Copyright 2020 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "Bluetooth dialog is Chrome OS only.") + +js_type_check("closure_compile_module") { + is_polymer3 = true + closure_flags = default_closure_args + mojom_js_args + + deps = [ + ":bluetooth_base_page", + ":bluetooth_battery_icon_percentage", + ":bluetooth_device_battery_info", + ":bluetooth_icon", + ":bluetooth_metrics_utils", + ":bluetooth_pairing_confirm_code_page", + ":bluetooth_pairing_device_item", + ":bluetooth_pairing_device_selection_page", + ":bluetooth_pairing_enter_code_page", + ":bluetooth_pairing_request_code_page", + ":bluetooth_pairing_ui", + ":bluetooth_spinner_page", + ":bluetooth_types", + ":bluetooth_utils", + ":cros_bluetooth_config", + ] +} + +js_library("bluetooth_metrics_utils") { + externs_list = chrome_extension_public_externs + [ + "$externs_path/metrics_private.js", + "$externs_path/bluetooth.js", + "$externs_path/bluetooth_private.js", + ] +} + +js_library("bluetooth_utils") { + deps = [ + ":bluetooth_types", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + ] +} + +js_library("bluetooth_types") { +} + +js_library("bluetooth_icon") { + deps = [ + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("bluetooth_pairing_device_item") { + deps = [ + ":bluetooth_icon", + ":bluetooth_types", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("bluetooth_pairing_device_selection_page") { + deps = [ + ":bluetooth_base_page", + ":bluetooth_pairing_device_item", + ":bluetooth_types", + "//ash/webui/common/resources:cr_scrollable_behavior", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + + externs_list = [ "//ui/webui/resources/cr_components/localized_link/localized_link_externs.js" ] +} + +js_library("bluetooth_pairing_request_code_page") { + deps = [ + ":bluetooth_base_page", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js" ] +} + +js_library("bluetooth_pairing_confirm_code_page") { + deps = [ + ":bluetooth_base_page", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("bluetooth_pairing_enter_code_page") { + deps = [ + ":bluetooth_base_page", + ":bluetooth_types", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("bluetooth_pairing_ui") { + deps = [ + ":bluetooth_pairing_confirm_code_page", + ":bluetooth_pairing_device_selection_page", + ":bluetooth_pairing_request_code_page", + ":cros_bluetooth_config", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] +} + +js_library("bluetooth_base_page") { + deps = [ + ":bluetooth_types", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ] +} + +js_library("bluetooth_battery_icon_percentage") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/bluetooth:bluetooth_utils", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("bluetooth_device_battery_info") { + deps = [ + "//ash/webui/common/resources:focus_row_behavior", + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/bluetooth:bluetooth_utils", + "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("cros_bluetooth_config") { + deps = + [ "//chromeos/ash/services/bluetooth_config/public/mojom:mojom_webui_js" ] +} + +js_library("bluetooth_spinner_page") { + deps = [ + ":bluetooth_base_page", + "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} diff --git a/chromium/ash/webui/common/resources/cellular_setup/BUILD.gn b/chromium/ash/webui/common/resources/cellular_setup/BUILD.gn new file mode 100644 index 00000000000..8e5a2ace369 --- /dev/null +++ b/chromium/ash/webui/common/resources/cellular_setup/BUILD.gn @@ -0,0 +1,230 @@ +# Copyright 2019 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "CellularSetup UI is Chrome OS only.") + +js_type_check("closure_compile_module") { + is_polymer3 = true + closure_flags = default_closure_args + mojom_js_args + + deps = [ + ":activation_code_page", + ":activation_verification_page", + ":base_page", + ":button_bar", + ":cellular_eid_dialog", + ":cellular_setup", + ":cellular_setup_delegate", + ":cellular_types", + ":confirmation_code_page", + ":esim_flow_ui", + ":esim_manager_listener_behavior", + ":esim_manager_utils", + ":final_page", + ":mojo_interface_provider", + ":profile_discovery_list_item", + ":profile_discovery_list_page", + ":provisioning_page", + ":psim_flow_ui", + ":setup_loading_page", + ":subflow_behavior", + ":webview_post_util", + ] +} + +js_library("base_page") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("final_page") { + deps = [ + ":base_page", + ":cellular_setup_delegate", + "//ash/webui/common/resources:i18n_behavior", + ] +} + +js_library("activation_verification_page") { + deps = [ + ":base_page", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_lottie/cr_lottie_externs.js" ] +} + +js_library("activation_code_page") { + deps = [ + ":cellular_setup_delegate", + ":subflow_behavior", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("confirmation_code_page") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite", + ] +} + +js_library("profile_discovery_list_item") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite", + ] +} + +js_library("profile_discovery_list_page") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list", + ] +} + +js_library("mojo_interface_provider") { + deps = [ + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + "//ui/webui/resources/js:cr.m", + ] +} + +js_library("esim_manager_utils") { + deps = [ + ":mojo_interface_provider", + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + ] +} + +js_library("esim_manager_listener_behavior") { + deps = [ + ":mojo_interface_provider", + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + ] +} + +js_library("webview_post_util") { + deps = [] + externs_list = [ + "$externs_path/chrome_extensions.js", + "$externs_path/webview_tag.js", + ] +} + +js_library("setup_loading_page") { + deps = [ + ":base_page", + ":cellular_setup_delegate", + "//ui/webui/resources/js:assert", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_lottie/cr_lottie_externs.js" ] +} + +js_library("provisioning_page") { + deps = [ + ":base_page", + ":cellular_setup_delegate", + ":webview_post_util", + "//ash/webui/common/resources:i18n_behavior", + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] + externs_list = [ + "$externs_path/chrome_extensions.js", + "$externs_path/webview_tag.js", + ] +} + +js_library("button_bar") { + deps = [ + ":cellular_types", + "//ash/webui/common/resources:focus_without_ink_js", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("cellular_types") { +} + +js_library("cellular_setup_delegate") { +} + +js_library("subflow_behavior") { + deps = [ ":cellular_types" ] +} + +js_library("psim_flow_ui") { + deps = [ + ":cellular_setup_delegate", + ":cellular_types", + ":final_page", + ":mojo_interface_provider", + ":provisioning_page", + ":setup_loading_page", + ":subflow_behavior", + "//ash/webui/common/resources:i18n_behavior", + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] + externs_list = [ "$externs_path/metrics_private.js" ] +} + +js_library("esim_flow_ui") { + deps = [ + ":activation_code_page", + ":activation_verification_page", + ":cellular_setup_delegate", + ":cellular_types", + ":confirmation_code_page", + ":esim_manager_utils", + ":final_page", + ":mojo_interface_provider", + ":profile_discovery_list_item", + ":profile_discovery_list_page", + ":subflow_behavior", + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/network:cellular_utils", + "//ash/webui/common/resources/network:mojo_interface_provider", + "//ash/webui/common/resources/network:network_listener_behavior", + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + "//chromeos/services/network_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] + externs_list = [ "$externs_path/metrics_private.js" ] +} + +js_library("cellular_eid_dialog") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//chromeos/ash/services/cellular_setup/public/mojom:mojom_webui_js", + ] +} + +js_library("cellular_setup") { + deps = [ + ":button_bar", + ":cellular_setup_delegate", + ":cellular_types", + ":esim_flow_ui", + ":psim_flow_ui", + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/network:cellular_utils", + "//ash/webui/common/resources/network:mojo_interface_provider", + ] +} diff --git a/chromium/ash/webui/common/resources/cr_picture/BUILD.gn b/chromium/ash/webui/common/resources/cr_picture/BUILD.gn index 1c925f6ae21..6f9f8cf5318 100644 --- a/chromium/ash/webui/common/resources/cr_picture/BUILD.gn +++ b/chromium/ash/webui/common/resources/cr_picture/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. +# Copyright 2018 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -44,6 +44,6 @@ js_library("cr_picture_list") { ":cr_picture_types", ":png", "//third_party/polymer/v3_0/components-chromium/iron-selector:iron-selector", - "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:assert", ] } diff --git a/chromium/ash/webui/common/resources/multidevice_setup/BUILD.gn b/chromium/ash/webui/common/resources/multidevice_setup/BUILD.gn new file mode 100644 index 00000000000..551b1f9a736 --- /dev/null +++ b/chromium/ash/webui/common/resources/multidevice_setup/BUILD.gn @@ -0,0 +1,106 @@ +# Copyright 2018 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "MultiDevice UI is Chrome OS only.") + +js_type_check("closure_compile_module") { + is_polymer3 = true + closure_flags = default_closure_args + mojom_js_args + + deps = [ + ":button_bar", + ":fake_mojo_service", + ":mojo_api", + ":multidevice_setup", + ":multidevice_setup_browser_proxy", + ":multidevice_setup_delegate", + ":password_page", + ":setup_succeeded_page", + ":start_setup_page", + ":ui_page", + ":ui_page_container_behavior", + ] +} + +js_library("button_bar") { + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("fake_mojo_service") { + deps = [ + "//ash/services/multidevice_setup/public/mojom:mojom_webui_js", + "//ui/webui/resources/js:cr.m", + ] +} + +js_library("mojo_api") { + deps = [ + "//ash/services/multidevice_setup/public/mojom:mojom_webui_js", + "//ui/webui/resources/js:cr.m", + ] +} + +js_library("multidevice_setup") { + deps = [ + ":button_bar", + ":fake_mojo_service", + ":mojo_api", + ":multidevice_setup_delegate", + ":password_page", + ":setup_succeeded_page", + ":start_setup_page", + "//ash/services/multidevice_setup/public/mojom:mojom_webui_js", + "//ash/webui/common/resources:web_ui_listener_behavior", + "//ui/webui/resources/js:cr.m", + ] +} + +js_library("multidevice_setup_browser_proxy") { + deps = [ "//ui/webui/resources/js:cr.m" ] +} + +js_library("multidevice_setup_delegate") { + deps = [ "//ui/webui/resources/js:cr.m" ] +} + +js_library("password_page") { + deps = [ ":multidevice_setup_browser_proxy" ] + externs_list = chrome_extension_public_externs + + [ "$externs_path/quick_unlock_private.js" ] + extra_sources = [ "$interfaces_path/quick_unlock_private_interface.js" ] +} + +js_library("setup_succeeded_page") { + deps = [ + ":multidevice_setup_browser_proxy", + ":ui_page_container_behavior", + ] +} + +js_library("start_setup_page") { + deps = [ + ":mojo_api", + ":multidevice_setup_delegate", + ":ui_page_container_behavior", + "//ash/services/device_sync/public/mojom:mojom_webui_js", + "//ash/services/multidevice_setup/public/mojom:mojom_webui_js", + "//ash/webui/common/resources:web_ui_listener_behavior", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_lottie/cr_lottie_externs.js" ] +} + +js_library("ui_page_container_behavior") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//ui/webui/resources/js:cr.m", + ] +} + +js_library("ui_page") { +} diff --git a/chromium/ash/webui/common/resources/network/BUILD.gn b/chromium/ash/webui/common/resources/network/BUILD.gn new file mode 100644 index 00000000000..c8568811a0e --- /dev/null +++ b/chromium/ash/webui/common/resources/network/BUILD.gn @@ -0,0 +1,348 @@ +# Copyright 2018 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "Only ChromeOS components belong here.") + +js_type_check("closure_compile_module") { + is_polymer3 = true + closure_flags = default_closure_args + mojom_js_args + + deps = [ + ":cellular_utils", + ":cr_policy_network_behavior_mojo", + ":cr_policy_network_indicator_mojo", + ":mojo_interface_provider", + ":network_apnlist", + ":network_choose_mobile", + ":network_config", + ":network_config_element_behavior", + ":network_config_input", + ":network_config_select", + ":network_config_toggle", + ":network_icon", + ":network_ip_config", + ":network_list", + ":network_list_item", + ":network_list_types", + ":network_listener_behavior", + ":network_nameservers", + ":network_password_input", + ":network_property_list_mojo", + ":network_proxy", + ":network_proxy_exclusions", + ":network_proxy_input", + ":network_select", + ":network_siminfo", + ":onc_mojo", + ":sim_lock_dialogs", + ] +} + +js_library("mojo_interface_provider") { + deps = [ + "//chromeos/services/network_config/public/mojom:mojom_webui_js", + "//ui/webui/resources/js:cr.m", + ] +} + +js_library("cr_policy_network_behavior_mojo") { + deps = [ + "//ash/webui/common/resources:cr_policy_indicator_behavior", + "//chromeos/services/network_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("cr_policy_network_indicator_mojo") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":onc_mojo", + "//ash/webui/common/resources:cr_policy_indicator_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("network_apnlist") { + deps = [ + ":network_property_list_mojo", + ":onc_mojo", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + "//ui/webui/resources/js:load_time_data.m", + ] + externs_list = [ + "$externs_path/metrics_private.js", + "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js", + "//ui/webui/resources/cr_elements/policy/cr_tooltip_icon_externs.js", + ] +} + +js_library("network_choose_mobile") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//chromeos/services/network_config/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ] +} + +js_library("network_config") { + deps = [ + ":mojo_interface_provider", + ":network_config_input", + ":network_config_select", + ":network_config_toggle", + ":network_listener_behavior", + ":network_password_input", + "//ash/webui/common/resources:i18n_behavior", + "//chrome/browser/ui/webui/settings/ash/search:mojo_bindings_js_library_for_compile", + "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes", + "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon", + "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:load_time_data.m", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js", + "//ui/webui/resources/cr_elements/cr_toggle/cr_toggle_externs.js", + "//ui/webui/resources/cr_elements/policy/cr_policy_indicator_externs.js", + ] +} + +js_library("network_config_element_behavior") { +} + +js_library("network_config_input") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":cr_policy_network_indicator_mojo", + ":network_config_element_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js" ] +} + +js_library("network_config_select") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":cr_policy_network_indicator_mojo", + ":network_config_element_behavior", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/policy/cr_tooltip_icon_externs.js" ] +} + +js_library("network_config_toggle") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":cr_policy_network_indicator_mojo", + ":network_config_element_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_toggle/cr_toggle_externs.js" ] +} + +js_library("network_icon") { + deps = [ + ":onc_mojo", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] +} + +js_library("network_ip_config") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":network_property_list_mojo", + ":onc_mojo", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_toggle/cr_toggle_externs.js", + "//ui/webui/resources/cr_elements/policy/cr_policy_indicator_externs.js", + ] +} + +js_library("network_list") { + deps = [ + ":network_list_item", + ":network_list_types", + ":onc_mojo", + "//ash/webui/common/resources:cr_scrollable_behavior", + "//ash/webui/common/resources:list_property_update_behavior", + "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("network_list_item") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":mojo_interface_provider", + ":network_list_types", + ":onc_mojo", + "//ash/webui/common/resources:focus_row_behavior", + "//ash/webui/common/resources/cellular_setup:cellular_types", + "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("network_list_types") { + deps = [ ":onc_mojo" ] +} + +js_library("network_listener_behavior") { + deps = [ + ":mojo_interface_provider", + "//ui/webui/resources/js:assert", + ] +} + +js_library("network_nameservers") { + deps = [ + ":cr_policy_network_behavior_mojo", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js", + "//ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_externs.js", + "//ui/webui/resources/cr_elements/policy/cr_policy_indicator_externs.js", + ] +} + +js_library("network_password_input") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":cr_policy_network_indicator_mojo", + ":network_config_element_behavior", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js" ] +} + +js_library("network_property_list_mojo") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":cr_policy_network_indicator_mojo", + ":onc_mojo", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js" ] +} + +js_library("network_proxy") { + deps = [ + ":cr_policy_network_behavior_mojo", + ":network_proxy_exclusions", + ":network_proxy_input", + ":onc_mojo", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js", + "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js", + "//ui/webui/resources/cr_elements/cr_toggle/cr_toggle_externs.js", + ] +} + +js_library("network_proxy_exclusions") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("network_proxy_input") { + deps = [ + ":onc_mojo", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js" ] +} + +js_library("network_select") { + deps = [ + ":network_list", + ":network_list_types", + ":network_listener_behavior", + ":onc_mojo", + "//third_party/polymer/v3_0/components-chromium/paper-progress:paper-progress", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("network_siminfo") { + deps = [ + ":mojo_interface_provider", + ":network_list_types", + ":network_password_input", + ":onc_mojo", + ":sim_lock_dialogs", + "//ash/webui/common/resources:focus_without_ink_js", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes", + "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js", + "//ui/webui/resources/cr_elements/cr_toggle/cr_toggle_externs.js", + ] +} + +js_library("onc_mojo") { + deps = [ + "//chromeos/services/network_config/public/mojom:mojom_webui_js", + "//ui/webui/resources/js:assert", + "//ui/webui/resources/js:load_time_data.m", + ] +} + +js_library("cellular_utils") { + deps = [ + ":mojo_interface_provider", + ":onc_mojo", + ] +} + +js_library("sim_lock_dialogs") { + deps = [ + ":mojo_interface_provider", + ":network_password_input", + ":onc_mojo", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/iron-flex-layout:iron-flex-layout-classes", + "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js", + "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js", + "//ui/webui/resources/cr_elements/cr_toggle/cr_toggle_externs.js", + ] +} diff --git a/chromium/ash/webui/common/resources/network_health/BUILD.gn b/chromium/ash/webui/common/resources/network_health/BUILD.gn new file mode 100644 index 00000000000..707dcfdecdb --- /dev/null +++ b/chromium/ash/webui/common/resources/network_health/BUILD.gn @@ -0,0 +1,64 @@ +# Copyright 2020 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "Only ChromeOS components belong here.") + +js_type_check("closure_compile_module") { + is_polymer3 = true + closure_flags = default_closure_args + mojom_js_args + deps = [ + ":mojo_interface_provider", + ":network_diagnostics", + ":network_diagnostics_types", + ":network_health_container", + ":network_health_summary", + ":routine_group", + ] +} + +js_library("mojo_interface_provider") { + deps = [ "//chromeos/services/network_health/public/mojom:mojom_webui_js" ] +} + +js_library("network_health_summary") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/network:onc_mojo", + "//chromeos/services/network_health/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:assert", + ] +} + +js_library("network_health_container") { + deps = + [ "//third_party/polymer/v3_0/components-chromium/iron-icon:iron-icon" ] +} + +js_library("network_diagnostics") { + deps = [ + ":mojo_interface_provider", + ":network_diagnostics_types", + ":routine_group", + "//ash/webui/common/resources:i18n_behavior", + "//chromeos/services/network_health/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("network_diagnostics_types") { + deps = [ "//chromeos/services/network_health/public/mojom:mojom_webui_js" ] +} + +js_library("routine_group") { + deps = [ + ":network_diagnostics_types", + ":network_health_container", + "//ash/webui/common/resources:i18n_behavior", + "//chromeos/services/network_health/public/mojom:mojom_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} diff --git a/chromium/ash/webui/common/resources/post_message_api/BUILD.gn b/chromium/ash/webui/common/resources/post_message_api/BUILD.gn new file mode 100644 index 00000000000..cef3bb736a7 --- /dev/null +++ b/chromium/ash/webui/common/resources/post_message_api/BUILD.gn @@ -0,0 +1,27 @@ +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chromeos/ui_mode.gni") +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash) + +js_type_check("closure_compile") { + deps = [ + ":post_message_api_client", + ":post_message_api_request_handler", + ":post_message_api_server", + ] +} + +js_library("post_message_api_server") { + deps = [ ":post_message_api_request_handler" ] +} + +js_library("post_message_api_client") { + deps = [ ":post_message_api_request_handler" ] +} + +js_library("post_message_api_request_handler") { +} diff --git a/chromium/ash/webui/common/resources/quick_unlock/BUILD.gn b/chromium/ash/webui/common/resources/quick_unlock/BUILD.gn new file mode 100644 index 00000000000..ef0608bd9d9 --- /dev/null +++ b/chromium/ash/webui/common/resources/quick_unlock/BUILD.gn @@ -0,0 +1,43 @@ +# Copyright 2017 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "Only ChromeOS components belong here.") + +js_type_check("closure_compile_module") { + is_polymer3 = true + deps = [ + ":lock_screen_constants", + ":pin_keyboard", + ":setup_pin_keyboard", + ] +} + +js_library("lock_screen_constants") { + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:cr.m", + ] +} + +js_library("pin_keyboard") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js" ] +} + +js_library("setup_pin_keyboard") { + deps = [ + ":lock_screen_constants", + ":pin_keyboard", + "//ash/webui/common/resources:i18n_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = [ "$externs_path/quick_unlock_private.js" ] + extra_sources = [ "$interfaces_path/quick_unlock_private_interface.js" ] +} diff --git a/chromium/ash/webui/common/resources/smb_shares/BUILD.gn b/chromium/ash/webui/common/resources/smb_shares/BUILD.gn new file mode 100644 index 00000000000..85d6df44629 --- /dev/null +++ b/chromium/ash/webui/common/resources/smb_shares/BUILD.gn @@ -0,0 +1,35 @@ +# Copyright 2018 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "SMB Shares is Chrome OS only.") + +js_type_check("closure_compile_module") { + is_polymer3 = true + deps = [ + ":add_smb_share_dialog", + ":smb_browser_proxy", + ] +} + +js_library("add_smb_share_dialog") { + deps = [ + ":smb_browser_proxy", + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources:web_ui_listener_behavior", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:load_time_data.m", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js", + "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js", + "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js", + ] +} + +js_library("smb_browser_proxy") { + deps = [ "//ui/webui/resources/js:cr.m" ] +} diff --git a/chromium/ash/webui/common/resources/store/BUILD.gn b/chromium/ash/webui/common/resources/store/BUILD.gn new file mode 100644 index 00000000000..ab6106ec659 --- /dev/null +++ b/chromium/ash/webui/common/resources/store/BUILD.gn @@ -0,0 +1,25 @@ +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "Only ChromeOS components belong here.") + +# JS type check for Polymer 3 +js_type_check("closure_compile_module") { + deps = [ + ":store", + ":store_client", + ] +} + +js_library("store") { +} + +js_library("store_client") { + deps = [ + ":store", + "//ui/webui/resources/js:assert", + ] +} diff --git a/chromium/ash/webui/common/resources/traffic_counters/BUILD.gn b/chromium/ash/webui/common/resources/traffic_counters/BUILD.gn new file mode 100644 index 00000000000..32679c595cc --- /dev/null +++ b/chromium/ash/webui/common/resources/traffic_counters/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "Only ChromeOS components belong here.") + +# JS type check for Polymer 3 +js_type_check("closure_compile_module") { + is_polymer3 = true + + closure_flags = default_closure_args + mojom_js_args + + [ "js_module_root=" + rebase_path(".", root_build_dir) ] + + deps = [ + ":traffic_counters", + ":traffic_counters_adapter", + ] +} + +js_library("traffic_counters") { + deps = [ + ":traffic_counters_adapter", + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/network:onc_mojo", + "//chromeos/services/network_config/public/mojom:mojom_webui_js", + "//chromeos/services/network_config/public/mojom:network_types_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("traffic_counters_adapter") { + deps = [ + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/network:mojo_interface_provider", + "//ash/webui/common/resources/network:onc_mojo", + "//chromeos/services/network_config/public/mojom:mojom_webui_js", + "//chromeos/services/network_config/public/mojom:network_types_webui_js", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} diff --git a/chromium/ash/webui/connectivity_diagnostics/BUILD.gn b/chromium/ash/webui/connectivity_diagnostics/BUILD.gn index c8a8482047b..a09293c4ed4 100644 --- a/chromium/ash/webui/connectivity_diagnostics/BUILD.gn +++ b/chromium/ash/webui/connectivity_diagnostics/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/connectivity_diagnostics/resources/BUILD.gn b/chromium/ash/webui/connectivity_diagnostics/resources/BUILD.gn index 69088f46565..61aa068ca7e 100644 --- a/chromium/ash/webui/connectivity_diagnostics/resources/BUILD.gn +++ b/chromium/ash/webui/connectivity_diagnostics/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -21,11 +21,11 @@ js_type_check("closure_compile_module") { js_library("connectivity_diagnostics") { deps = [ + "//ash/webui/common/resources:cr_container_shadow_behavior", + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/network_health:network_diagnostics", + "//ash/webui/common/resources/network_health:network_health_summary", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_components/chromeos/network_health:network_diagnostics", - "//ui/webui/resources/cr_components/chromeos/network_health:network_health_summary", - "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m", - "//ui/webui/resources/js:i18n_behavior.m", ] externs_list = [ "$externs_path/chrome_send.js" ] diff --git a/chromium/ash/webui/demo_mode_app_ui/BUILD.gn b/chromium/ash/webui/demo_mode_app_ui/BUILD.gn index 8bf3636924b..f44a2468c68 100644 --- a/chromium/ash/webui/demo_mode_app_ui/BUILD.gn +++ b/chromium/ash/webui/demo_mode_app_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -8,7 +8,6 @@ import("//tools/grit/preprocess_if_expr.gni") import("//ui/webui/resources/tools/generate_grd.gni") assert(is_chromeos_ash, "Demo Mode App is ash-chrome only") -assert(!is_official_build, "Demo Mode App is only built for unofficial builds") static_library("demo_mode_app_ui") { sources = [ @@ -48,8 +47,12 @@ js_type_check("closure_compile") { } js_library("app") { - sources = [ "resources/page_handler.js" ] deps = [ "//ash/webui/demo_mode_app_ui/mojom:mojom_webui_js" ] + externs_list = [ "$externs_path/metrics_private_individual_apis.js" ] + sources = [ + "resources/demo_mode_metrics_service.js", + "resources/page_handler.js", + ] } grd_prefix = "ash_demo_mode_app" @@ -69,9 +72,8 @@ generate_grd("build_grd") { deps = [ ":build_mojo_grdp" ] input_files = [ "app_icon_192.png", - "demo_mode_app.js", - "demo_mode_app.html", "page_handler.js", + "demo_mode_metrics_service.js", ] grd_prefix = grd_prefix out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" diff --git a/chromium/ash/webui/demo_mode_app_ui/mojom/BUILD.gn b/chromium/ash/webui/demo_mode_app_ui/mojom/BUILD.gn index 63b69f16a43..29e349bbc5d 100644 --- a/chromium/ash/webui/demo_mode_app_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/demo_mode_app_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -6,7 +6,6 @@ import("//build/config/chromeos/ui_mode.gni") import("//mojo/public/tools/bindings/mojom.gni") assert(is_chromeos_ash, "Demo Mode App is ash-chrome only") -assert(!is_official_build, "Demo Mode App is only built for unofficial builds") mojom("mojom") { sources = [ "demo_mode_app_untrusted_ui.mojom" ] diff --git a/chromium/ash/webui/demo_mode_app_ui/mojom/demo_mode_app_untrusted_ui.mojom b/chromium/ash/webui/demo_mode_app_ui/mojom/demo_mode_app_untrusted_ui.mojom index d2d7d6d9c5b..6a215fce9b5 100644 --- a/chromium/ash/webui/demo_mode_app_ui/mojom/demo_mode_app_untrusted_ui.mojom +++ b/chromium/ash/webui/demo_mode_app_ui/mojom/demo_mode_app_untrusted_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/diagnostics_ui/BUILD.gn b/chromium/ash/webui/diagnostics_ui/BUILD.gn index 7629de72dd0..71d00bcc7fd 100644 --- a/chromium/ash/webui/diagnostics_ui/BUILD.gn +++ b/chromium/ash/webui/diagnostics_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -37,10 +37,6 @@ static_library("diagnostics_ui") { ] } -group("closure_compile") { - deps = [ "resources:closure_compile_module" ] -} - source_set("unit_tests") { testonly = true diff --git a/chromium/ash/webui/diagnostics_ui/backend/BUILD.gn b/chromium/ash/webui/diagnostics_ui/backend/BUILD.gn index a1fd10f88ce..5c3fb361565 100644 --- a/chromium/ash/webui/diagnostics_ui/backend/BUILD.gn +++ b/chromium/ash/webui/diagnostics_ui/backend/BUILD.gn @@ -1,5 +1,5 @@ -# Copyright 2020 The Chromium Authors.All rights reserved. -# Use of this source code is governed by a BSD - style license that can be +# Copyright 2020 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") @@ -75,6 +75,7 @@ source_set("unit_tests") { sources = [ "cpu_usage_data_unittest.cc", + "input_data_provider_keyboard_unittest.cc", "input_data_provider_unittest.cc", "network_health_provider_unittest.cc", "power_manager_client_conversions_unittest.cc", diff --git a/chromium/ash/webui/diagnostics_ui/mojom/BUILD.gn b/chromium/ash/webui/diagnostics_ui/mojom/BUILD.gn index 392deb32aaa..5418d84ab30 100644 --- a/chromium/ash/webui/diagnostics_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/diagnostics_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -15,6 +15,8 @@ mojom("mojom") { "system_routine_controller.mojom", ] + webui_module_path = "/ash/webui/diagnostics_ui" + public_deps = [ "//mojo/public/mojom/base" ] cpp_typemaps = [ diff --git a/chromium/ash/webui/diagnostics_ui/mojom/input_data_provider.mojom b/chromium/ash/webui/diagnostics_ui/mojom/input_data_provider.mojom index 8651d7c0c8a..106421758b7 100644 --- a/chromium/ash/webui/diagnostics_ui/mojom/input_data_provider.mojom +++ b/chromium/ash/webui/diagnostics_ui/mojom/input_data_provider.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/diagnostics_ui/mojom/network_health_provider.mojom b/chromium/ash/webui/diagnostics_ui/mojom/network_health_provider.mojom index 1f2ea327459..19519691467 100644 --- a/chromium/ash/webui/diagnostics_ui/mojom/network_health_provider.mojom +++ b/chromium/ash/webui/diagnostics_ui/mojom/network_health_provider.mojom @@ -1,11 +1,9 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. module ash.diagnostics.mojom; -import "mojo/public/mojom/base/string16.mojom"; - // Contains IP config properties for a single network connection. struct IPConfigProperties { array<string>? name_servers; diff --git a/chromium/ash/webui/diagnostics_ui/mojom/system_data_provider.mojom b/chromium/ash/webui/diagnostics_ui/mojom/system_data_provider.mojom index ca3635cfb64..cc0471d2b92 100644 --- a/chromium/ash/webui/diagnostics_ui/mojom/system_data_provider.mojom +++ b/chromium/ash/webui/diagnostics_ui/mojom/system_data_provider.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/diagnostics_ui/mojom/system_routine_controller.mojom b/chromium/ash/webui/diagnostics_ui/mojom/system_routine_controller.mojom index f7d427d6f73..42a0fca98f5 100644 --- a/chromium/ash/webui/diagnostics_ui/mojom/system_routine_controller.mojom +++ b/chromium/ash/webui/diagnostics_ui/mojom/system_routine_controller.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/diagnostics_ui/resources/BUILD.gn b/chromium/ash/webui/diagnostics_ui/resources/BUILD.gn index 55e6ed5cdc2..55f0aba8840 100644 --- a/chromium/ash/webui/diagnostics_ui/resources/BUILD.gn +++ b/chromium/ash/webui/diagnostics_ui/resources/BUILD.gn @@ -1,462 +1,174 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") -import("//third_party/closure_compiler/compile_js.gni") -import("//tools/grit/grit_rule.gni") -import("//tools/grit/repack.gni") -import("//tools/polymer/html_to_js.gni") +import("//tools/grit/preprocess_if_expr.gni") +import("//tools/polymer/css_to_wrapper.gni") +import("//tools/polymer/html_to_wrapper.gni") +import("//tools/typescript/ts_library.gni") +import("//ui/webui/resources/tools/generate_grd.gni") assert(is_chromeos_ash) -js_type_check("closure_compile_module") { - is_polymer3 = true - deps = [ - ":battery_status_card", - ":cellular_info", - ":connectivity_card", - ":cpu_card", - ":data_point", - ":diagnostics_app", - ":diagnostics_browser_proxy", - ":diagnostics_card", - ":diagnostics_card_frame", - ":diagnostics_network_icon", - ":diagnostics_sticky_banner", - ":diagnostics_types", - ":diagnostics_utils", - ":ethernet_info", - ":fake_data", - ":fake_input_data_provider", - ":fake_network_health_provider", - ":fake_system_data_provider", - ":fake_system_routine_controller", - ":frequency_channel_utils", - ":input_card", - ":input_list", - ":ip_config_info_drawer", - ":keyboard_tester", - ":memory_card", - ":mojo_interface_provider", - ":mojo_utils", - ":network_card", - ":network_info", - ":network_list", - ":network_troubleshooting", - ":overview_card", - ":percent_bar_chart", - ":realtime_cpu_chart", - ":routine_group", - ":routine_list_executor", - ":routine_result_entry", - ":routine_result_list", - ":routine_section", - ":system_page", - ":text_badge", - ":wifi_info", - ] -} - -js_library("battery_status_card") { - deps = [ - ":data_point", - ":diagnostics_types", - ":mojo_interface_provider", - ":mojo_utils", - ":percent_bar_chart", - ":routine_section", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("cellular_info") { - deps = [ - ":data_point", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:cr.m", - "//ui/webui/resources/js:i18n_behavior.m", - ] -} - -js_library("connectivity_card") { - deps = [ - ":diagnostics_network_icon", - ":ip_config_info_drawer", - ":network_info", - ":routine_group", - ":routine_section", - "//third_party/polymer/v3_0/components-chromium/iron-collapse:iron-collapse", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - ] -} - -js_library("cpu_card") { - deps = [ - ":data_point", - ":mojo_interface_provider", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("data_point") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} - -js_library("diagnostics_app") { - deps = [ - ":diagnostics_sticky_banner", - ":input_list", - ":network_list", - ":system_page", - "//ash/webui/common/resources:navigation_view_panel", - "//ash/webui/common/resources:page_toolbar", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("diagnostics_browser_proxy") { - deps = [ - ":diagnostics_types", - "//ui/webui/resources/js:cr.m", - ] -} - -js_library("diagnostics_card") { - deps = [ - ":diagnostics_card_frame", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} - -js_library("diagnostics_card_frame") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} - -js_library("diagnostics_types") { - deps = [ "//ash/webui/diagnostics_ui/mojom:mojom_js_library_for_compile" ] -} - -js_library("diagnostics_network_icon") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_components/chromeos/network:network_icon.m", - "//ui/webui/resources/js:i18n_behavior.m", - ] -} - -js_library("diagnostics_sticky_banner") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", - ] -} - -js_library("diagnostics_utils") { - deps = [ "//ui/webui/resources/js:load_time_data.m" ] -} - -js_library("ethernet_info") { - deps = [ - ":data_point", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - ] -} - -js_library("fake_data") { - deps = [ ":diagnostics_types" ] -} - -js_library("fake_input_data_provider") { - deps = [ - "//ash/webui/common/resources:fake_method_resolver", - "//ui/webui/resources/js:cr.m", - ] -} - -js_library("fake_network_health_provider") { - deps = [ - "//ash/webui/common/resources:fake_observables", - "//ui/webui/resources/js:cr.m", - ] -} - -js_library("fake_system_data_provider") { - deps = [ - "//ash/webui/common/resources:fake_method_resolver", - "//ash/webui/common/resources:fake_observables", - "//ui/webui/resources/js:cr.m", - ] -} - -js_library("fake_system_routine_controller") { - deps = [ - "//ash/webui/common/resources:fake_method_resolver", - "//ui/webui/resources/js:cr.m", - ] -} - -js_library("frequency_channel_utils") { - deps = [ ":diagnostics_types" ] -} +preprocessed_dir = "preprocessed" + +non_web_component_files = [ + "diagnostics_browser_proxy.ts", + "diagnostics_types.ts", + "diagnostics_utils.ts", + "drawing_provider.ts", + "fake_data.ts", + "fake_input_data_provider.ts", + "fake_network_health_provider.ts", + "fake_system_data_provider.ts", + "fake_system_routine_controller.ts", + "frequency_channel_utils.ts", + "mojo_interface_provider.js", + "mojo_utils.ts", + "routine_group.ts", + "routine_list_executor.ts", +] + +web_component_files = [ + "battery_status_card.ts", + "cellular_info.ts", + "connectivity_card.ts", + "cpu_card.ts", + "data_point.ts", + "diagnostics_app.ts", + "diagnostics_card.ts", + "diagnostics_card_frame.ts", + "diagnostics_network_icon.ts", + "diagnostics_sticky_banner.ts", + "ethernet_info.ts", + "input_card.ts", + "input_list.ts", + "ip_config_info_drawer.ts", + "keyboard_tester.ts", + "memory_card.ts", + "network_card.ts", + "network_info.ts", + "network_list.ts", + "network_troubleshooting.ts", + "overview_card.ts", + "percent_bar_chart.ts", + "realtime_cpu_chart.js", + "routine_result_entry.ts", + "routine_result_list.ts", + "routine_section.ts", + "system_page.ts", + "text_badge.ts", + "touchscreen_tester.ts", + "wifi_info.ts", +] + +html_files = [] +foreach(f, web_component_files) { + if (get_path_info(f, "extension") == "ts") { + html_files += [ string_replace(f, ".ts", ".html") ] + } else { + html_files += [ string_replace(f, ".js", ".html") ] + } +} + +icons_html_files = [ "icons.html" ] + +html_wrapper_files = [] +foreach(f, html_files + icons_html_files) { + html_wrapper_files += [ f + ".js" ] +} + +js_files = web_component_files + non_web_component_files + +# Files that are passed as input to css_to_wrapper(). +css_files = [ "diagnostics_shared.css" ] + +# Files that are generated by css_to_wrapper(). +css_wrapper_files = [] +foreach(f, css_files) { + css_wrapper_files += [ f + ".js" ] +} + +static_resource_files = [ + "app_icon_192.png", + "index.html", +] + +css_to_wrapper("css_wrapper_files") { + in_files = css_files + use_js = true +} + +html_to_wrapper("html_wrapper_files") { + in_files = html_files + icons_html_files + use_js = true +} + +preprocess_if_expr("preprocess") { + in_folder = "." + in_files = js_files + out_folder = "$target_gen_dir/$preprocessed_dir" +} + +preprocess_if_expr("preprocess_generated") { + deps = [ + ":css_wrapper_files", + ":html_wrapper_files", + ] + in_folder = target_gen_dir + in_files = html_wrapper_files + css_wrapper_files + out_folder = "$target_gen_dir/$preprocessed_dir" +} + +# The WebUI mojo files are generated by mojom:mojom_webui_js into an +# external directory, so they need to be copied into this project's directory. +copy("copy_webui_mojo") { + deps = [ "../mojom:mojom_webui_js" ] + sources = [ + "$root_gen_dir/mojom-webui/ash/webui/diagnostics_ui/mojom/input_data_provider.mojom-webui.js", + "$root_gen_dir/mojom-webui/ash/webui/diagnostics_ui/mojom/network_health_provider.mojom-webui.js", + "$root_gen_dir/mojom-webui/ash/webui/diagnostics_ui/mojom/system_data_provider.mojom-webui.js", + "$root_gen_dir/mojom-webui/ash/webui/diagnostics_ui/mojom/system_routine_controller.mojom-webui.js", + ] + outputs = [ "$target_gen_dir/$preprocessed_dir/{{source_file_part}}" ] +} + +ts_library("build_ts") { + root_dir = "$target_gen_dir/$preprocessed_dir" + out_dir = "$target_gen_dir/tsc" + tsconfig_base = "tsconfig_base.json" + in_files = js_files + css_wrapper_files + html_wrapper_files + [ + "input_data_provider.mojom-webui.js", + "network_health_provider.mojom-webui.js", + "system_data_provider.mojom-webui.js", + "system_routine_controller.mojom-webui.js", + ] -js_library("icons") { + definitions = [ "//tools/typescript/definitions/chrome_send.d.ts" ] deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + "//third_party/polymer/v3_0:library", + "//ui/webui/resources:library", + "//ui/webui/resources/mojo:library", ] -} -js_library("input_card") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + extra_deps = [ + ":copy_webui_mojo", + ":preprocess", + ":preprocess_generated", + "//ash/webui/common/resources:copy_checked_in_dts_files", + "//ash/webui/common/resources:generate_definitions", ] } -js_library("input_list") { - deps = [ - ":diagnostics_browser_proxy", - ":diagnostics_types", - ":input_card", - ":keyboard_tester", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} - -js_library("ip_config_info_drawer") { - deps = [ - ":data_point", - ":diagnostics_browser_proxy", - ":diagnostics_types", - ":diagnostics_utils", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("keyboard_tester") { - deps = [ - "//ash/webui/common/resources:keyboard_diagram", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", - ] -} - -js_library("memory_card") { - deps = [ - ":data_point", - ":diagnostics_utils", - ":mojo_interface_provider", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("mojo_interface_provider") { - deps = [ - ":diagnostics_types", - ":fake_data", - ":fake_input_data_provider", - ":fake_network_health_provider", - ":fake_system_data_provider", - ":fake_system_routine_controller", - "//ui/webui/resources/js:cr.m", - ] -} - -js_library("mojo_utils") { -} - -js_library("network_card") { - deps = [ - ":diagnostics_card", - ":diagnostics_network_icon", - ":diagnostics_types", - ":ip_config_info_drawer", - ":network_info", - ":network_troubleshooting", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - ] -} - -js_library("network_info") { - deps = [ - ":cellular_info", - ":diagnostics_types", - ":ethernet_info", - ":mojo_interface_provider", - ":wifi_info", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} - -js_library("network_list") { - deps = [ - ":connectivity_card", - ":diagnostics_browser_proxy", - ":diagnostics_types", - ":mojo_interface_provider", - ":network_card", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("network_troubleshooting") { - deps = [ - ":diagnostics_types", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("overview_card") { - deps = [ - ":diagnostics_card", - ":mojo_interface_provider", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("percent_bar_chart") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} - -js_library("realtime_cpu_chart") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] - externs_list = [ "../../../../third_party/d3/src/externs.js" ] -} - -js_library("routine_group") { - deps = [ - ":routine_list_executor", - "//ui/webui/resources/js:cr.m", - ] -} - -js_library("routine_list_executor") { - deps = [ "//ui/webui/resources/js:cr.m" ] -} - -js_library("routine_result_entry") { - deps = [ - ":routine_group", - "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("routine_result_list") { - deps = [ - ":routine_group", - ":routine_list_executor", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} - -js_library("routine_section") { - deps = [ - ":mojo_interface_provider", - ":routine_group", - ":routine_result_list", - "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -js_library("system_page") { - deps = [ - ":battery_status_card", - ":cpu_card", - ":diagnostics_browser_proxy", - ":diagnostics_card", - ":diagnostics_sticky_banner", - ":diagnostics_types", - ":memory_card", - ":mojo_interface_provider", - ":overview_card", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - ] - externs_list = - [ "//ui/webui/resources/cr_elements/cr_toast/cr_toast_externs.js" ] -} - -js_library("text_badge") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} - -js_library("wifi_info") { - deps = [ - ":data_point", - ":frequency_channel_utils", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - ] -} - -html_to_js("web_components") { - js_files = [ - "battery_status_card.js", - "cellular_info.js", - "connectivity_card.js", - "cpu_card.js", - "data_point.js", - "diagnostics_app.js", - "diagnostics_card.js", - "diagnostics_card_frame.js", - - "diagnostics_network_icon.js", - "diagnostics_sticky_banner.js", - "diagnostics_shared_css.js", - "ethernet_info.js", - "icons.js", - "input_card.js", - "input_list.js", - "ip_config_info_drawer.js", - "keyboard_tester.js", - "memory_card.js", - "network_card.js", - "network_info.js", - "network_list.js", - "network_troubleshooting.js", - "overview_card.js", - "percent_bar_chart.js", - "realtime_cpu_chart.js", - "routine_result_entry.js", - "routine_result_list.js", - "routine_section.js", - "system_page.js", - "text_badge.js", - "wifi_info.js", - ] +generate_grd("build_grd") { + input_files_base_dir = rebase_path(".", "//") + input_files = static_resource_files + deps = [ ":build_ts" ] + public_deps = [ "//third_party/d3:build_grdp" ] + grdp_files = [ "$root_gen_dir/third_party/d3/d3_resources.grdp" ] + manifest_files = + filter_include(get_target_outputs(":build_ts"), [ "*.manifest" ]) + grd_prefix = "ash_diagnostics_app" + out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" } diff --git a/chromium/ash/webui/eche_app_ui/BUILD.gn b/chromium/ash/webui/eche_app_ui/BUILD.gn index 48e729b9e1f..6c731d4cac7 100644 --- a/chromium/ash/webui/eche_app_ui/BUILD.gn +++ b/chromium/ash/webui/eche_app_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -83,8 +83,6 @@ static_library("eche_app_ui") { deps = [ ":eche_app_ui_pref", "//ash", - "//ash/components/multidevice:multidevice", - "//ash/components/multidevice/logging", "//ash/components/phonehub", "//ash/constants", "//ash/public/cpp", @@ -98,6 +96,8 @@ static_library("eche_app_ui") { "//ash/webui/eche_app_ui/proto", "//ash/webui/resources:eche_app_resources", "//ash/webui/resources:eche_bundle_resources", + "//chromeos/ash/components/multidevice:multidevice", + "//chromeos/ash/components/multidevice/logging", "//chromeos/services/network_config/public/cpp", "//components/prefs", "//content/public/browser", @@ -158,8 +158,6 @@ source_set("unit_tests") { ":eche_app_ui_pref", ":test_support", "//ash:test_support", - "//ash/components/multidevice", - "//ash/components/multidevice:test_support", "//ash/components/phonehub", "//ash/components/phonehub:debug", "//ash/public/cpp", @@ -174,6 +172,8 @@ source_set("unit_tests") { "//ash/webui/eche_app_ui/proto", "//base", "//base/test:test_support", + "//chromeos/ash/components/multidevice", + "//chromeos/ash/components/multidevice:test_support", "//components/prefs:test_support", "//components/sync_preferences:test_support", "//dbus", diff --git a/chromium/ash/webui/eche_app_ui/mojom/BUILD.gn b/chromium/ash/webui/eche_app_ui/mojom/BUILD.gn index 86fdfacf6a3..0f4ef6fd23e 100644 --- a/chromium/ash/webui/eche_app_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/eche_app_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/eche_app_ui/mojom/eche_app.mojom b/chromium/ash/webui/eche_app_ui/mojom/eche_app.mojom index 8c0d7fe291b..60f8ca80a26 100644 --- a/chromium/ash/webui/eche_app_ui/mojom/eche_app.mojom +++ b/chromium/ash/webui/eche_app_ui/mojom/eche_app.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -80,6 +80,7 @@ enum WebNotificationType { NOTIFICATION_ACTION_NOT_LAUNCHED, LAUNCH_NOTIFICATION_FAILED, TABLET_MODE, + WIFI_NOT_READY, }; // Interface for showing a native notification which was generated from WebUI. diff --git a/chromium/ash/webui/eche_app_ui/proto/BUILD.gn b/chromium/ash/webui/eche_app_ui/proto/BUILD.gn index 60ea5cbfb32..7c179edacb2 100644 --- a/chromium/ash/webui/eche_app_ui/proto/BUILD.gn +++ b/chromium/ash/webui/eche_app_ui/proto/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/face_ml_app_ui/BUILD.gn b/chromium/ash/webui/face_ml_app_ui/BUILD.gn new file mode 100644 index 00000000000..88a75ec09c7 --- /dev/null +++ b/chromium/ash/webui/face_ml_app_ui/BUILD.gn @@ -0,0 +1,31 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chromeos/ui_mode.gni") +import("//ui/webui/resources/tools/generate_grd.gni") + +assert(is_chromeos_ash, "Face ML App is ash-chrome only") + +static_library("face_ml_app_ui") { + sources = [ + "face_ml_app_ui.cc", + "face_ml_app_ui.h", + "face_ml_app_untrusted_ui.cc", + "face_ml_app_untrusted_ui.h", + "face_ml_page_handler.cc", + "face_ml_page_handler.h", + "url_constants.cc", + "url_constants.h", + ] + + deps = [ + "//ash/webui/face_ml_app_ui/mojom:trusted", + "//ash/webui/resources:face_ml_app_bundle_resources", + "//ash/webui/resources:face_ml_app_resources", + "//ash/webui/resources:face_ml_app_untrusted_resources", + "//ash/webui/system_apps/public:system_web_app_config", + "//content/public/browser", + "//ui/webui", + ] +} diff --git a/chromium/ash/webui/face_ml_app_ui/face_ml_app_ui.gni b/chromium/ash/webui/face_ml_app_ui/face_ml_app_ui.gni new file mode 100644 index 00000000000..33496bc1ca7 --- /dev/null +++ b/chromium/ash/webui/face_ml_app_ui/face_ml_app_ui.gni @@ -0,0 +1,5 @@ +declare_args() { + # Whether to enable the product Face ML app. When false, a mock app + # is bundled for testing integration points. + enable_cros_face_ml = false +} diff --git a/chromium/ash/webui/face_ml_app_ui/mojom/BUILD.gn b/chromium/ash/webui/face_ml_app_ui/mojom/BUILD.gn new file mode 100644 index 00000000000..a86b0690e51 --- /dev/null +++ b/chromium/ash/webui/face_ml_app_ui/mojom/BUILD.gn @@ -0,0 +1,36 @@ +# Copyright 2022 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chromeos/ui_mode.gni") +import("//mojo/public/tools/bindings/mojom.gni") +import("//tools/typescript/ts_library.gni") + +assert(is_chromeos_ash, "Face ML is ash-chrome only") + +cur_dir = rebase_path(".", "//") + +mojom("trusted") { + sources = [ "face_ml_app_ui.mojom" ] + public_deps = [ "//mojo/public/mojom/base" ] + webui_module_path = "/$cur_dir" +} + +ts_library("mojom_ts") { + mojom_gen_dir = "$root_gen_dir/mojom-webui/$cur_dir" + root_dir = mojom_gen_dir + out_dir = "$mojom_gen_dir/tsc" + tsconfig_base = "../tsconfig_base.json" + in_files = [ "face_ml_app_ui.mojom-webui.js" ] + + # Targets that generate the above .mojom-webui.js files. + extra_deps = [ + ":trusted_webui_js", + + # Required for Mojo's bindings.js resolution. + "//ui/webui/resources:generate_definitions", + ] + + # Generates d.ts files which allows this library to be depended upon. + composite = true +} diff --git a/chromium/ash/webui/face_ml_app_ui/mojom/face_ml_app_ui.mojom b/chromium/ash/webui/face_ml_app_ui/mojom/face_ml_app_ui.mojom new file mode 100644 index 00000000000..71d5e22f6cf --- /dev/null +++ b/chromium/ash/webui/face_ml_app_ui/mojom/face_ml_app_ui.mojom @@ -0,0 +1,23 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +module ash.mojom.face_ml_app; + +// Implemented in the browser process and is used for a renderer to establish +// bidirectonal communication. +interface PageHandlerFactory { + // Create a two-way pipe between browser and renderer. + CreatePageHandler(pending_receiver<PageHandler> handler, + pending_remote<Page> page); +}; + +// Implemented in the browser process. The Face ML App WebUI uses +// this interface to request information from the browser process. +interface PageHandler { +}; + +// Lives in the renderer process. Implemented in JavaScript to handle requests +// or receive updates from the browser process. +interface Page { +}; diff --git a/chromium/ash/webui/facial_ml_app_ui/resources/trusted/BUILD.gn b/chromium/ash/webui/face_ml_app_ui/resources/trusted/BUILD.gn index 210dd2fcee2..53b0b169ae1 100644 --- a/chromium/ash/webui/facial_ml_app_ui/resources/trusted/BUILD.gn +++ b/chromium/ash/webui/face_ml_app_ui/resources/trusted/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -6,13 +6,16 @@ import("//build/config/chromeos/ui_mode.gni") import("//tools/typescript/ts_library.gni") import("//ui/webui/resources/tools/generate_grd.gni") -assert(is_chromeos_ash, "Facial ML App is ash-chrome only") +assert(is_chromeos_ash, "Face ML App is ash-chrome only") ts_library("trusted_ts") { root_dir = "." out_dir = "$target_gen_dir/tsc" - in_files = [ "main.ts" ] + in_files = [ + "main.ts", + "page_handler.ts", + ] tsconfig_base = "../../tsconfig_base.json" composite = true @@ -21,10 +24,12 @@ ts_library("trusted_ts") { # imports. path_mappings = [ "/*|" + rebase_path("$root_gen_dir/mojom-webui/*", target_gen_dir) ] + + deps = [ "../../mojom:mojom_ts" ] } generate_grd("trusted_grd") { - grd_prefix = "ash_facial_ml_app" + grd_prefix = "ash_face_ml_app" out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" input_files = [ @@ -39,5 +44,10 @@ generate_grd("trusted_grd") { manifest_files = filter_include(get_target_outputs(":trusted_ts"), [ "*.manifest" ]) - deps = [ ":trusted_ts" ] + grdp_files = [ "$target_gen_dir/../../mojom/trusted_webui_resources.grdp" ] + + deps = [ + ":trusted_ts", + "../../mojom:trusted_webui_grdp", + ] } diff --git a/chromium/ash/webui/face_ml_app_ui/resources/untrusted/BUILD.gn b/chromium/ash/webui/face_ml_app_ui/resources/untrusted/BUILD.gn new file mode 100644 index 00000000000..f40e518c536 --- /dev/null +++ b/chromium/ash/webui/face_ml_app_ui/resources/untrusted/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chromeos/ui_mode.gni") +import("//ui/webui/resources/tools/generate_grd.gni") + +assert(is_chromeos_ash, "Face ML App is ash-chrome only") + +generate_grd("untrusted_grd") { + grd_prefix = "ash_face_ml_app_untrusted" + out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" + + input_files = [ "app.html" ] + input_files_base_dir = rebase_path(".", "//") +} diff --git a/chromium/ash/webui/facial_ml_app_ui/BUILD.gn b/chromium/ash/webui/facial_ml_app_ui/BUILD.gn deleted file mode 100644 index 601682dcece..00000000000 --- a/chromium/ash/webui/facial_ml_app_ui/BUILD.gn +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/chromeos/ui_mode.gni") -import("//ui/webui/resources/tools/generate_grd.gni") - -assert(!is_official_build, - "Facial ML App is only built for unofficial builds for now") -assert(is_chromeos_ash, "Facial ML App is ash-chrome only") - -static_library("facial_ml_app_ui") { - sources = [ - "facial_ml_app_ui.cc", - "facial_ml_app_ui.h", - "url_constants.cc", - "url_constants.h", - ] - - deps = [ - "//ash/webui/resources:facial_ml_app_resources", - "//ash/webui/system_apps/public:system_web_app_config", - "//content/public/browser", - "//ui/webui", - ] -} diff --git a/chromium/ash/webui/file_manager/BUILD.gn b/chromium/ash/webui/file_manager/BUILD.gn index cdde0aeb56c..34abd4b79a7 100644 --- a/chromium/ash/webui/file_manager/BUILD.gn +++ b/chromium/ash/webui/file_manager/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -46,6 +46,7 @@ static_library("file_manager_ui") { deps = [ ":constants", ":file_manager_untrusted_ui", + "//ash/constants:constants", "//ash/webui/file_manager/mojom", "//ash/webui/file_manager/resources:file_manager_swa_resources", "//base", @@ -53,6 +54,8 @@ static_library("file_manager_ui") { "//ui/file_manager:file_manager_gen_resources", "//ui/file_manager:resources", "//ui/web_dialogs", + "//ui/webui:webui", + "//ui/webui/resources/cr_components/color_change_listener:mojom", ] } diff --git a/chromium/ash/webui/file_manager/mojom/BUILD.gn b/chromium/ash/webui/file_manager/mojom/BUILD.gn index d883bfbf44c..2ef9ba12d3a 100644 --- a/chromium/ash/webui/file_manager/mojom/BUILD.gn +++ b/chromium/ash/webui/file_manager/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/file_manager/mojom/file_manager.mojom b/chromium/ash/webui/file_manager/mojom/file_manager.mojom index 7c762bbbee9..dc51e25e7d8 100644 --- a/chromium/ash/webui/file_manager/mojom/file_manager.mojom +++ b/chromium/ash/webui/file_manager/mojom/file_manager.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/file_manager/resources/BUILD.gn b/chromium/ash/webui/file_manager/resources/BUILD.gn index 481104e1e17..33ea1c47e42 100644 --- a/chromium/ash/webui/file_manager/resources/BUILD.gn +++ b/chromium/ash/webui/file_manager/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -51,15 +51,17 @@ files_app_path = js_type_check("closure_compile") { deps = [ ":main_js", - "//ui/webui/resources/js:cr", - "//ui/webui/resources/js:load_time_data", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:load_time_data.m", ] - closure_flags = default_closure_args + mojom_js_args + [ - "js_module_root=" + rebase_path(".", root_build_dir), - "js_module_root=" + - rebase_path(mojom_webui_folder, root_build_dir), - "browser_resolver_prefix_replacements=\"chrome://file-manager/=../../ui/file_manager/file_manager/\"", - ] + closure_flags = + default_closure_args + mojom_js_args + [ + "js_module_root=" + rebase_path(".", root_build_dir), + "js_module_root=" + rebase_path(mojom_webui_folder, root_build_dir), + "browser_resolver_prefix_replacements=\"chrome://file-manager/=" + + rebase_path("//ui/file_manager/file_manager/", root_build_dir) + + "\"", + ] } action("gen_main_html") { @@ -86,7 +88,6 @@ preprocess_if_expr("preprocess") { out_manifest = "$target_gen_dir/manifest_preprocess.json" in_files = [ - "init_globals.js", "main.js", "runtime_loaded_test_util_swa.js", "script_loader.js", @@ -94,7 +95,6 @@ preprocess_if_expr("preprocess") { ] deps = [ - ":init_globals", ":main", ":script_loader", ] @@ -142,7 +142,10 @@ optimize_webui("build") { "shared.rollup.js", ] - excludes = [ "chrome://resources/mojo/mojo/public/js/bindings.js" ] + excludes = [ + "chrome://resources/js/load_time_data.m.js", + "chrome://resources/mojo/mojo/public/js/bindings.js", + ] external_paths = [ "chrome://file-manager|$files_app_path" ] @@ -163,7 +166,10 @@ generate_grd("build_static_grdp") { input_files_base_dir = rebase_path(".", "//") - input_files = [ "images/icon192.png" ] + input_files = [ + "images/icon192.png", + "init_globals.js", + ] } grd_prefix = "file_manager_swa" diff --git a/chromium/ash/webui/file_manager/untrusted_resources/BUILD.gn b/chromium/ash/webui/file_manager/untrusted_resources/BUILD.gn index 6a4c4150659..e8a86865565 100644 --- a/chromium/ash/webui/file_manager/untrusted_resources/BUILD.gn +++ b/chromium/ash/webui/file_manager/untrusted_resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/files_internals/BUILD.gn b/chromium/ash/webui/files_internals/BUILD.gn new file mode 100644 index 00000000000..0e8fb6595e1 --- /dev/null +++ b/chromium/ash/webui/files_internals/BUILD.gn @@ -0,0 +1,22 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chromeos/ui_mode.gni") + +assert(is_chromeos_ash, "Files Internals is ash-chrome only") + +static_library("files_internals") { + sources = [ + "files_internals.cc", + "files_internals.h", + "files_internals_ui_delegate.h", + "url_constants.cc", + "url_constants.h", + ] + + deps = [ + "//content/public/browser", + "//ui/webui", + ] +} diff --git a/chromium/ash/webui/firmware_update_ui/BUILD.gn b/chromium/ash/webui/firmware_update_ui/BUILD.gn index f2072fd05e2..5dd853dccdd 100644 --- a/chromium/ash/webui/firmware_update_ui/BUILD.gn +++ b/chromium/ash/webui/firmware_update_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/firmware_update_ui/mojom/BUILD.gn b/chromium/ash/webui/firmware_update_ui/mojom/BUILD.gn index c50161766ad..5a107ab1896 100644 --- a/chromium/ash/webui/firmware_update_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/firmware_update_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/firmware_update_ui/mojom/firmware_update.mojom b/chromium/ash/webui/firmware_update_ui/mojom/firmware_update.mojom index 96f7505893f..06f796a9f19 100644 --- a/chromium/ash/webui/firmware_update_ui/mojom/firmware_update.mojom +++ b/chromium/ash/webui/firmware_update_ui/mojom/firmware_update.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/firmware_update_ui/resources/BUILD.gn b/chromium/ash/webui/firmware_update_ui/resources/BUILD.gn index a71de3be1e7..3643e3279fc 100644 --- a/chromium/ash/webui/firmware_update_ui/resources/BUILD.gn +++ b/chromium/ash/webui/firmware_update_ui/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -98,8 +98,8 @@ js_library("firmware_update_app") { ":firmware_confirmation_dialog", ":firmware_update_dialog", ":peripheral_updates_list", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -107,9 +107,9 @@ js_library("firmware_confirmation_dialog") { deps = [ ":firmware_update_types", ":mojo_utils", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/firmware_update_ui/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -117,9 +117,9 @@ js_library("firmware_update_dialog") { deps = [ ":firmware_update_types", ":mojo_utils", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/firmware_update_ui/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -145,19 +145,19 @@ js_library("peripheral_updates_list") { ":firmware_update_types", ":mojo_interface_provider", ":update_card", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/firmware_update_ui/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("update_card") { deps = [ ":firmware_update_types", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/firmware_update_ui/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } diff --git a/chromium/ash/webui/guest_os_installer/BUILD.gn b/chromium/ash/webui/guest_os_installer/BUILD.gn index aacb7b6a801..a9ac8a68d80 100644 --- a/chromium/ash/webui/guest_os_installer/BUILD.gn +++ b/chromium/ash/webui/guest_os_installer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -16,7 +16,7 @@ static_library("guest_os_installer") { deps = [ "//ash/webui/guest_os_installer/mojom", - "//ash/webui/resources:guest_os_installer_resources", + "//ash/webui/guest_os_installer/resources:resources", "//content/public/browser", "//ui/web_dialogs", ] diff --git a/chromium/ash/webui/guest_os_installer/mojom/BUILD.gn b/chromium/ash/webui/guest_os_installer/mojom/BUILD.gn index 508eb9f83e4..d46ba0c36ac 100644 --- a/chromium/ash/webui/guest_os_installer/mojom/BUILD.gn +++ b/chromium/ash/webui/guest_os_installer/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/guest_os_installer/mojom/guest_os_installer.mojom b/chromium/ash/webui/guest_os_installer/mojom/guest_os_installer.mojom index 8d6530d7010..cada5154e95 100644 --- a/chromium/ash/webui/guest_os_installer/mojom/guest_os_installer.mojom +++ b/chromium/ash/webui/guest_os_installer/mojom/guest_os_installer.mojom @@ -1,4 +1,4 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. +// Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/guest_os_installer/resources/BUILD.gn b/chromium/ash/webui/guest_os_installer/resources/BUILD.gn index b7ba399209a..c82e032c721 100644 --- a/chromium/ash/webui/guest_os_installer/resources/BUILD.gn +++ b/chromium/ash/webui/guest_os_installer/resources/BUILD.gn @@ -1,99 +1,23 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") -import("//tools/polymer/html_to_wrapper.gni") -import("//tools/typescript/ts_library.gni") -import("//ui/webui/resources/tools/generate_grd.gni") +import("//chrome/browser/resources/tools/build_webui.gni") assert(is_chromeos_ash) -# Files holding a Polymer element definition AND have an equivalent .html file. -web_component_files = [ "app.ts" ] - -# Files that are passed as input to html_to_wrapper(). -html_files = [] -foreach(f, web_component_files) { - html_files += [ string_replace(f, ".ts", ".html") ] -} - -# Files that are generated by html_to_wrapper(). -html_wrapper_files = [] -foreach(f, html_files) { - html_wrapper_files += [ f + ".ts" ] -} - -# Files that get passed through the Typescript compiler -ts_files = [ "browser_proxy.ts" ] + web_component_files - -# Static files that can be included in the resources pack as-is -static_resource_files = [ "index.html" ] - -# This is a relatively complicated build file, so let me try to -# explain things... - -# Polymer components are made up of an HTML template and a Custom -# Element description in Typescript. For ease of development these are -# kept these in separate files, but at run-time the HTML template -# needs to be generated by the Typescript code. This build rule wraps -# the .html files into Typescript files containing a single function -# the returns the HTML template, which is then imported from and -# called by the corresponding .ts file. -html_to_wrapper("html_wrapper_files") { - in_files = html_files -} - -# Copy all files to be passed to the TS compiler to the some -# folder. Since files generated by html_to_wrapper() are already in -# target_gen_dir, copy remaining files here as well. The mojom file is -# included because the mojo bindings generator currently doesn't -# handle Typescript, see crbug.com/1002798. -copy("copy_ts") { - sources = [ "$root_gen_dir/mojom-webui/ash/webui/guest_os_installer/mojom/guest_os_installer.mojom-webui.js" ] + ts_files - outputs = [ "$target_gen_dir/{{source_file_part}}" ] - deps = [ "../mojom:mojom_webui_js" ] -} - -# Run the Typescript compiler, putting the outputs in -# $target_gen_dir/tsc. This has to be a different directory to the inputs -# because the mojom file has the same name in both input and output, -# and they'd conflict otherwise. -ts_library("build_ts") { - root_dir = target_gen_dir - out_dir = "$target_gen_dir/tsc" - in_files = - ts_files + html_wrapper_files + [ "guest_os_installer.mojom-webui.js" ] - - # Allow javascript files in input - tsconfig_base = "tsconfig_base.json" - - # Dependencies that are Typescript libraries i.e. ts_library() targets - deps = [ "//ui/webui/resources:library" ] +build_webui("build") { + grd_prefix = "ash_guest_os_installer" - # Dependencies that are not ts_library() targets - extra_deps = [ - ":copy_ts", - ":html_wrapper_files", - ] -} + static_files = [ "index.html" ] + web_component_files = [ "app.ts" ] + non_web_component_files = [ "browser_proxy.ts" ] -# Generate the grd file. This is done using a "manifest" file -# generated by :build_ts, and from the static assets listed in -# static_resource_files. This is pulled in -# by //ash/webui/resources:guest_os_installer_resources, which is in -# turn pulled in by //chrome/chrome_paks.gni (to add the resources to -# the final resource pack), by //ash/webui/guest_os_installer to add -# them to the WebUI context, and by anyone else who needs to use these -# resources. -generate_grd("build_grd") { - input_files = static_resource_files - input_files_base_dir = rebase_path(".", "//") + mojo_files_deps = [ "../mojom:mojom_webui_js" ] + mojo_files = [ "$root_gen_dir/mojom-webui/ash/webui/guest_os_installer/mojom/guest_os_installer.mojom-webui.js" ] - deps = [ ":build_ts" ] - manifest_files = - filter_include(get_target_outputs(":build_ts"), [ "*.manifest" ]) + ts_deps = [ "//ui/webui/resources:library" ] - grd_prefix = "ash_guest_os_installer" - out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" + grit_output_dir = "$root_gen_dir/ash/webui" } diff --git a/chromium/ash/webui/help_app_ui/BUILD.gn b/chromium/ash/webui/help_app_ui/BUILD.gn index 07d242b3705..7b71708184f 100644 --- a/chromium/ash/webui/help_app_ui/BUILD.gn +++ b/chromium/ash/webui/help_app_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/help_app_ui/help_app_ui.mojom b/chromium/ash/webui/help_app_ui/help_app_ui.mojom index 4fc5f7a58d1..b5c73043433 100644 --- a/chromium/ash/webui/help_app_ui/help_app_ui.mojom +++ b/chromium/ash/webui/help_app_ui/help_app_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/help_app_ui/resources/BUILD.gn b/chromium/ash/webui/help_app_ui/resources/BUILD.gn index 90d40cbd73a..0b90d32d66f 100644 --- a/chromium/ash/webui/help_app_ui/resources/BUILD.gn +++ b/chromium/ash/webui/help_app_ui/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/help_app_ui/resources/mock/BUILD.gn b/chromium/ash/webui/help_app_ui/resources/mock/BUILD.gn index 263af67a4aa..b32aba42f3b 100644 --- a/chromium/ash/webui/help_app_ui/resources/mock/BUILD.gn +++ b/chromium/ash/webui/help_app_ui/resources/mock/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/help_app_ui/search/BUILD.gn b/chromium/ash/webui/help_app_ui/search/BUILD.gn index d6dd24d79e2..6618a5dcc93 100644 --- a/chromium/ash/webui/help_app_ui/search/BUILD.gn +++ b/chromium/ash/webui/help_app_ui/search/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/help_app_ui/search/search.mojom b/chromium/ash/webui/help_app_ui/search/search.mojom index 95d2b5d6a3e..3a27e48b218 100644 --- a/chromium/ash/webui/help_app_ui/search/search.mojom +++ b/chromium/ash/webui/help_app_ui/search/search.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/media_app_ui/BUILD.gn b/chromium/ash/webui/media_app_ui/BUILD.gn index 267c5c2fd51..62054e4e48a 100644 --- a/chromium/ash/webui/media_app_ui/BUILD.gn +++ b/chromium/ash/webui/media_app_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/media_app_ui/media_app_ui.mojom b/chromium/ash/webui/media_app_ui/media_app_ui.mojom index 21e2ef53fe3..8be1ac1e55a 100644 --- a/chromium/ash/webui/media_app_ui/media_app_ui.mojom +++ b/chromium/ash/webui/media_app_ui/media_app_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/media_app_ui/resources/js/BUILD.gn b/chromium/ash/webui/media_app_ui/resources/js/BUILD.gn index 0e14cb54d2d..e2216eb3ad2 100644 --- a/chromium/ash/webui/media_app_ui/resources/js/BUILD.gn +++ b/chromium/ash/webui/media_app_ui/resources/js/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/media_app_ui/resources/mock/js/BUILD.gn b/chromium/ash/webui/media_app_ui/resources/mock/js/BUILD.gn index 66c3d52ee5c..7cd967a879e 100644 --- a/chromium/ash/webui/media_app_ui/resources/mock/js/BUILD.gn +++ b/chromium/ash/webui/media_app_ui/resources/mock/js/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/multidevice_debug/BUILD.gn b/chromium/ash/webui/multidevice_debug/BUILD.gn index e6dc35a6244..c5ab462a617 100644 --- a/chromium/ash/webui/multidevice_debug/BUILD.gn +++ b/chromium/ash/webui/multidevice_debug/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. +# Copyright 2015 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -17,7 +17,6 @@ static_library("multidevice_debug") { ] deps = [ - "//ash/components/multidevice/logging", "//ash/constants", "//ash/services/device_sync/proto", "//ash/services/device_sync/proto:util", @@ -28,6 +27,7 @@ static_library("multidevice_debug") { "//ash/webui/resources:multidevice_debug_resources", "//base", "//base:i18n", + "//chromeos/ash/components/multidevice/logging", "//components/prefs", "//components/resources", "//content/public/browser", diff --git a/chromium/ash/webui/multidevice_debug/resources/BUILD.gn b/chromium/ash/webui/multidevice_debug/resources/BUILD.gn index 4ae0c06aae8..572324b10ef 100644 --- a/chromium/ash/webui/multidevice_debug/resources/BUILD.gn +++ b/chromium/ash/webui/multidevice_debug/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/network_ui/BUILD.gn b/chromium/ash/webui/network_ui/BUILD.gn index 04a26c938bb..0d473bc753b 100644 --- a/chromium/ash/webui/network_ui/BUILD.gn +++ b/chromium/ash/webui/network_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/os_feedback_ui/BUILD.gn b/chromium/ash/webui/os_feedback_ui/BUILD.gn index bfd4c2dd816..1172ebfd980 100644 --- a/chromium/ash/webui/os_feedback_ui/BUILD.gn +++ b/chromium/ash/webui/os_feedback_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors.All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/os_feedback_ui/backend/BUILD.gn b/chromium/ash/webui/os_feedback_ui/backend/BUILD.gn index 867d97a55bc..851502fdb41 100644 --- a/chromium/ash/webui/os_feedback_ui/backend/BUILD.gn +++ b/chromium/ash/webui/os_feedback_ui/backend/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors.All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/os_feedback_ui/mojom/BUILD.gn b/chromium/ash/webui/os_feedback_ui/mojom/BUILD.gn index dbdc70bfc48..1fda5122bb1 100644 --- a/chromium/ash/webui/os_feedback_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/os_feedback_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/os_feedback_ui/mojom/os_feedback_ui.mojom b/chromium/ash/webui/os_feedback_ui/mojom/os_feedback_ui.mojom index 5fbccfd476f..b643da0a1e7 100644 --- a/chromium/ash/webui/os_feedback_ui/mojom/os_feedback_ui.mojom +++ b/chromium/ash/webui/os_feedback_ui/mojom/os_feedback_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. +// Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -72,6 +72,12 @@ interface HelpContentProvider { struct FeedbackContext { // The e-mail of the user that initiated this feedback. string? email; + // Whether or not the signed in email is an internal google account. + bool is_internal_account; + // Whether or not the feedback app is opened from Assistant. + bool from_assistant; + // Whether or not the assistant debug info is allowed by user. + bool assistant_debug_info_allowed; // The URL of the page that this issue was being experienced on. url.mojom.Url? page_url; // Extra diagnostics information provided by source CrOS application by @@ -84,6 +90,8 @@ struct FeedbackContext { // When a report is sent with bluetooth logs, the category_tag will be set // to BluetoothReportWithLogs. string? category_tag; + // The performance trace id. + int32 trace_id; }; // Status of the sending of a feedback report. @@ -173,7 +181,7 @@ enum FeedbackAppExitPath { kQuitSearchPageNoHelpContentClicked, // User close on search page because no help content is shown (Offline or // Search is down). - kQuitNoResultFound, + kQuitNoHelpContentDisplayed, // User close on share data page after clicking some help contents. kQuitShareDataPageHelpContentClicked, // User close on share data page without clicking some help contents. @@ -184,6 +192,22 @@ enum FeedbackAppExitPath { kSuccessNoHelpContentClicked }; +// The outcome of checking help contents. +enum FeedbackAppHelpContentOutcome { + // User click continue after clicking the help content. + kContinueHelpContentClicked, + // User click continue without clicking any help content. + kContinueNoHelpContentClicked, + // User click continue despite no help content is displayed. + kContinueNoHelpContentDisplayed, + // User quit feedback app after clicking the help content. + kQuitHelpContentClicked, + // User quit feedback app without clicking any help content. + kQuitNoHelpContentClicked, + // User quit feedback app because no help content is displayed. + kQuitNoHelpContentDisplayed, +}; + // Provides services needed by the feedback UI to display data and send reports. // Implemented in the browser process and called by the Feedback SWA // (a renderer process). @@ -205,13 +229,15 @@ interface FeedbackServiceProvider { // Open system info dialog (which displays the system logs // to be sent with the report if the user has opted in). OpenSystemInfoDialog(); - // Open bluetooth logs info dialog (which displays the bluetooth logs - // to be sent with the report if the user has opted in). - OpenBluetoothLogsInfoDialog(); // Record the metrics of users' first action on confirmation page. RecordPostSubmitAction(FeedbackAppPostSubmitAction action); // Record metrics of users' action before sending the feedback. RecordPreSubmitAction(FeedbackAppPreSubmitAction action); // Record metrics of users' exit paths of feedback app. RecordExitPath(FeedbackAppExitPath exit_path); + // Record the outcome of clicking and viewing the help content. + RecordHelpContentOutcome(FeedbackAppHelpContentOutcome outcome); + // Record metrics of number of results returned in each search, fires when + // user clicks help content. + RecordHelpContentSearchResultCount(int32 count); }; diff --git a/chromium/ash/webui/os_feedback_ui/resources/BUILD.gn b/chromium/ash/webui/os_feedback_ui/resources/BUILD.gn index 36b08eadf57..a94dfeb79c0 100644 --- a/chromium/ash/webui/os_feedback_ui/resources/BUILD.gn +++ b/chromium/ash/webui/os_feedback_ui/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors.All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -50,6 +50,7 @@ generate_grd("build_grd") { "feedback_types.js", "index.html", "mojo_interface_provider.js", + "questionnaire.js", ] input_files_base_dir = rebase_path(".", "//") deps = [ @@ -96,8 +97,8 @@ js_library("confirmation_page") { js_library("help_content") { deps = [ ":feedback_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui//webui/resources/js:i18n_behavior.m", ] } @@ -164,10 +165,11 @@ js_library("mojo_interface_provider") { js_library("search_page") { deps = [ ":feedback_flow", + ":feedback_types", ":help_content", ":mojo_interface_provider", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } diff --git a/chromium/ash/webui/os_feedback_ui/untrusted_resources/BUILD.gn b/chromium/ash/webui/os_feedback_ui/untrusted_resources/BUILD.gn index dbc95498609..9bd0afc1dd3 100644 --- a/chromium/ash/webui/os_feedback_ui/untrusted_resources/BUILD.gn +++ b/chromium/ash/webui/os_feedback_ui/untrusted_resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/personalization_app/BUILD.gn b/chromium/ash/webui/personalization_app/BUILD.gn index 4601d8e6d24..02acca9749c 100644 --- a/chromium/ash/webui/personalization_app/BUILD.gn +++ b/chromium/ash/webui/personalization_app/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/personalization_app/mojom/BUILD.gn b/chromium/ash/webui/personalization_app/mojom/BUILD.gn index fca55ec47da..499a52648d5 100644 --- a/chromium/ash/webui/personalization_app/mojom/BUILD.gn +++ b/chromium/ash/webui/personalization_app/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/personalization_app/mojom/personalization_app.mojom b/chromium/ash/webui/personalization_app/mojom/personalization_app.mojom index c734e5ffc7f..9a67853da95 100644 --- a/chromium/ash/webui/personalization_app/mojom/personalization_app.mojom +++ b/chromium/ash/webui/personalization_app/mojom/personalization_app.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -251,14 +251,14 @@ interface WallpaperProvider { // Device default image is a special case of an image stored on disk. It is // stored in a special directory and the file is not accessible to the user. // If this device has a default image, return a thumbnail representation of - // it. |data| will be empty string on failure or if the device has no + // it. |data| will be empty url on failure or if the device has no // default image. - GetDefaultImageThumbnail() => (string data); + GetDefaultImageThumbnail() => (url.mojom.Url data); // Fetch a thumbnail data url for the given local image path. |data| will be - // empty string on failure. + // empty on failure. GetLocalImageThumbnail(mojo_base.mojom.FilePath file_path) => - (string data); + (url.mojom.Url data); // Binds a listener to start receiving updates on wallpaper changes. SetWallpaperObserver(pending_remote<WallpaperObserver> observer); diff --git a/chromium/ash/webui/personalization_app/proto/BUILD.gn b/chromium/ash/webui/personalization_app/proto/BUILD.gn index 76ca50c741b..222424614fd 100644 --- a/chromium/ash/webui/personalization_app/proto/BUILD.gn +++ b/chromium/ash/webui/personalization_app/proto/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/personalization_app/resources/BUILD.gn b/chromium/ash/webui/personalization_app/resources/BUILD.gn index 30a371f147f..6a6d63cb0e2 100644 --- a/chromium/ash/webui/personalization_app/resources/BUILD.gn +++ b/chromium/ash/webui/personalization_app/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -88,6 +88,7 @@ web_component_files = [ "js/personalization_theme_element.ts", "js/personalization_toast_element.ts", "js/personalization_breadcrumb_element.ts", + "js/theme/theme_header_element.ts", "js/user/avatar_camera_element.ts", "js/user/avatar_list_element.ts", "js/user/user_preview_element.ts", @@ -204,6 +205,7 @@ ts_library("build_ts") { deps = [ "//third_party/polymer/v3_0:library", "//ui/webui/resources:library", + "//ui/webui/resources/cr_components/color_change_listener:build_ts", "//ui/webui/resources/mojo:library", ] diff --git a/chromium/ash/webui/personalization_app/search/BUILD.gn b/chromium/ash/webui/personalization_app/search/BUILD.gn index 7a939c4a5a5..8aeb3625715 100644 --- a/chromium/ash/webui/personalization_app/search/BUILD.gn +++ b/chromium/ash/webui/personalization_app/search/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/personalization_app/search/search.mojom b/chromium/ash/webui/personalization_app/search/search.mojom index de44a17a67d..04b8a38768e 100644 --- a/chromium/ash/webui/personalization_app/search/search.mojom +++ b/chromium/ash/webui/personalization_app/search/search.mojom @@ -1,4 +1,4 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. +// Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/print_management/BUILD.gn b/chromium/ash/webui/print_management/BUILD.gn index d5a071121ee..e55c0d55f43 100644 --- a/chromium/ash/webui/print_management/BUILD.gn +++ b/chromium/ash/webui/print_management/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -16,7 +16,7 @@ static_library("print_management") { deps = [ "//ash/webui/print_management/mojom", - "//ash/webui/resources:print_management_resources", + "//ash/webui/print_management/resources:resources", "//ash/webui/web_applications", "//chromeos/strings/", "//content/public/browser", @@ -25,7 +25,3 @@ static_library("print_management") { "//ui/webui", ] } - -group("closure_compile") { - deps = [ "resources:closure_compile_module" ] -} diff --git a/chromium/ash/webui/print_management/mojom/BUILD.gn b/chromium/ash/webui/print_management/mojom/BUILD.gn index 0d952992f9a..84bec99b1bc 100644 --- a/chromium/ash/webui/print_management/mojom/BUILD.gn +++ b/chromium/ash/webui/print_management/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -10,6 +10,8 @@ import("//mojo/public/tools/bindings/mojom.gni") mojom("mojom") { sources = [ "printing_manager.mojom" ] + webui_module_path = "/ash/webui/print_management" + public_deps = [ "//mojo/public/mojom/base", "//url/mojom:url_mojom_gurl", diff --git a/chromium/ash/webui/print_management/mojom/printing_manager.mojom b/chromium/ash/webui/print_management/mojom/printing_manager.mojom index 6d302506be1..ab34416c79e 100644 --- a/chromium/ash/webui/print_management/mojom/printing_manager.mojom +++ b/chromium/ash/webui/print_management/mojom/printing_manager.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/print_management/resources/BUILD.gn b/chromium/ash/webui/print_management/resources/BUILD.gn index d3a0531c91e..b1bf50f064e 100644 --- a/chromium/ash/webui/print_management/resources/BUILD.gn +++ b/chromium/ash/webui/print_management/resources/BUILD.gn @@ -1,80 +1,49 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") -import("//third_party/closure_compiler/compile_js.gni") -import("//tools/grit/grit_rule.gni") -import("//tools/grit/repack.gni") -import("//tools/polymer/html_to_js.gni") +import("//chrome/browser/resources/tools/build_webui.gni") assert(is_chromeos_ash) -js_type_check("closure_compile_module") { - is_polymer3 = true - deps = [ - ":mojo_interface_provider", - ":print_job_clear_history_dialog", - ":print_job_entry", - ":print_management", - ] -} +# When adding a new file to this app, add it to one of the lists below. +# `non_web_component_files` are plain TS and JS files. +# `web_component_files` are Polymer based TS and JS files. +# `css_files` are CSS files that are Polymer shared style modules. +# `static_files` are static files that don't need to be processed, e.g. images -js_library("icons") { - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] -} +build_webui("build") { + grd_prefix = "ash_print_management" -js_library("print_job_entry") { - deps = [ - ":icons", - "//ash/webui/print_management/mojom:mojom_js_library_for_compile", - "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", - "//ui/webui/resources/js/cr/ui:focus_row_behavior.m", + static_files = [ + "index.html", + "print_management_192.png", ] -} -js_library("print_management") { - deps = [ - ":mojo_interface_provider", - ":print_job_clear_history_dialog", - ":print_job_entry", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", - "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:load_time_data.m", + web_component_files = [ + "print_job_clear_history_dialog.ts", + "print_job_entry.ts", + "print_management.ts", ] -} -js_library("print_job_clear_history_dialog") { - deps = [ - ":mojo_interface_provider", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", - "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", - "//ui/webui/resources/js:i18n_behavior.m", - ] -} + non_web_component_files = [ "mojo_interface_provider.ts" ] + + icons_html_files = [ "icons.html" ] -js_library("mojo_interface_provider") { - deps = [ - "//ash/webui/print_management/mojom:mojom_js_library_for_compile", - "//ui/webui/resources/js:cr.m", + css_files = [ + "print_management_fonts.css", + "print_management_shared.css", ] -} -html_to_js("web_components") { - js_files = [ - "icons.js", - "print_job_clear_history_dialog.js", - "print_job_entry.js", - "print_management_fonts_css.js", - "print_management.js", - "print_management_shared_css.js", + mojo_files_deps = [ "../mojom:mojom_webui_js" ] + mojo_files = [ "$root_gen_dir/mojom-webui/ash/webui/print_management/mojom/printing_manager.mojom-webui.js" ] + + ts_composite = true + ts_deps = [ + "//third_party/polymer/v3_0:library", + "//ui/webui/resources:library", ] + + grit_output_dir = "$root_gen_dir/ash/webui" } diff --git a/chromium/ash/webui/projector_app/BUILD.gn b/chromium/ash/webui/projector_app/BUILD.gn index 87af2f0ae17..ce2dc7bbe3d 100644 --- a/chromium/ash/webui/projector_app/BUILD.gn +++ b/chromium/ash/webui/projector_app/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -37,10 +37,12 @@ static_library("projector_app") { "//ash/strings", "//ash/webui/media_app_ui:buildflags", "//ash/webui/resources:media_app_bundle_resources", + "//ash/webui/resources:projector_annotator_trusted_resources", + "//ash/webui/resources:projector_annotator_untrusted_resources", "//ash/webui/resources:projector_app_bundle_resources", "//ash/webui/resources:projector_app_trusted_resources", "//ash/webui/resources:projector_app_untrusted_resources", - "//ash/webui/resources:projector_app_untrusted_resources", + "//ash/webui/resources:projector_common_resources", "//chromeos/strings", "//components/prefs", "//components/signin/public/identity_manager", diff --git a/chromium/ash/webui/projector_app/public/cpp/BUILD.gn b/chromium/ash/webui/projector_app/public/cpp/BUILD.gn index 2657290b5b7..73b00e3b626 100644 --- a/chromium/ash/webui/projector_app/public/cpp/BUILD.gn +++ b/chromium/ash/webui/projector_app/public/cpp/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/projector_app/resources/BUILD.gn b/chromium/ash/webui/projector_app/resources/BUILD.gn index 511bd9d370d..840e423c436 100644 --- a/chromium/ash/webui/projector_app/resources/BUILD.gn +++ b/chromium/ash/webui/projector_app/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,124 +11,15 @@ assert(is_chromeos_ash, "Projector is ChromeOS only") js_type_check("closure_compile") { is_polymer3 = true deps = [ - ":message_types", - ":mock_app_closure_compile", - ":projector_browser_proxy", - ":trusted_annotator_closure_compile", - ":trusted_app_closure_compile", - ":untrusted_annotator_closure_compile", - ":untrusted_app_closure_compile", + "//ash/webui/projector_app/resources/annotator/trusted:trusted_annotator_library", + "//ash/webui/projector_app/resources/annotator/untrusted:untrusted_annotator_library", + "//ash/webui/projector_app/resources/app/trusted:trusted_app", + "//ash/webui/projector_app/resources/app/untrusted:untrusted_app", + "//ash/webui/projector_app/resources/common:message_types", + "//ash/webui/projector_app/resources/mock:mock_app", ] -} - -js_library("projector_browser_proxy") { - sources = [ "communication/projector_browser_proxy.js" ] - externs_list = [ "communication/projector_app.externs.js" ] -} - -js_library("message_types") { - sources = [ "communication/message_types.js" ] -} -js_library("trusted_annotator_closure_compile") { - sources = [ - "annotator/annotator_embedder_impl.js", - "annotator/trusted/trusted_annotator_comm_factory.js", - ] - deps = [ - ":projector_browser_proxy", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:post_message_api_client.m", - "//ui/webui/resources/js:post_message_api_request_handler.m", - "//ui/webui/resources/js:web_ui_listener_behavior.m", - ] - externs_list = [ "communication/projector_app.externs.js" ] -} - -js_library("trusted_app_closure_compile") { - sources = [ - "app/embedder.js", - "app/trusted/launch.js", - "app/trusted/trusted_app_comm_factory.js", - ] - deps = [ - ":projector_browser_proxy", - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:post_message_api_client.m", - "//ui/webui/resources/js:post_message_api_request_handler.m", - "//ui/webui/resources/js:web_ui_listener_behavior.m", - ] - externs_list = [ - "communication/projector_app.externs.js", - "//ash/webui/web_applications/externs/file_handling.externs.js", - ] -} - -js_library("untrusted_annotator_closure_compile") { - sources = [ "annotator/untrusted/untrusted_annotator_comm_factory.js" ] - deps = [ - "//ui/webui/resources/js:post_message_api_client.m", - "//ui/webui/resources/js:post_message_api_request_handler.m", - ] - externs_list = [ "communication/projector_app.externs.js" ] -} - -js_library("untrusted_app_closure_compile") { - sources = [ "app/untrusted/untrusted_app_comm_factory.js" ] - deps = [ - ":message_types", - "//ui/webui/resources/js:post_message_api_client.m", - "//ui/webui/resources/js:post_message_api_request_handler.m", - ] - externs_list = [ "communication/projector_app.externs.js" ] -} - -js_library("mock_app_closure_compile") { - sources = [ "mock/app_bin.js" ] - deps = [ - "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - ] - externs_list = [ "communication/projector_app.externs.js" ] -} - -generate_grd("build_untrusted_grd") { - input_files = [ - "annotator/annotator.html", - "annotator/untrusted/untrusted_annotator_comm_factory.js", - "app/index.html", - "app/sandboxed_load_time_data.js", - "app/untrusted/untrusted_app_comm_factory.js", - "communication/message_types.js", - ] - - input_files_base_dir = rebase_path(".", "//") - grd_prefix = "ash_projector_app_untrusted" - out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" -} - -generate_grd("build_trusted_grd") { - input_files = [ - "annotator/annotator_embedder.html", - "annotator/annotator_embedder.css", - "annotator/annotator_embedder_impl.js", - "annotator/trusted/trusted_annotator_comm_factory.js", - "app/trusted/launch.js", - "app/trusted/trusted_app_comm_factory.js", - "communication/annotator_browser_proxy.js", - "communication/projector_browser_proxy.js", - "app/embedder.html", - "app/embedder.css", - "app/embedder.js", - "assets/icon_16.png", - "assets/icon_32.png", - "assets/icon_48.png", - "assets/icon_64.png", - "assets/icon_96.png", - "assets/icon_128.png", - "assets/icon_192.png", - "assets/icon_256.png", - ] - input_files_base_dir = rebase_path(".", "//") - grd_prefix = "ash_projector_app_trusted" - out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" + closure_flags = default_closure_args + [ "browser_resolver_prefix_replacements=\"chrome-untrusted://projector/common/=" + rebase_path( + "//ash/webui/projector_app/resources/common/", + root_build_dir) + "\"" ] } diff --git a/chromium/ash/webui/projector_app/resources/annotator/trusted/BUILD.gn b/chromium/ash/webui/projector_app/resources/annotator/trusted/BUILD.gn new file mode 100644 index 00000000000..e3fc9f3a735 --- /dev/null +++ b/chromium/ash/webui/projector_app/resources/annotator/trusted/BUILD.gn @@ -0,0 +1,39 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//chrome/common/features.gni") +import("//third_party/closure_compiler/compile_js.gni") +import("//ui/webui/resources/tools/generate_grd.gni") + +assert(is_chromeos_ash, "Projector Annotator is ChromeOS only") + +js_library("trusted_annotator_library") { + sources = [ + "annotator_browser_proxy.js", + "annotator_embedder_impl.js", + "trusted_annotator_comm_factory.js", + ] + deps = [ + "//ash/webui/common/resources:web_ui_listener_behavior", + "//ash/webui/common/resources/post_message_api:post_message_api_client", + "//ash/webui/common/resources/post_message_api:post_message_api_request_handler", + "//ash/webui/projector_app/resources/common:message_types", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = [ "../../common/projector_app.externs.js" ] +} + +generate_grd("build_trusted_grd") { + input_files = [ + "annotator_embedder.html", + "annotator_embedder.css", + "annotator_browser_proxy.js", + "trusted_annotator_comm_factory.js", + "annotator_embedder_impl.js", + ] + + input_files_base_dir = rebase_path(".", "//") + grd_prefix = "ash_projector_annotator_trusted" + out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" +} diff --git a/chromium/ash/webui/projector_app/resources/annotator/untrusted/BUILD.gn b/chromium/ash/webui/projector_app/resources/annotator/untrusted/BUILD.gn new file mode 100644 index 00000000000..088d9cd0e2d --- /dev/null +++ b/chromium/ash/webui/projector_app/resources/annotator/untrusted/BUILD.gn @@ -0,0 +1,30 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//chrome/common/features.gni") +import("//third_party/closure_compiler/compile_js.gni") +import("//ui/webui/resources/tools/generate_grd.gni") + +assert(is_chromeos_ash, "Projector Annotator is ChromeOS only") + +js_library("untrusted_annotator_library") { + sources = [ "untrusted_annotator_comm_factory.js" ] + deps = [ + "//ash/webui/common/resources/post_message_api:post_message_api_client", + "//ash/webui/common/resources/post_message_api:post_message_api_request_handler", + "//ash/webui/projector_app/resources/common:message_types", + ] + externs_list = [ "../../common/projector_app.externs.js" ] +} + +generate_grd("build_untrusted_grd") { + input_files = [ + "annotator.html", + "untrusted_annotator_comm_factory.js", + ] + + input_files_base_dir = rebase_path(".", "//") + grd_prefix = "ash_projector_annotator_untrusted" + out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" +} diff --git a/chromium/ash/webui/projector_app/resources/app/trusted/BUILD.gn b/chromium/ash/webui/projector_app/resources/app/trusted/BUILD.gn new file mode 100644 index 00000000000..389eadd9cb9 --- /dev/null +++ b/chromium/ash/webui/projector_app/resources/app/trusted/BUILD.gn @@ -0,0 +1,50 @@ +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//chrome/common/features.gni") +import("//third_party/closure_compiler/compile_js.gni") +import("//ui/webui/resources/tools/generate_grd.gni") + +assert(is_chromeos_ash, "Projector is ChromeOS only") + +js_library("trusted_app") { + sources = [ + "embedder.js", + "launch.js", + "projector_browser_proxy.js", + "trusted_app_comm_factory.js", + ] + deps = [ + "//ash/webui/common/resources:web_ui_listener_behavior", + "//ash/webui/common/resources/post_message_api:post_message_api_client", + "//ash/webui/common/resources/post_message_api:post_message_api_request_handler", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = [ + "../../common/projector_app.externs.js", + "//ash/webui/web_applications/externs/file_handling.externs.js", + ] +} + +generate_grd("build_trusted_grd") { + input_files = [ + "launch.js", + "trusted_app_comm_factory.js", + "projector_browser_proxy.js", + "embedder.html", + "embedder.css", + "embedder.js", + "assets/icon_16.png", + "assets/icon_32.png", + "assets/icon_48.png", + "assets/icon_64.png", + "assets/icon_96.png", + "assets/icon_128.png", + "assets/icon_192.png", + "assets/icon_256.png", + ] + input_files_base_dir = rebase_path(".", "//") + grd_prefix = "ash_projector_app_trusted" + out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" +} diff --git a/chromium/ash/webui/projector_app/resources/app/untrusted/BUILD.gn b/chromium/ash/webui/projector_app/resources/app/untrusted/BUILD.gn new file mode 100644 index 00000000000..ae85f591a1b --- /dev/null +++ b/chromium/ash/webui/projector_app/resources/app/untrusted/BUILD.gn @@ -0,0 +1,31 @@ +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//chrome/common/features.gni") +import("//third_party/closure_compiler/compile_js.gni") +import("//ui/webui/resources/tools/generate_grd.gni") + +assert(is_chromeos_ash, "Projector is ChromeOS only") + +js_library("untrusted_app") { + sources = [ "untrusted_app_comm_factory.js" ] + deps = [ + "//ash/webui/common/resources/post_message_api:post_message_api_client", + "//ash/webui/common/resources/post_message_api:post_message_api_request_handler", + "//ash/webui/projector_app/resources/common:message_types", + ] + externs_list = [ "../../common/projector_app.externs.js" ] +} + +generate_grd("build_untrusted_grd") { + input_files = [ + "index.html", + "sandboxed_load_time_data.js", + "untrusted_app_comm_factory.js", + ] + + input_files_base_dir = rebase_path(".", "//") + grd_prefix = "ash_projector_app_untrusted" + out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" +} diff --git a/chromium/ash/webui/projector_app/resources/common/BUILD.gn b/chromium/ash/webui/projector_app/resources/common/BUILD.gn new file mode 100644 index 00000000000..0224e918dff --- /dev/null +++ b/chromium/ash/webui/projector_app/resources/common/BUILD.gn @@ -0,0 +1,28 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") +import("//ui/webui/resources/tools/generate_grd.gni") + +assert(is_chromeos_ash, "Projector is ChromeOS only") + +js_library("message_types") { + sources = [ "./message_types.js" ] +} + +js_library("projector_app_externs") { + sources = [ "./projector_app.externs.js" ] +} + +generate_grd("build_common_grd") { + input_files = [ + "message_types.js", + "projector_app.externs.js", + ] + + resource_path_prefix = "common" + input_files_base_dir = rebase_path(".", "//") + grd_prefix = "ash_projector_common" + out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" +} diff --git a/chromium/ash/webui/projector_app/resources/mock/BUILD.gn b/chromium/ash/webui/projector_app/resources/mock/BUILD.gn new file mode 100644 index 00000000000..ba773de03f4 --- /dev/null +++ b/chromium/ash/webui/projector_app/resources/mock/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//chrome/common/features.gni") +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos_ash, "Projector is ChromeOS only") + +js_library("mock_app") { + sources = [ "app_bin.js" ] + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + externs_list = [ "../common/projector_app.externs.js" ] +} diff --git a/chromium/ash/webui/resources/BUILD.gn b/chromium/ash/webui/resources/BUILD.gn index 42ebc2e3009..6e3c213e991 100644 --- a/chromium/ash/webui/resources/BUILD.gn +++ b/chromium/ash/webui/resources/BUILD.gn @@ -1,8 +1,9 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//ash/webui/eche_app_ui/eche_app_ui.gni") +import("//ash/webui/face_ml_app_ui/face_ml_app_ui.gni") import("//ash/webui/help_app_ui/help_app_ui.gni") import("//ash/webui/media_app_ui/media_app_ui.gni") import("//ash/webui/projector_app/projector_app.gni") @@ -97,13 +98,14 @@ ash_generated_grit("system_extensions_internals_resources") { deps = [ "//ash/webui/system_extensions_internals_ui:build_grd" ] } -if (!is_official_build) { - # Resources used by chrome://demo-mode-app - ash_generated_grit("demo_mode_app_resources") { - source = "$root_gen_dir/ash/webui/demo_mode_app_ui/ash_demo_mode_app_resources.grd" - deps = [ "//ash/webui/demo_mode_app_ui:build_grd" ] - } +# Resources used by chrome-untrusted://demo-mode-app +ash_generated_grit("demo_mode_app_resources") { + source = + "$root_gen_dir/ash/webui/demo_mode_app_ui/ash_demo_mode_app_resources.grd" + deps = [ "//ash/webui/demo_mode_app_ui:build_grd" ] +} +if (!is_official_build) { # Resources used by chrome://sample-system-web-app ash_generated_grit("sample_system_web_app_resources") { source = "$root_gen_dir/ash/webui/sample_system_web_app_ui/resources/trusted/ash_sample_system_web_app_resources.grd" @@ -139,24 +141,6 @@ grit("scanning_app_resources") { output_dir = "$ash_webui_grit_output_dir" } -grit("diagnostics_app_resources") { - source = "//ash/webui/diagnostics_ui/resources/diagnostics_app_resources.grd" - - deps = [ - "//ash/webui/diagnostics_ui/mojom:mojom_js", - "//ash/webui/diagnostics_ui/resources:web_components", - ] - - outputs = [ - "ash_diagnostics_app_resources.pak", - "grit/ash_diagnostics_app_resources.h", - "grit/ash_diagnostics_app_resources_map.cc", - "grit/ash_diagnostics_app_resources_map.h", - ] - - output_dir = "$ash_webui_grit_output_dir" -} - # Resources used by chrome://help-app, and parts of the sandboxed app it hosts # that do not come from the app bundle (below). grit("help_app_resources") { @@ -266,38 +250,27 @@ grit("media_app_bundle_resources") { output_dir = "$root_gen_dir/chromeos" } -grit("print_management_resources") { - source = - "//ash/webui/print_management/resources/print_management_resources.grd" - - deps = [ - "//ash/webui/print_management/mojom:mojom_js", - "//ash/webui/print_management/resources:web_components", - ] - - outputs = [ - "grit/ash_print_management_resources.h", - "grit/ash_print_management_resources_map.cc", - "grit/ash_print_management_resources_map.h", - "ash_print_management_resources.pak", - ] - - output_dir = "$ash_webui_grit_output_dir" +ash_generated_grit("diagnostics_app_resources") { + source = "$root_gen_dir/ash/webui/diagnostics_ui/resources/ash_diagnostics_app_resources.grd" + deps = [ "//ash/webui/diagnostics_ui/resources:build_grd" ] } # Resources used by chrome-untrusted://projector SWA. ash_generated_grit("projector_app_untrusted_resources") { - source = "$root_gen_dir/ash/webui/projector_app/resources/ash_projector_app_untrusted_resources.grd" - deps = [ "//ash/webui/projector_app/resources:build_untrusted_grd" ] + source = "$root_gen_dir/ash/webui/projector_app/resources/app/untrusted/ash_projector_app_untrusted_resources.grd" + deps = [ + "//ash/webui/projector_app/resources/app/untrusted:build_untrusted_grd", + ] } # Resources used by chrome://projector SWA. ash_generated_grit("projector_app_trusted_resources") { - source = "$root_gen_dir/ash/webui/projector_app/resources/ash_projector_app_trusted_resources.grd" - deps = [ "//ash/webui/projector_app/resources:build_trusted_grd" ] + source = "$root_gen_dir/ash/webui/projector_app/resources/app/trusted/ash_projector_app_trusted_resources.grd" + deps = [ "//ash/webui/projector_app/resources/app/trusted:build_trusted_grd" ] } # Resources automatically served by the chrome-untrusted://projector bundle, obtained via DEPS. +# TODO(b/216523790): Split up the projector_app_bundle_resource into app_bundle and annotator_bundle. grit("projector_app_bundle_resources") { if (enable_cros_projector_app) { # Obtained via an internal CIPD package in src/DEPS. @@ -319,10 +292,57 @@ grit("projector_app_bundle_resources") { output_dir = "$root_gen_dir/chromeos" } -# Resources used by chrome://facial-ml -ash_generated_grit("facial_ml_app_resources") { - source = "$root_gen_dir/ash/webui/facial_ml_app_ui/resources/trusted/ash_facial_ml_app_resources.grd" - deps = [ "//ash/webui/facial_ml_app_ui/resources/trusted:trusted_grd" ] +# Resources used by chrome://face-ml +ash_generated_grit("face_ml_app_resources") { + source = "$root_gen_dir/ash/webui/face_ml_app_ui/resources/trusted/ash_face_ml_app_resources.grd" + deps = [ "//ash/webui/face_ml_app_ui/resources/trusted:trusted_grd" ] +} + +# Resources used by chrome-untrusted://face-ml +ash_generated_grit("face_ml_app_untrusted_resources") { + source = "$root_gen_dir/ash/webui/face_ml_app_ui/resources/untrusted/ash_face_ml_app_untrusted_resources.grd" + deps = [ "//ash/webui/face_ml_app_ui/resources/untrusted:untrusted_grd" ] +} + +# Resources automatically served by the chrome-untrusted://face-ml bundle, obtained via DEPS. +grit("face_ml_app_bundle_resources") { + if (enable_cros_face_ml) { + # Obtained via an internal CIPD package in src/DEPS. + source = "//ash/webui/face_ml_app_ui/resources/prod/face_ml_app_bundle_resources.grd" + } else { + source = "//ash/webui/face_ml_app_ui/resources/mock/face_ml_app_bundle_mock_resources.grd" + } + + use_brotli = true + + outputs = [ + "grit/ash_face_ml_app_bundle_resources.h", + "grit/ash_face_ml_app_bundle_resources_map.cc", + "grit/ash_face_ml_app_bundle_resources_map.h", + "ash_face_ml_app_bundle_resources.pak", + ] + + output_dir = "$ash_webui_grit_output_dir" +} + +# Resources used by chrome-untrusted://projector-annotator SWA. +ash_generated_grit("projector_annotator_untrusted_resources") { + source = "$root_gen_dir/ash/webui/projector_app/resources/annotator/untrusted/ash_projector_annotator_untrusted_resources.grd" + deps = [ "//ash/webui/projector_app/resources/annotator/untrusted:build_untrusted_grd" ] +} + +# Resources used by chrome://projector-annotator SWA. +ash_generated_grit("projector_annotator_trusted_resources") { + source = "$root_gen_dir/ash/webui/projector_app/resources/annotator/trusted/ash_projector_annotator_trusted_resources.grd" + deps = [ + "//ash/webui/projector_app/resources/annotator/trusted:build_trusted_grd", + ] +} + +# Resources used by chrome://projector and chrome://projector-annotator SWA. +ash_generated_grit("projector_common_resources") { + source = "$root_gen_dir/ash/webui/projector_app/resources/common/ash_projector_common_resources.grd" + deps = [ "//ash/webui/projector_app/resources/common:build_common_grd" ] } # Resources used by chrome://eche-app @@ -331,12 +351,6 @@ ash_generated_grit("eche_app_resources") { deps = [ "//ash/webui/eche_app_ui:build_grd" ] } -# Resources used by chrome://guest-os-installer -ash_generated_grit("guest_os_installer_resources") { - source = "$root_gen_dir/ash/webui/guest_os_installer/resources/ash_guest_os_installer_resources.grd" - deps = [ "//ash/webui/guest_os_installer/resources:build_grd" ] -} - # Resources automatically served by the chrome://eche-app bundle, obtained via DEPS. grit("eche_bundle_resources") { # Obtained via an internal CIPD package in src/DEPS. diff --git a/chromium/ash/webui/sample_system_web_app_ui/BUILD.gn b/chromium/ash/webui/sample_system_web_app_ui/BUILD.gn index e49b3f535f5..d90535041a9 100644 --- a/chromium/ash/webui/sample_system_web_app_ui/BUILD.gn +++ b/chromium/ash/webui/sample_system_web_app_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2019 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/sample_system_web_app_ui/mojom/BUILD.gn b/chromium/ash/webui/sample_system_web_app_ui/mojom/BUILD.gn index a6a1ea66713..5fdafdd5f63 100644 --- a/chromium/ash/webui/sample_system_web_app_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/sample_system_web_app_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_shared_ui.mojom b/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_shared_ui.mojom index b8abd03c1c0..776377b65cb 100644 --- a/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_shared_ui.mojom +++ b/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_shared_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_ui.mojom b/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_ui.mojom index c55f05232dc..7750e8f05e1 100644 --- a/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_ui.mojom +++ b/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_untrusted_ui.mojom b/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_untrusted_ui.mojom index 9bec652cca5..1719e28c9f7 100644 --- a/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_untrusted_ui.mojom +++ b/chromium/ash/webui/sample_system_web_app_ui/mojom/sample_system_web_app_untrusted_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/sample_system_web_app_ui/resources/trusted/BUILD.gn b/chromium/ash/webui/sample_system_web_app_ui/resources/trusted/BUILD.gn index 0d369ce7d32..0e55c04be37 100644 --- a/chromium/ash/webui/sample_system_web_app_ui/resources/trusted/BUILD.gn +++ b/chromium/ash/webui/sample_system_web_app_ui/resources/trusted/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -32,7 +32,10 @@ ts_library("trusted_ts") { path_mappings = [ "/*|" + rebase_path("$root_gen_dir/mojom-webui/*", target_gen_dir) ] - deps = [ "../../mojom:mojom_ts" ] + deps = [ + "../../mojom:mojom_ts", + "//ui/webui/resources/cr_components/color_change_listener:build_ts", + ] } generate_grd("trusted_grd") { diff --git a/chromium/ash/webui/sample_system_web_app_ui/resources/untrusted/BUILD.gn b/chromium/ash/webui/sample_system_web_app_ui/resources/untrusted/BUILD.gn index 1d40e24dc85..53b8b7e6129 100644 --- a/chromium/ash/webui/sample_system_web_app_ui/resources/untrusted/BUILD.gn +++ b/chromium/ash/webui/sample_system_web_app_ui/resources/untrusted/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/scanning/BUILD.gn b/chromium/ash/webui/scanning/BUILD.gn index 79d6fcb426b..fd151dd5719 100644 --- a/chromium/ash/webui/scanning/BUILD.gn +++ b/chromium/ash/webui/scanning/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/scanning/mojom/BUILD.gn b/chromium/ash/webui/scanning/mojom/BUILD.gn index 19589722bf6..d995122ceb8 100644 --- a/chromium/ash/webui/scanning/mojom/BUILD.gn +++ b/chromium/ash/webui/scanning/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,4 +11,39 @@ mojom("mojom") { sources = [ "scanning.mojom" ] public_deps = [ "//mojo/public/mojom/base" ] + + cpp_typemaps = [ + { + types = [ + { + mojom = "ash.scanning.mojom.ScanResult" + cpp = "::lorgnette::ScanFailureMode" + }, + ] + traits_headers = [ + "scanning_type_converters.h", + "//chromeos/ash/components/dbus/lorgnette/lorgnette_service.pb.h", + ] + traits_sources = [ "scanning_type_converters.cc" ] + traits_public_deps = + [ "//chromeos/ash/components/dbus/lorgnette_manager:lorgnette_proto" ] + }, + ] +} +source_set("unit_tests") { + testonly = true + sources = [ "scanning_type_converters_unittest.cc" ] + deps = [ + ":mojom", + "//base", + "//base/test:test_support", + "//chromeos/ash/components/dbus/lorgnette_manager:lorgnette_proto", + "//content/test:test_support", + "//services/data_decoder/public/cpp:test_support", + "//services/device/public/cpp:test_support", + "//testing/gtest", + "//ui/gfx", + "//ui/shell_dialogs", + "//ui/webui", + ] } diff --git a/chromium/ash/webui/scanning/mojom/scanning.mojom b/chromium/ash/webui/scanning/mojom/scanning.mojom index 269d914d976..94cde47a6d7 100644 --- a/chromium/ash/webui/scanning/mojom/scanning.mojom +++ b/chromium/ash/webui/scanning/mojom/scanning.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/scanning/resources/BUILD.gn b/chromium/ash/webui/scanning/resources/BUILD.gn index c707f6a93e0..bc4fd89b7a2 100644 --- a/chromium/ash/webui/scanning/resources/BUILD.gn +++ b/chromium/ash/webui/scanning/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -45,24 +45,24 @@ js_library("color_mode_select") { deps = [ ":scanning_app_util", ":select_behavior", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("loading_page") { deps = [ + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("file_type_select") { deps = [ + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -70,26 +70,26 @@ js_library("page_size_select") { deps = [ ":scanning_app_util", ":select_behavior", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("resolution_select") { deps = [ ":select_behavior", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("scan_done_section") { deps = [ ":scanning_app_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -98,17 +98,17 @@ js_library("scan_preview") { ":action_toolbar", ":scanning_app_types", ":scanning_app_util", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("scan_to_select") { deps = [ + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -116,25 +116,25 @@ js_library("scanner_select") { deps = [ ":scanning_app_types", ":scanning_app_util", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("multi_page_checkbox") { deps = [ + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("multi_page_scan") { deps = [ + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -155,9 +155,9 @@ js_library("scanning_app") { ":scanning_app_util", ":scanning_browser_proxy", ":source_select", + "//ash/webui/common/resources:cr_container_shadow_behavior", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m", - "//ui/webui/resources/js:i18n_behavior.m", ] externs_list = [ "//ui/webui/resources/cr_elements/cr_toast/cr_toast_externs.js" ] @@ -176,9 +176,9 @@ js_library("source_select") { deps = [ ":scanning_app_util", ":select_behavior", + "//ash/webui/common/resources:i18n_behavior", "//ash/webui/scanning/mojom:mojom_js_library_for_compile", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } diff --git a/chromium/ash/webui/shimless_rma/BUILD.gn b/chromium/ash/webui/shimless_rma/BUILD.gn index 00279b380d0..c937b5eea5f 100644 --- a/chromium/ash/webui/shimless_rma/BUILD.gn +++ b/chromium/ash/webui/shimless_rma/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/shimless_rma/backend/BUILD.gn b/chromium/ash/webui/shimless_rma/backend/BUILD.gn index 8da96388443..73760c43224 100644 --- a/chromium/ash/webui/shimless_rma/backend/BUILD.gn +++ b/chromium/ash/webui/shimless_rma/backend/BUILD.gn @@ -1,5 +1,5 @@ -# Copyright 2021 The Chromium Authors.All rights reserved. -# Use of this source code is governed by a BSD - style license that can be +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") diff --git a/chromium/ash/webui/shimless_rma/mojom/BUILD.gn b/chromium/ash/webui/shimless_rma/mojom/BUILD.gn index f08f8dbc61f..2c58d58b6ad 100644 --- a/chromium/ash/webui/shimless_rma/mojom/BUILD.gn +++ b/chromium/ash/webui/shimless_rma/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/shimless_rma/mojom/shimless_rma.mojom b/chromium/ash/webui/shimless_rma/mojom/shimless_rma.mojom index 09a919d1c72..5f5d65abf91 100644 --- a/chromium/ash/webui/shimless_rma/mojom/shimless_rma.mojom +++ b/chromium/ash/webui/shimless_rma/mojom/shimless_rma.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -37,7 +37,6 @@ module ash.shimless_rma.mojom; import "mojo/public/mojom/base/file_path.mojom"; -import "mojo/public/mojom/base/string16.mojom"; // RMA states. // This must remain in sync with RmadState.StateCase (generated from the member @@ -470,6 +469,14 @@ interface PowerCableStateObserver { OnPowerCableStateChanged(bool plugged_in); }; +// Implemented by clients to track the external disk presence. +interface ExternalDiskStateObserver { + // OnExternalDiskStateChanged is called to update the state of external disk. + // It is used to display a hint for saving logs in the repair complete state + // and for firmware updates. + OnExternalDiskStateChanged(bool detected); +}; + // Implemented by clients to receive status of hardware verification. interface HardwareVerificationStatusObserver { // OnHardwareVerificationResult is called to report if hardware verification @@ -531,7 +538,7 @@ interface ShimlessRmaService { // Methods for kUpdateOs state. // // Returns a string representation of the OS version. - GetCurrentOsVersion() => (string version); + GetCurrentOsVersion() => (string? version); // Returns true if there is an OS update available, false otherwise. CheckForOsUpdates() => (bool update_available, string version); // Attempts to start a Chrome OS update. @@ -796,6 +803,10 @@ interface ShimlessRmaService { // The power cable state is needed to indicate if the device is ready for // battery cutoff. ObservePowerCableState(pending_remote<PowerCableStateObserver> observer); + // Registers an observer for changes in external disk state. + // The external disk state is needed to display a hint when saving logs + // and for firmware updates. + ObserveExternalDiskState(pending_remote<ExternalDiskStateObserver> observer); // Registers an observer for completion of hardware verification. ObserveHardwareVerificationStatus( pending_remote<HardwareVerificationStatusObserver> observer); diff --git a/chromium/ash/webui/shimless_rma/resources/BUILD.gn b/chromium/ash/webui/shimless_rma/resources/BUILD.gn index d5d6018e688..7a4a7a1d1b6 100644 --- a/chromium/ash/webui/shimless_rma/resources/BUILD.gn +++ b/chromium/ash/webui/shimless_rma/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -90,7 +90,7 @@ generate_grd("build_grd") { js_type_check("closure_compile_module") { is_polymer3 = true - closure_flags = default_closure_args + closure_flags = default_closure_args + mojom_js_args deps = [ ":base_page", ":calibration_component_chip", @@ -162,8 +162,9 @@ js_library("shimless_rma") { ":wrapup_restock_page", ":wrapup_wait_for_manual_wp_enable_page", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ] } js_library("base_page") { @@ -177,8 +178,8 @@ js_library("critical_error_page") { ":base_page", ":mojo_interface_provider", ":shimless_rma_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -187,22 +188,22 @@ js_library("hardware_error_page") { ":base_page", ":mojo_interface_provider", ":shimless_rma_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } js_library("data") { deps = [ ":shimless_rma_types", - "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m", + "//ash/webui/common/resources/network:onc_mojo", ] } js_library("fake_data") { deps = [ ":shimless_rma_types", - "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m", + "//ash/webui/common/resources/network:onc_mojo", ] } @@ -220,7 +221,7 @@ js_library("mojo_interface_provider") { ":fake_data", ":fake_shimless_rma_service", ":shimless_rma_types", - "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile", + "//chromeos/services/network_config/public/mojom:mojom_webui_js", "//ui/webui/resources/js:cr.m", ] } @@ -230,10 +231,10 @@ js_library("onboarding_choose_destination_page") { ":base_page", ":mojo_interface_provider", ":shimless_rma_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button", - "//ui/webui/resources/js:i18n_behavior.m", ] + externs_list = [ "//ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_externs.js" ] } js_library("onboarding_choose_wipe_device_page") { @@ -260,8 +261,9 @@ js_library("onboarding_enter_rsu_wp_disable_code_page") { ":mojo_interface_provider", ":shimless_rma_types", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_input:cr_input", ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js" ] } js_library("onboarding_landing_page") { @@ -281,9 +283,9 @@ js_library("onboarding_select_components_page") { ":mojo_interface_provider", ":repair_component_chip", ":shimless_rma_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:assert.m", - "//ui/webui/resources/js:i18n_behavior.m", + "//ui/webui/resources/js:assert", ] } @@ -293,15 +295,17 @@ js_library("onboarding_network_page") { ":icons", ":mojo_interface_provider", ":shimless_rma_types", - "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile", - "//ui/webui/resources/cr_components/chromeos/network:network_config.m", - "//ui/webui/resources/cr_components/chromeos/network:network_list.m", - "//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m", - "//ui/webui/resources/cr_elements/cr_button:cr_button", - "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", - "//ui/webui/resources/js:assert.m", - "//ui/webui/resources/js:i18n_behavior.m", - "//ui/webui/resources/js:util.m", + "//ash/webui/common/resources:i18n_behavior", + "//ash/webui/common/resources/network:network_config", + "//ash/webui/common/resources/network:network_list", + "//ash/webui/common/resources/network:onc_mojo", + "//chromeos/services/network_config/public/mojom:mojom_webui_js", + "//ui/webui/resources/js:assert", + "//ui/webui/resources/js:util", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js", + "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js", ] } @@ -310,9 +314,9 @@ js_library("onboarding_update_page") { ":base_page", ":mojo_interface_provider", ":shimless_rma_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/paper-spinner:paper-spinner-lite", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -323,8 +327,9 @@ js_library("onboarding_wait_for_manual_wp_disable_page") { ":mojo_interface_provider", ":shimless_rma_types", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ] } js_library("onboarding_wp_disable_complete_page") { @@ -341,8 +346,8 @@ js_library("reboot_page") { ":base_page", ":mojo_interface_provider", ":shimless_rma_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:i18n_behavior.m", ] } @@ -355,7 +360,7 @@ js_library("reimaging_calibration_failed_page") { ":mojo_interface_provider", ":shimless_rma_types", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:assert", ] } @@ -366,7 +371,7 @@ js_library("reimaging_calibration_setup_page") { ":mojo_interface_provider", ":shimless_rma_types", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:assert", ] } @@ -377,7 +382,7 @@ js_library("reimaging_calibration_run_page") { ":mojo_interface_provider", ":shimless_rma_types", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:assert", ] } @@ -435,10 +440,12 @@ js_library("wrapup_repair_complete_page") { ":base_page", ":mojo_interface_provider", ":shimless_rma_types", + "//ash/webui/common/resources:i18n_behavior", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", - "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", - "//ui/webui/resources/js:i18n_behavior.m", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js", + "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js", ] } @@ -448,8 +455,9 @@ js_library("wrapup_restock_page") { ":mojo_interface_provider", ":shimless_rma_types", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ] } js_library("wrapup_finalize_page") { @@ -458,8 +466,10 @@ js_library("wrapup_finalize_page") { ":mojo_interface_provider", ":shimless_rma_types", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_button:cr_button", - "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", + ] + externs_list = [ + "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js", + "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js", ] } @@ -469,14 +479,15 @@ js_library("wrapup_wait_for_manual_wp_enable_page") { ":mojo_interface_provider", ":shimless_rma_types", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", - "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", ] + externs_list = + [ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ] } js_library("shimless_rma_types") { deps = [ "//ash/webui/shimless_rma/mojom:mojom_js_library_for_compile", - "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile", + "//chromeos/services/network_config/public/mojom:mojom_webui_js", ] } diff --git a/chromium/ash/webui/shortcut_customization_ui/BUILD.gn b/chromium/ash/webui/shortcut_customization_ui/BUILD.gn index 2060fa92a88..0ff0556e072 100644 --- a/chromium/ash/webui/shortcut_customization_ui/BUILD.gn +++ b/chromium/ash/webui/shortcut_customization_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -19,6 +19,7 @@ static_library("shortcut_customization_ui") { "//ash/webui/shortcut_customization_ui/backend", "//ash/webui/shortcut_customization_ui/mojom", "//ash/webui/system_apps/public:system_web_app_config", + "//chromeos/strings", "//content/public/browser", "//ui/resources:webui_generated_resources_grd_grit", "//ui/webui", diff --git a/chromium/ash/webui/shortcut_customization_ui/backend/BUILD.gn b/chromium/ash/webui/shortcut_customization_ui/backend/BUILD.gn index 3246f770469..79dcca61a40 100644 --- a/chromium/ash/webui/shortcut_customization_ui/backend/BUILD.gn +++ b/chromium/ash/webui/shortcut_customization_ui/backend/BUILD.gn @@ -1,5 +1,5 @@ -# Copyright 2021 The Chromium Authors.All rights reserved. -# Use of this source code is governed by a BSD - style license that can be +# Copyright 2021 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("//build/config/chromeos/ui_mode.gni") @@ -13,6 +13,7 @@ static_library("backend") { ] deps = [ + "//ash", "//ash/public/cpp", "//ash/public/mojom", "//ash/webui/shortcut_customization_ui/mojom", @@ -26,6 +27,8 @@ source_set("unit_tests") { deps = [ ":backend", + "//ash", + "//ash:test_support", "//ash/public/cpp", "//ash/public/mojom", "//ash/webui/shortcut_customization_ui/mojom", diff --git a/chromium/ash/webui/shortcut_customization_ui/mojom/BUILD.gn b/chromium/ash/webui/shortcut_customization_ui/mojom/BUILD.gn index d32957472d5..c219a5923a0 100644 --- a/chromium/ash/webui/shortcut_customization_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/shortcut_customization_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/shortcut_customization_ui/mojom/shortcut_customization.mojom b/chromium/ash/webui/shortcut_customization_ui/mojom/shortcut_customization.mojom index 6d775918229..9dad65b6c13 100644 --- a/chromium/ash/webui/shortcut_customization_ui/mojom/shortcut_customization.mojom +++ b/chromium/ash/webui/shortcut_customization_ui/mojom/shortcut_customization.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,4 +14,12 @@ import "ash/public/mojom/accelerator_info.mojom"; interface AcceleratorConfigurationProvider { // Whether the source is mutable and shortcuts can be changed. IsMutable(ash.mojom.AcceleratorSource source) => (bool is_mutable); + + // Get the accelerator mappings for all sources. This is formatted as + // AcceleratorSource -> map<AcceleratorActionId, Array<AcceleratorInfo>>. + // Note that an accelerator action can have multiple accelerators associated + // with it. + GetAccelerators() => + (map<ash.mojom.AcceleratorSource, + map<uint32, array<ash.mojom.AcceleratorInfo>>> config); }; diff --git a/chromium/ash/webui/shortcut_customization_ui/resources/BUILD.gn b/chromium/ash/webui/shortcut_customization_ui/resources/BUILD.gn index 40e3af2f4cc..194616fa577 100644 --- a/chromium/ash/webui/shortcut_customization_ui/resources/BUILD.gn +++ b/chromium/ash/webui/shortcut_customization_ui/resources/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -12,34 +12,41 @@ import("//ui/webui/resources/tools/generate_grd.gni") assert(is_chromeos_ash) +# The directory where most files will be processed into, +# and where ts_library inputs from. preprocess_folder = "preprocessed" +# The directory where HTML and CSS files will be processed into. +# Ultimately, files in this directory will be processed into $preprocess_folder. +html_css_preprocess_folder = "preprocessed_html_css_wrapper_files" + non_web_component_files = [ - "accelerator_lookup_manager.js", - "fake_data.js", - "fake_shortcut_provider.js", - "mojo_interface_provider.js", - "shortcut_types.js", + "js/accelerator_lookup_manager.ts", + "js/fake_data.ts", + "js/fake_shortcut_provider.ts", + "js/mojo_interface_provider.ts", + "js/shortcut_types.ts", + "js/shortcut_utils.ts", ] web_component_files = [ - "accelerator_edit_dialog.js", - "accelerator_edit_view.js", - "accelerator_row.js", - "accelerator_subsection.js", - "accelerator_view.js", - "input_key.js", - "shortcut_customization_app.js", - "shortcut_input.js", - "shortcuts_page.js", + "js/accelerator_edit_dialog.ts", + "js/accelerator_edit_view.ts", + "js/accelerator_row.ts", + "js/accelerator_subsection.ts", + "js/accelerator_view.ts", + "js/input_key.ts", + "js/shortcut_customization_app.ts", + "js/shortcut_input.ts", + "js/shortcuts_page.ts", ] html_files = [] foreach(f, web_component_files) { - html_files += [ string_replace(f, ".js", ".html") ] + html_files += [ string_replace(f, ".ts", ".html") ] } -icons_html_files = [ "icons.html" ] +icons_html_files = [ "common/icons.html" ] html_wrapper_files = [] foreach(f, html_files + icons_html_files) { @@ -49,10 +56,7 @@ foreach(f, html_files + icons_html_files) { js_files = web_component_files + non_web_component_files # Files that are passed as input to css_to_wrapper(). -css_files = [ - "shortcut_customization_fonts.css", - "shortcut_customization_shared.css", -] +css_files = [ "css/shortcut_customization_shared.css" ] # Files that are generated by css_to_wrapper(). css_wrapper_files = [] @@ -68,11 +72,13 @@ static_resource_files = [ css_to_wrapper("css_wrapper_files") { in_files = css_files use_js = true + out_folder = "$target_gen_dir/$html_css_preprocess_folder" } html_to_wrapper("html_to_wrapper_files") { in_files = html_files + icons_html_files use_js = true + out_folder = "$target_gen_dir/$html_css_preprocess_folder" } preprocess_if_expr("preprocess") { @@ -86,12 +92,13 @@ preprocess_if_expr("preprocess_generated") { ":css_wrapper_files", ":html_to_wrapper_files", ] - in_folder = target_gen_dir + in_folder = "$target_gen_dir/$html_css_preprocess_folder" out_folder = "$target_gen_dir/$preprocess_folder" in_files = html_wrapper_files + css_wrapper_files } ts_library("build_ts") { + composite = true root_dir = "$target_gen_dir/$preprocess_folder" out_dir = "$target_gen_dir/tsc" tsconfig_base = "tsconfig_base.json" diff --git a/chromium/ash/webui/system_apps/BUILD.gn b/chromium/ash/webui/system_apps/BUILD.gn index 50263d730ed..c4154352e0e 100644 --- a/chromium/ash/webui/system_apps/BUILD.gn +++ b/chromium/ash/webui/system_apps/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/system_apps/public/BUILD.gn b/chromium/ash/webui/system_apps/public/BUILD.gn index 84cf42c86e3..fce9ce22242 100644 --- a/chromium/ash/webui/system_apps/public/BUILD.gn +++ b/chromium/ash/webui/system_apps/public/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2022 The Chromium Authors. All rights reserved. +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/system_apps/public/js/BUILD.gn b/chromium/ash/webui/system_apps/public/js/BUILD.gn index 6ff11df4c4d..3bcae95f538 100644 --- a/chromium/ash/webui/system_apps/public/js/BUILD.gn +++ b/chromium/ash/webui/system_apps/public/js/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/system_extensions_internals_ui/BUILD.gn b/chromium/ash/webui/system_extensions_internals_ui/BUILD.gn index 7b0a72a7beb..610e7cde36a 100644 --- a/chromium/ash/webui/system_extensions_internals_ui/BUILD.gn +++ b/chromium/ash/webui/system_extensions_internals_ui/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/system_extensions_internals_ui/mojom/BUILD.gn b/chromium/ash/webui/system_extensions_internals_ui/mojom/BUILD.gn index 0755d3797c4..afc3a795309 100644 --- a/chromium/ash/webui/system_extensions_internals_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/system_extensions_internals_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/system_extensions_internals_ui/mojom/system_extensions_internals_ui.mojom b/chromium/ash/webui/system_extensions_internals_ui/mojom/system_extensions_internals_ui.mojom index bf57d335a5b..2899928a5fc 100644 --- a/chromium/ash/webui/system_extensions_internals_ui/mojom/system_extensions_internals_ui.mojom +++ b/chromium/ash/webui/system_extensions_internals_ui/mojom/system_extensions_internals_ui.mojom @@ -1,4 +1,4 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. +// Copyright 2021 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/telemetry_extension_ui/mojom/BUILD.gn b/chromium/ash/webui/telemetry_extension_ui/mojom/BUILD.gn index 42f66327238..0b471f585c0 100644 --- a/chromium/ash/webui/telemetry_extension_ui/mojom/BUILD.gn +++ b/chromium/ash/webui/telemetry_extension_ui/mojom/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/telemetry_extension_ui/mojom/system_events_service.mojom b/chromium/ash/webui/telemetry_extension_ui/mojom/system_events_service.mojom index 063f8c11e39..bdca515e11b 100644 --- a/chromium/ash/webui/telemetry_extension_ui/mojom/system_events_service.mojom +++ b/chromium/ash/webui/telemetry_extension_ui/mojom/system_events_service.mojom @@ -1,4 +1,4 @@ -// Copyright 2020 The Chromium Authors. All rights reserved. +// Copyright 2020 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/ash/webui/telemetry_extension_ui/services/BUILD.gn b/chromium/ash/webui/telemetry_extension_ui/services/BUILD.gn index e650d0eda67..8c926ed23c2 100644 --- a/chromium/ash/webui/telemetry_extension_ui/services/BUILD.gn +++ b/chromium/ash/webui/telemetry_extension_ui/services/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/ash/webui/web_applications/BUILD.gn b/chromium/ash/webui/web_applications/BUILD.gn index c1ae9baa893..1aad0e06029 100644 --- a/chromium/ash/webui/web_applications/BUILD.gn +++ b/chromium/ash/webui/web_applications/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2020 The Chromium Authors. All rights reserved. +# Copyright 2020 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -12,6 +12,7 @@ static_library("web_applications") { "webui_test_prod_util.h", ] deps = [ + "//ash/constants", "//base", "//base:i18n", "//content/public/browser", diff --git a/chromium/ash/webui/web_applications/test/BUILD.gn b/chromium/ash/webui/web_applications/test/BUILD.gn index 01b08e33161..c3670d68bbd 100644 --- a/chromium/ash/webui/web_applications/test/BUILD.gn +++ b/chromium/ash/webui/web_applications/test/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright 2021 The Chromium Authors. All rights reserved. +# Copyright 2021 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. |