BASELINE: Update Chromium to 122.0.6261.72

Change-Id: I655fa6da670f5e82a4c0df33630e388663de2a8e
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/542310
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 67 insertions, 20 deletions

diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index b60da67cb5f..aea138f6b6a 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -18,8 +18,6 @@ component("cpp") {
     "accelerators.h",
     "accelerators_util.cc",
     "accelerators_util.h",
-    "accessibility_controller.cc",
-    "accessibility_controller.h",
     "accessibility_controller_client.h",
     "accessibility_controller_enums.h",
     "accessibility_event_rewriter_delegate.h",
@@ -118,8 +116,11 @@ component("cpp") {
     "clipboard_image_model_factory.h",
     "connectivity_services.cc",
     "connectivity_services.h",
+    "debug_delegate.h",
     "default_user_image.cc",
     "default_user_image.h",
+    "desk_profiles_delegate.cc",
+    "desk_profiles_delegate.h",
     "desk_template.cc",
     "desk_template.h",
     "esim_manager.cc",
@@ -128,12 +129,6 @@ component("cpp") {
     "feature_discovery_duration_reporter.h",
     "feature_discovery_metric_util.cc",
     "feature_discovery_metric_util.h",
-    "file_preview/file_preview_controller.cc",
-    "file_preview/file_preview_controller.h",
-    "file_preview/file_preview_factory.cc",
-    "file_preview/file_preview_factory.h",
-    "file_preview/file_preview_image_skia_source.cc",
-    "file_preview/file_preview_image_skia_source.h",
     "fps_counter.cc",
     "fps_counter.h",
     "fwupd_download_client.cc",
@@ -152,6 +147,8 @@ component("cpp") {
     "holding_space/holding_space_image.h",
     "holding_space/holding_space_item.cc",
     "holding_space/holding_space_item.h",
+    "holding_space/holding_space_item_updated_fields.cc",
+    "holding_space/holding_space_item_updated_fields.h",
     "holding_space/holding_space_metrics.cc",
     "holding_space/holding_space_metrics.h",
     "holding_space/holding_space_model.cc",
@@ -247,6 +244,8 @@ component("cpp") {
     "notifier_settings_controller.cc",
     "notifier_settings_controller.h",
     "notifier_settings_observer.h",
+    "oobe_dialog_util.cc",
+    "oobe_dialog_util.h",
     "pagination/pagination_controller.cc",
     "pagination/pagination_controller.h",
     "pagination/pagination_model.cc",
@@ -255,6 +254,8 @@ component("cpp") {
     "personalization_app/enterprise_policy_delegate.h",
     "personalization_app/user_display_info.cc",
     "personalization_app/user_display_info.h",
+    "picker/picker_client.cc",
+    "picker/picker_client.h",
     "power_utils.cc",
     "power_utils.h",
     "presentation_time_recorder.cc",
@@ -351,8 +352,6 @@ component("cpp") {
     "system_notification_builder.cc",
     "system_notification_builder.h",
     "system_sounds_delegate.h",
-    "system_tray.cc",
-    "system_tray.h",
     "system_tray_client.h",
     "tab_cluster/clusterer.cc",
     "tab_cluster/clusterer.h",
@@ -380,6 +379,8 @@ component("cpp") {
     "wallpaper/online_wallpaper_params.h",
     "wallpaper/online_wallpaper_variant.cc",
     "wallpaper/online_wallpaper_variant.h",
+    "wallpaper/sea_pen_image.cc",
+    "wallpaper/sea_pen_image.h",
     "wallpaper/wallpaper_controller.cc",
     "wallpaper/wallpaper_controller.h",
     "wallpaper/wallpaper_controller_client.h",
@@ -478,6 +479,7 @@ component("cpp") {
     "//chromeos/crosapi/mojom",
     "//chromeos/services/network_config/public/mojom",
     "//components/app_restore",
+    "//components/manta/proto",
     "//components/session_manager:base",
     "//components/user_manager",
     "//components/version_info:channel",
@@ -500,8 +502,7 @@ source_set("unit_tests") {
     "ambient/ambient_prefs_unittest.cc",
     "android_intent_helper_unittest.cc",
     "app_list/app_list_config_provider_unittest.cc",
-    "file_preview/file_preview_factory_unittest.cc",
-    "file_preview/file_preview_unittest.cc",
+    "holding_space/holding_space_controller_unittest.cc",
     "holding_space/holding_space_image_unittest.cc",
     "holding_space/holding_space_item_unittest.cc",
     "holding_space/holding_space_model_unittest.cc",
@@ -547,6 +548,11 @@ source_set("unit_tests") {
     "//ui/views",
     "//ui/views:test_support",
   ]
+
+  data = [
+    # Needed to make commit bots run unit_tests on enums.xml changes.
+    "//tools/metrics/histograms/metadata/chromeos/enums.xml",
+  ]
 }
 
 source_set("accelerator_actions") {
@@ -564,8 +570,8 @@ source_set("test_support") {
   sources = [
     "personalization_app/time_of_day_test_utils.cc",
     "personalization_app/time_of_day_test_utils.h",
-    "test/in_process_image_decoder.cc",
-    "test/in_process_image_decoder.h",
+    "test/in_process_data_decoder.cc",
+    "test/in_process_data_decoder.h",
     "test/mock_in_session_auth_token_provider.cc",
     "test/mock_in_session_auth_token_provider.h",
     "test/mock_input_device_settings_controller.cc",
@@ -576,6 +582,8 @@ source_set("test_support") {
     "test/mock_projector_controller.h",
     "test/test_cast_config_controller.cc",
     "test/test_cast_config_controller.h",
+    "test/test_desk_profiles_delegate.cc",
+    "test/test_desk_profiles_delegate.h",
     "test/test_image_decoder.cc",
     "test/test_image_decoder.h",
     "test/test_image_downloader.cc",
@@ -601,6 +609,7 @@ source_set("test_support") {
     "//components/access_code_cast/common:metrics",
     "//mojo/public/cpp/bindings",
     "//services/data_decoder/public/cpp:service_provider",
+    "//services/data_decoder/public/cpp:test_support",
     "//services/data_decoder/public/mojom",
     "//services/device/public/cpp:test_support",
     "//services/network/public/cpp:cpp",
diff --git a/chromium/ash/public/cpp/holding_space/BUILD.gn b/chromium/ash/public/cpp/holding_space/BUILD.gn
index 944a6af2e98..edd35728d25 100644
--- a/chromium/ash/public/cpp/holding_space/BUILD.gn
+++ b/chromium/ash/public/cpp/holding_space/BUILD.gn
@@ -12,6 +12,8 @@ source_set("test_support") {
   sources = [
     "mock_holding_space_client.cc",
     "mock_holding_space_client.h",
+    "mock_holding_space_controller_observer.cc",
+    "mock_holding_space_controller_observer.h",
     "mock_holding_space_model_observer.cc",
     "mock_holding_space_model_observer.h",
   ]
diff --git a/chromium/ash/public/mojom/BUILD.gn b/chromium/ash/public/mojom/BUILD.gn
index bea434564f7..aa7ad6f9ef2 100644
--- a/chromium/ash/public/mojom/BUILD.gn
+++ b/chromium/ash/public/mojom/BUILD.gn
@@ -44,7 +44,6 @@ mojom("mojom") {
 # files for all dependencies (and their dependencies) in //ash/public/mojom.
 mojom("accelerator_info") {
   disable_variants = true
-  use_typescript_sources = true
   generate_legacy_js_bindings = true
 
   webui_module_path = "/"
@@ -63,7 +62,6 @@ mojom("accelerator_info") {
 mojom("input_device_settings") {
   disable_variants = true
   webui_module_path = "/"
-  use_typescript_sources = true
   generate_legacy_js_bindings = true
 
   sources = [ "input_device_settings.mojom" ]
@@ -84,7 +82,6 @@ mojom("input_device_settings") {
 # files for all dependencies (and their dependencies) in //ash/public/mojom.
 mojom("accelerator_configuration") {
   disable_variants = true
-  use_typescript_sources = true
   generate_legacy_js_bindings = true
 
   webui_module_path = "/"
@@ -99,7 +96,6 @@ mojom("accelerator_configuration") {
 # files for all dependencies (and their dependencies) in //ash/public/mojom.
 mojom("accelerator_keys") {
   disable_variants = true
-  use_typescript_sources = true
   generate_legacy_js_bindings = true
 
   webui_module_path = "/"
@@ -131,7 +127,6 @@ mojom("accelerator_keys") {
 # files for all dependencies (and their dependencies) in //ash/public/mojom.
 mojom("accelerator_actions") {
   disable_variants = true
-  use_typescript_sources = true
   generate_legacy_js_bindings = true
 
   webui_module_path = "/"
diff --git a/chromium/ash/public/mojom/accelerator_actions.mojom b/chromium/ash/public/mojom/accelerator_actions.mojom
index f005529c774..302e17829ff 100644
--- a/chromium/ash/public/mojom/accelerator_actions.mojom
+++ b/chromium/ash/public/mojom/accelerator_actions.mojom
@@ -136,7 +136,9 @@ enum AcceleratorAction {
   kWindowMinimize,
   kMinimizeTopWindowOnBack,
   kVolumeMuteToggle,
-  kDebugClearUseKMeansPref,
+  // The following are DEBUG actions with an offset. This is to keep the enum
+  // in sync with `AcceleratorActions` in ash/public/cpp/accelerator_actions.h.
+  kDebugClearUseKMeansPref = 9000,
   kDebugKeyboardBacklightToggle,
   kDebugMicrophoneMuteToggle,
   kDebugPrintLayerHierarchy,
@@ -148,6 +150,7 @@ enum AcceleratorAction {
   kDebugSystemUiStyleViewer,
   kDebugToggleDarkMode,
   kDebugToggleDynamicColor,
+  kDebugToggleFocusModeState,
   kDebugTogglePowerButtonMenu,
   kDebugToggleShowDebugBorders,
   kDebugToggleShowFpsCounter,
diff --git a/chromium/ash/public/mojom/accelerator_keys.mojom b/chromium/ash/public/mojom/accelerator_keys.mojom
index 6a0a84f1281..d9c786ed819 100644
--- a/chromium/ash/public/mojom/accelerator_keys.mojom
+++ b/chromium/ash/public/mojom/accelerator_keys.mojom
@@ -218,4 +218,23 @@ enum VKey {
   kEmojiPicker = 0xED,
   kDictate = 0xEE,
   kAllApplications = 0xEF,
+
+  // The following values are used to be able to recognize button events within
+  // ChromeOS. These have no functionality by default.
+  kButton0 = 0xFF00,
+  kButton1 = 0xFF01,
+  kButton2 = 0xFF02,
+  kButton3 = 0xFF03,
+  kButton4 = 0xFF04,
+  kButton5 = 0xFF05,
+  kButton6 = 0xFF06,
+  kButton7 = 0xFF07,
+  kButton8 = 0xFF08,
+  kButton9 = 0xFF09,
+  kButtonA = 0xFF0A,
+  kButtonB = 0xFF0B,
+  kButtonC = 0xFF0C,
+  kButtonX = 0xFF0D,
+  kButtonY = 0xFF0E,
+  kButtonZ = 0xFF0F,
 };
diff --git a/chromium/ash/public/mojom/input_device_settings.mojom b/chromium/ash/public/mojom/input_device_settings.mojom
index 4dd1d70f241..fc352f3adcb 100644
--- a/chromium/ash/public/mojom/input_device_settings.mojom
+++ b/chromium/ash/public/mojom/input_device_settings.mojom
@@ -163,6 +163,8 @@ struct Mouse {
   string device_key;
   // Used to check customization restriction of the mouse.
   CustomizationRestriction customization_restriction;
+  // Used to get the mouse button config.
+  MouseButtonConfig mouse_button_config;
   MouseSettings settings;
 };
 
@@ -279,6 +281,8 @@ struct GraphicsTablet {
   // "vendor_id:product_id" where the ids are 16-bit hex in lowercase.
   // Example: 5022:18d1.
   string device_key;
+  // Used to check customization restriction of the graphics tablet.
+  CustomizationRestriction customization_restriction;
   GraphicsTabletSettings settings;
 };
 
@@ -337,6 +341,17 @@ enum CustomizableButton {
   kSide = 6,
 };
 
+// Contains the valid set of mouse button configs.
+enum MouseButtonConfig {
+  // Mouse with no explicit configuration about
+  // what customizable buttons it has.
+  kNoConfig = 0,
+  // Mouse with five customizable buttons.
+  kFiveKey = 1,
+  // Logitech mouse with six customizable buttons.
+  kLogitechSixKey = 2,
+};
+
 // Contains the valid set of static shortcut actions.
 enum StaticShortcutAction {
   kDisable = 0,
@@ -361,4 +376,8 @@ enum CustomizationRestriction {
   kDisallowCustomizations = 1,
   // Disable key event rewrites.
   kDisableKeyEventRewrites = 2,
+  // Allow Alphabet key event rewrites.
+  kAllowAlphabetKeyEventRewrites = 3,
+  // Allow Alphabet or Number key event rewrites.
+  kAllowAlphabetOrNumberKeyEventRewrites = 4,
 };