summaryrefslogtreecommitdiffstats
path: root/chromium/ash/public
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-12 15:59:20 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-25 06:57:22 +0000
commitf7eaed5286974984ba5f9e3189d8f49d03e99f81 (patch)
treecaed19b2af2024f35449fb0b781d0a25e09d4f8f /chromium/ash/public
parent9729c4479fe23554eae6e6dd1f30ff488f470c84 (diff)
BASELINE: Update Chromium to 100.0.4896.167
Change-Id: I98cbeb5d7543d966ffe04d8cefded0c493a11333 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ash/public')
-rw-r--r--chromium/ash/public/cpp/BUILD.gn32
-rw-r--r--chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn1
-rw-r--r--chromium/ash/public/mojom/accelerator_keys.mojom4
3 files changed, 25 insertions, 12 deletions
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 79d33d1eece..f8f0767fd56 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -23,6 +23,8 @@ component("cpp") {
"accessibility_focus_ring_controller.h",
"accessibility_focus_ring_info.cc",
"accessibility_focus_ring_info.h",
+ "ambient/ambient_animation_theme.cc",
+ "ambient/ambient_animation_theme.h",
"ambient/ambient_backend_controller.cc",
"ambient/ambient_backend_controller.h",
"ambient/ambient_client.cc",
@@ -112,15 +114,16 @@ component("cpp") {
"clipboard_history_controller.h",
"clipboard_image_model_factory.cc",
"clipboard_image_model_factory.h",
+ "default_user_image.h",
"desk_template.cc",
"desk_template.h",
"desks_templates_delegate.h",
"esim_manager.cc",
"esim_manager.h",
- "file_icon_util.cc",
- "file_icon_util.h",
"fps_counter.cc",
"fps_counter.h",
+ "fwupd_download_client.cc",
+ "fwupd_download_client.h",
"gesture_action_type.h",
"holding_space/holding_space_client.h",
"holding_space/holding_space_constants.h",
@@ -221,18 +224,22 @@ component("cpp") {
"pagination/pagination_model.cc",
"pagination/pagination_model.h",
"pagination/pagination_model_observer.h",
+ "personalization_app/user_display_info.cc",
+ "personalization_app/user_display_info.h",
"power_utils.cc",
"power_utils.h",
- "presentation_time_recorder.cc",
- "presentation_time_recorder.h",
"privacy_screen_dlp_helper.cc",
"privacy_screen_dlp_helper.h",
+ "projector/annotator_tool.cc",
+ "projector/annotator_tool.h",
"projector/projector_annotator_controller.cc",
"projector/projector_annotator_controller.h",
"projector/projector_client.cc",
"projector/projector_client.h",
"projector/projector_controller.cc",
"projector/projector_controller.h",
+ "projector/projector_new_screencast_precondition.cc",
+ "projector/projector_new_screencast_precondition.h",
"projector/projector_session.cc",
"projector/projector_session.h",
"resize_shadow_type.h",
@@ -284,6 +291,11 @@ component("cpp") {
"style/color_provider.h",
"stylus_utils.cc",
"stylus_utils.h",
+ "system/toast_catalog.h",
+ "system/toast_data.cc",
+ "system/toast_data.h",
+ "system/toast_manager.cc",
+ "system/toast_manager.h",
"system_tray.cc",
"system_tray.h",
"system_tray_client.h",
@@ -301,10 +313,6 @@ component("cpp") {
"tablet_mode.cc",
"tablet_mode.h",
"tablet_mode_observer.h",
- "toast_data.cc",
- "toast_data.h",
- "toast_manager.cc",
- "toast_manager.h",
"update_types.h",
"view_shadow.cc",
"view_shadow.h",
@@ -312,6 +320,8 @@ component("cpp") {
"views_text_services_context_menu_impl.h",
"vm_camera_mic_constants.cc",
"vm_camera_mic_constants.h",
+ "wallpaper/google_photos_wallpaper_params.cc",
+ "wallpaper/google_photos_wallpaper_params.h",
"wallpaper/online_wallpaper_params.cc",
"wallpaper/online_wallpaper_params.h",
"wallpaper/online_wallpaper_variant.cc",
@@ -347,6 +357,7 @@ component("cpp") {
"//ash/components/audio",
"//ash/constants",
"//ash/public/cpp/ambient/proto",
+ "//ash/resources/vector_icons",
"//ash/strings",
"//base",
"//chromeos/dbus/power:power_manager_proto",
@@ -358,11 +369,11 @@ component("cpp") {
"//chromeos/ui/base",
"//chromeos/ui/frame",
"//chromeos/ui/vector_icons",
- "//components/favicon_base:favicon_base",
"//components/language/core/browser:browser",
"//components/pref_registry",
"//components/prefs",
"//components/sync/model",
+ "//components/user_manager",
"//mojo/public/cpp/bindings",
"//net/traffic_annotation",
"//services/network/public/cpp:cpp",
@@ -405,7 +416,6 @@ source_set("unit_tests") {
"ambient/ambient_metrics_unittest.cc",
"android_intent_helper_unittest.cc",
"app_list/app_list_config_provider_unittest.cc",
- "file_icon_util_unittest.cc",
"holding_space/holding_space_image_unittest.cc",
"holding_space/holding_space_item_unittest.cc",
"holding_space/holding_space_model_unittest.cc",
@@ -414,6 +424,7 @@ source_set("unit_tests") {
"pagination/pagination_model_unittest.cc",
"power_utils_unittest.cc",
"shelf_model_unittest.cc",
+ "system/toast_data_unittest.cc",
"tab_cluster/clusterer_unittest.cc",
"tab_cluster/correlation_clusterer_unittest.cc",
"tab_cluster/undirected_graph_unittest.cc",
@@ -463,7 +474,6 @@ source_set("test_support") {
deps = [
":cpp",
"//base",
- "//components/favicon_base:favicon_base",
"//services/device/public/cpp:test_support",
"//services/network/public/cpp:cpp",
"//testing/gmock",
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 7128b26f74e..b285730769b 100644
--- a/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn
+++ b/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn
@@ -18,7 +18,6 @@ aggregate_vector_icons("app_list_vector_icons") {
"bookmark.icon",
"equal.icon",
"google_black.icon",
- "google_color.icon",
"history.icon",
"mic_black.icon",
"omnibox_generic.icon",
diff --git a/chromium/ash/public/mojom/accelerator_keys.mojom b/chromium/ash/public/mojom/accelerator_keys.mojom
index 609ff6eed24..6c39526df27 100644
--- a/chromium/ash/public/mojom/accelerator_keys.mojom
+++ b/chromium/ash/public/mojom/accelerator_keys.mojom
@@ -212,6 +212,10 @@ enum VKey {
// represent them.
kMediaPlay = 0xE9,
kMediaPause = 0xEA,
+ kNew = 0xEB,
+ kClose = 0xEC,
+ kEmojiPicker = 0xED,
+ kDictate = 0xEE,
};
// Contains all sources of shortcuts, new sources must added to this enum.