BASELINE: Update Chromium to 120.0.6099.272

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

6 files changed, 120 insertions, 13 deletions

diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 7601c14f334..b60da67cb5f 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -31,8 +31,6 @@ component("cpp") {
     "ambient/ambient_backend_controller.h",
     "ambient/ambient_client.cc",
     "ambient/ambient_client.h",
-    "ambient/ambient_managed_photo_source.cc",
-    "ambient/ambient_managed_photo_source.h",
     "ambient/ambient_mode_photo_source.h",
     "ambient/ambient_prefs.cc",
     "ambient/ambient_prefs.h",
@@ -66,6 +64,8 @@ component("cpp") {
     "app_types_util.h",
     "arc_app_id_provider.cc",
     "arc_app_id_provider.h",
+    "arc_compat_mode_util.cc",
+    "arc_compat_mode_util.h",
     "arc_game_controls_flag.h",
     "arc_resize_lock_type.h",
     "ash_constants.h",
@@ -200,6 +200,10 @@ component("cpp") {
     "locale_update_controller.h",
     "lock_screen_widget_factory.cc",
     "lock_screen_widget_factory.h",
+    "login/local_authentication_request_controller.cc",
+    "login/local_authentication_request_controller.h",
+    "login/login_utils.cc",
+    "login/login_utils.h",
     "login_accelerators.cc",
     "login_accelerators.h",
     "login_screen.cc",
@@ -249,8 +253,6 @@ component("cpp") {
     "pagination/pagination_model.h",
     "pagination/pagination_model_observer.h",
     "personalization_app/enterprise_policy_delegate.h",
-    "personalization_app/time_of_day_paths.cc",
-    "personalization_app/time_of_day_paths.h",
     "personalization_app/user_display_info.cc",
     "personalization_app/user_display_info.h",
     "power_utils.cc",
@@ -462,6 +464,7 @@ component("cpp") {
   public_deps = [
     "//ash/components/arc/mojom:notifications",
     "//ash/public/mojom",
+    "//ash/webui/personalization_app/mojom:mojom_shared_cpp_sources",
     "//ash/webui/personalization_app/proto",
     "//base",
     "//chromeos/ash/components/audio/public/mojom",
@@ -480,6 +483,8 @@ component("cpp") {
     "//components/version_info:channel",
     "//ui/base/ime/ash",
     "//ui/base/ime/ash:ime_types",
+    "//ui/chromeos/resources:resources",
+    "//ui/chromeos/resources:resources_grit",
     "//ui/gfx",
   ]
 
@@ -489,6 +494,7 @@ component("cpp") {
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "accelerator_actions_unittest.cc",
     "accelerator_keycode_lookup_cache_unittest.cc",
     "accelerators_util_unittest.cc",
     "ambient/ambient_prefs_unittest.cc",
diff --git a/chromium/ash/public/cpp/external_arc/BUILD.gn b/chromium/ash/public/cpp/external_arc/BUILD.gn
index 2030fe33cda..34c6933f73e 100644
--- a/chromium/ash/public/cpp/external_arc/BUILD.gn
+++ b/chromium/ash/public/cpp/external_arc/BUILD.gn
@@ -71,6 +71,7 @@ source_set("unit_tests") {
     "keyboard/arc_input_method_surface_manager_unittest.cc",
     "message_center/arc_notification_content_view_unittest.cc",
     "message_center/arc_notification_manager_unittest.cc",
+    "message_center/arc_notification_surface_manager_impl_unittest.cc",
     "message_center/arc_notification_view_unittest.cc",
     "message_center/metadata_utils_unittest.cc",
     "overlay/arc_overlay_controller_impl_unittest.cc",
diff --git a/chromium/ash/public/mojom/accelerator_actions.mojom b/chromium/ash/public/mojom/accelerator_actions.mojom
index 2d6440a10e5..f005529c774 100644
--- a/chromium/ash/public/mojom/accelerator_actions.mojom
+++ b/chromium/ash/public/mojom/accelerator_actions.mojom
@@ -86,7 +86,6 @@ enum AcceleratorAction {
   kShowEmojiPicker,
   kToggleImeMenuBubble,
   kShowShortcutViewer,
-  kShowStylusTools,
   kShowTaskManager,
   kStartAssistant,
   kStopScreenRecording,
@@ -120,6 +119,7 @@ enum AcceleratorAction {
   kToggleSnapGroupWindowsGroupAndUngroup,
   kToggleSnapGroupWindowsMinimizeAndRestore,
   kToggleSpokenFeedback,
+  kToggleStylusTools,
   kToggleSystemTrayBubble,
   kToggleWifi,
   kTouchHudClear,
@@ -135,17 +135,19 @@ enum AcceleratorAction {
   kWindowCycleSnapRight,
   kWindowMinimize,
   kMinimizeTopWindowOnBack,
+  kVolumeMuteToggle,
   kDebugClearUseKMeansPref,
   kDebugKeyboardBacklightToggle,
   kDebugMicrophoneMuteToggle,
   kDebugPrintLayerHierarchy,
   kDebugPrintViewHierarchy,
   kDebugPrintWindowHierarchy,
+  kDebugShowInformedRestore,
   kDebugShowToast,
+  kDebugShowSystemNudge,
   kDebugSystemUiStyleViewer,
   kDebugToggleDarkMode,
   kDebugToggleDynamicColor,
-  kDebugToggleGlanceables,
   kDebugTogglePowerButtonMenu,
   kDebugToggleShowDebugBorders,
   kDebugToggleShowFpsCounter,
diff --git a/chromium/ash/public/mojom/accelerator_configuration.mojom b/chromium/ash/public/mojom/accelerator_configuration.mojom
index 68f2a063428..7695cc992f2 100644
--- a/chromium/ash/public/mojom/accelerator_configuration.mojom
+++ b/chromium/ash/public/mojom/accelerator_configuration.mojom
@@ -39,4 +39,8 @@ enum AcceleratorConfigResult {
   // but it's not necessarily an error. This state warns users of the downsides
   // of using a non-search accelerator.
   kNonSearchAcceleratorWarning = 11,
+  // Error - search + function key is not allowed.
+  kSearchWithFunctionKeyNotAllowed = 12,
+  // Error - reserved key is not allowed.
+  kReservedKeyNotAllowed = 13,
 };
\ No newline at end of file
diff --git a/chromium/ash/public/mojom/accelerator_info.mojom b/chromium/ash/public/mojom/accelerator_info.mojom
index 5c28ab9a6d4..7848d83c2f4 100644
--- a/chromium/ash/public/mojom/accelerator_info.mojom
+++ b/chromium/ash/public/mojom/accelerator_info.mojom
@@ -67,6 +67,7 @@ enum AcceleratorLayoutStyle {
 };
 
 // Enum of top-level accelerator categories. Used in the UI for categorization.
+// Must be kept in sync with enums.xml: `ShortcutCustomizationMainCategory`.
 enum AcceleratorCategory {
   kGeneral,
   kDevice,
diff --git a/chromium/ash/public/mojom/input_device_settings.mojom b/chromium/ash/public/mojom/input_device_settings.mojom
index 4936c433db5..4dd1d70f241 100644
--- a/chromium/ash/public/mojom/input_device_settings.mojom
+++ b/chromium/ash/public/mojom/input_device_settings.mojom
@@ -7,6 +7,7 @@ module ash.mojom;
 import "ash/public/mojom/accelerator_actions.mojom";
 import "ash/public/mojom/accelerator_keys.mojom";
 import "mojo/public/mojom/base/time.mojom";
+import "ui/events/ash/mojom/extended_fkeys_modifier.mojom";
 import "ui/events/ash/mojom/modifier_key.mojom";
 import "ui/events/ash/mojom/simulate_right_click_modifier.mojom";
 import "ui/events/ash/mojom/six_pack_shortcut_modifier.mojom";
@@ -37,15 +38,33 @@ struct InputDeviceSettingsPolicy {
   bool value;
 };
 
+// Represents the policy that controls the F11/F12 settings.
+struct InputDeviceSettingsFkeyPolicy {
+  PolicyStatus policy_status;
+  ui.mojom.ExtendedFkeysModifier value;
+};
+
 // Represents the current set of keyboard enterprise policies. All members are
 // optional. When null, there is no enterprise policy set for the given setting.
 struct KeyboardPolicies {
+  // This policy is defined at components/policy/resources/templates/
+  //   policy_definitions/Accessibility/KeyboardDefaultToFunctionKeys.yaml
   InputDeviceSettingsPolicy? top_row_are_fkeys_policy;
+  // This policy is defined at components/policy/resources/templates/
+  //   policy_definitions/Miscellaneous/
+  //   DeviceSwitchFunctionKeysBehaviorEnabled.yaml
+  InputDeviceSettingsPolicy? enable_meta_fkey_rewrites_policy;
+  // This policy is defined at components/policy/resources/templates/
+  //   policy_definitions/Miscellaneous/
+  //   DeviceExtendedFkeysModifier.yaml
+  InputDeviceSettingsFkeyPolicy? extended_fkeys_policy;
 };
 
 // Represents the current set of mouse enterprise policies. All members are
 // optional. When null, there is no enterprise policy set for the given setting.
 struct MousePolicies {
+  // This policy is defined at components/policy/resources/templates/
+  //   policy_definitions/Miscellaneous/PrimaryMouseButtonSwitch.yaml
   InputDeviceSettingsPolicy? swap_right_policy;
 };
 
@@ -59,6 +78,35 @@ enum MetaKey {
   kCommand
 };
 
+// Contains top row action keys found on different keyboards.
+// Note: that this enumeration will need to be extended if new keys are added.
+enum TopRowActionKey {
+  kNone,
+  kUnknown,
+  kBack,
+  kForward,
+  kRefresh,
+  kFullscreen,
+  kOverview,
+  kScreenshot,
+  kScreenBrightnessDown,
+  kScreenBrightnessUp,
+  kMicrophoneMute,
+  kVolumeMute,
+  kVolumeDown,
+  kVolumeUp,
+  kKeyboardBacklightToggle,
+  kKeyboardBacklightDown,
+  kKeyboardBacklightUp,
+  kNextTrack,
+  kPreviousTrack,
+  kPlayPause,
+  kAllApplications,
+  kEmojiPicker,
+  kDictation,
+  kPrivacyScreenToggle,
+};
+
 // Contains all information needed to display, apply, and update keyboard
 // settings.
 struct Keyboard {
@@ -78,6 +126,9 @@ struct Keyboard {
   MetaKey meta_key;
   // List of modifier keys (caps lock, assistant, etc) present on this device.
   array<ui.mojom.ModifierKey> modifier_keys;
+  // List of top row action keys (back, refresh, etc) present on this device.
+  // The keys are stored in the order they appear on the device.
+  array<TopRowActionKey> top_row_action_keys;
   KeyboardSettings settings;
 };
 
@@ -87,6 +138,12 @@ struct KeyboardSettings {
   bool top_row_are_fkeys;
   bool suppress_meta_fkey_rewrites;
   SixPackKeyInfo? six_pack_key_remappings;
+  // Modifier key used to remap key events to the F11 key for ChromeOS
+  // keyboards.
+  ui.mojom.ExtendedFkeysModifier? f11;
+  // Modifier key used to remap key events to the F12 key for ChromeOS
+  // keyboards.
+  ui.mojom.ExtendedFkeysModifier? f12;
 };
 
 // Contains all information needed to display, apply, and update mouse
@@ -104,6 +161,8 @@ struct Mouse {
   // "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 mouse.
+  CustomizationRestriction customization_restriction;
   MouseSettings settings;
 };
 
@@ -209,15 +268,17 @@ struct Stylus {
 // Contains all information needed to display, apply, and update graphics
 // tablet settings.
 struct GraphicsTablet {
-  // Key used to lookup device settings in prefs in the format
-  // "vendor_id:product_id" where the ids are 16-bit hex in lowercase.
-  // Example: 5022:18d1.
-  string device_key;
+  // User visible name for the graphics tablet seen within the Settings SWA.
+  string name;
   // Unique identifier for the graphics tablet which is assigned by ozone when
   // it is connected and is reassigned when disconnected and reconnected to the
   // system. These ids can be rarely reused for multiple devices if the original
   // device holding the id had been disconnected.
   uint32 id;
+  // Key used to lookup device settings in prefs in the format
+  // "vendor_id:product_id" where the ids are 16-bit hex in lowercase.
+  // Example: 5022:18d1.
+  string device_key;
   GraphicsTabletSettings settings;
 };
 
@@ -230,7 +291,8 @@ struct GraphicsTabletSettings {
 };
 
 // Contains all information needed to apply remappings from a button to
-// either an action or key event and display it within the settings app.
+// either an acceleration action or key event or static shortcut action
+// and display it within the settings app.
 struct ButtonRemapping {
   // Human-readable label of the button remapping which user can rename.
   string name;
@@ -238,10 +300,12 @@ struct ButtonRemapping {
   RemappingAction? remapping_action;
 };
 
-// Represents the remapping action which can be either a key event or action.
+// Represents the remapping action which can be either a key event or
+// acceleration action or static shortcut action.
 union RemappingAction {
-  ash.mojom.AcceleratorAction action;
+  ash.mojom.AcceleratorAction accelerator_action;
   KeyEvent key_event;
+  StaticShortcutAction static_shortcut_action;
 };
 
 // Represents the key event the button remaps to.
@@ -250,6 +314,9 @@ struct KeyEvent {
   uint32 dom_code;
   uint32 dom_key;
   uint32 modifiers;
+
+  // Name of the key to display in the UI.
+  string key_display;
 };
 
 // Represents the button to remap which can be either a virtual key or
@@ -269,3 +336,29 @@ enum CustomizableButton {
   kExtra = 5,
   kSide = 6,
 };
+
+// Contains the valid set of static shortcut actions.
+enum StaticShortcutAction {
+  kDisable = 0,
+  kCopy = 1,
+  kPaste = 2,
+  kUndo = 3,
+  kRedo = 4,
+  kZoomIn = 5,
+  kZoomOut = 6,
+  kPreviousPage = 7,
+  kNextPage = 8,
+  kLeftClick = 9,
+  kRightClick = 10,
+  kMiddleClick = 11,
+};
+
+// Contains the customization restrictions of the devices.
+enum CustomizationRestriction {
+  // Full access to customization feature with no restrictions.
+  kAllowCustomizations = 0,
+  // Completely disable the customization feature.
+  kDisallowCustomizations = 1,
+  // Disable key event rewrites.
+  kDisableKeyEventRewrites = 2,
+};