diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-04 17:20:24 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-12 08:15:25 +0000 |
commit | 8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch) | |
tree | 788d8d7549712682703a0310ca4a0f0860d4802b /chromium/ash/public | |
parent | 606d85f2a5386472314d39923da28c70c60dc8e7 (diff) |
BASELINE: Update Chromium to 98.0.4758.90
Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ash/public')
-rw-r--r-- | chromium/ash/public/cpp/BUILD.gn | 38 | ||||
-rw-r--r-- | chromium/ash/public/cpp/ambient/proto/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/ash/public/cpp/assistant/test_support/BUILD.gn | 8 | ||||
-rw-r--r-- | chromium/ash/public/cpp/external_arc/BUILD.gn | 21 | ||||
-rw-r--r-- | chromium/ash/public/cpp/holding_space/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/ash/public/cpp/quick_answers/test_support/BUILD.gn | 18 | ||||
-rw-r--r-- | chromium/ash/public/cpp/resources/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/ash/public/mojom/BUILD.gn | 23 | ||||
-rw-r--r-- | chromium/ash/public/mojom/accelerator_keys.mojom | 232 |
10 files changed, 310 insertions, 43 deletions
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn index 4e9210a9b30..79d33d1eece 100644 --- a/chromium/ash/public/cpp/BUILD.gn +++ b/chromium/ash/public/cpp/BUILD.gn @@ -2,11 +2,16 @@ # 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) + # C++ headers and sources that can be used outside ash. component("cpp") { sources = [ + "accelerator_configuration.cc", + "accelerator_configuration.h", "accelerators.cc", "accelerators.h", "accessibility_controller.cc", @@ -48,6 +53,7 @@ component("cpp") { "app_list/app_list_features.h", "app_list/app_list_metrics.cc", "app_list/app_list_metrics.h", + "app_list/app_list_model_delegate.h", "app_list/app_list_notifier.h", "app_list/app_list_switches.cc", "app_list/app_list_switches.h", @@ -65,6 +71,10 @@ component("cpp") { "ash_typography.cc", "ash_typography.h", "ash_view_ids.h", + "ash_web_view.cc", + "ash_web_view.h", + "ash_web_view_factory.cc", + "ash_web_view_factory.h", "assistant/assistant_interface_binder.cc", "assistant/assistant_interface_binder.h", "assistant/assistant_setup.cc", @@ -73,10 +83,6 @@ component("cpp") { "assistant/assistant_state.h", "assistant/assistant_state_base.cc", "assistant/assistant_state_base.h", - "assistant/assistant_web_view.cc", - "assistant/assistant_web_view.h", - "assistant/assistant_web_view_factory.cc", - "assistant/assistant_web_view_factory.h", "assistant/controller/assistant_alarm_timer_controller.cc", "assistant/controller/assistant_alarm_timer_controller.h", "assistant/controller/assistant_controller.cc", @@ -108,6 +114,7 @@ component("cpp") { "clipboard_image_model_factory.h", "desk_template.cc", "desk_template.h", + "desks_templates_delegate.h", "esim_manager.cc", "esim_manager.h", "file_icon_util.cc", @@ -178,9 +185,6 @@ component("cpp") { "media_client.h", "media_controller.cc", "media_controller.h", - "media_notification_provider.cc", - "media_notification_provider.h", - "media_notification_provider_observer.h", "message_center/arc_notification_constants.h", "message_center/arc_notification_manager_base.cc", "message_center/arc_notification_manager_base.h", @@ -225,17 +229,12 @@ component("cpp") { "privacy_screen_dlp_helper.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_session.cc", "projector/projector_session.h", - "quick_answers/controller/quick_answers_browser_client.cc", - "quick_answers/controller/quick_answers_browser_client.h", - "quick_answers/controller/quick_answers_controller.cc", - "quick_answers/controller/quick_answers_controller.h", - "quick_answers/quick_answers_state.cc", - "quick_answers/quick_answers_state.h", "resize_shadow_type.h", "rounded_corner_utils.cc", "rounded_corner_utils.h", @@ -315,6 +314,8 @@ component("cpp") { "vm_camera_mic_constants.h", "wallpaper/online_wallpaper_params.cc", "wallpaper/online_wallpaper_params.h", + "wallpaper/online_wallpaper_variant.cc", + "wallpaper/online_wallpaper_variant.h", "wallpaper/wallpaper_controller.cc", "wallpaper/wallpaper_controller.h", "wallpaper/wallpaper_controller_client.h", @@ -335,6 +336,7 @@ component("cpp") { defines = [ "ASH_PUBLIC_IMPLEMENTATION" ] assert_no_deps = [ + "//ash/components/arc", "//ash/public/cpp/external_arc", "//components/arc", "//components/exo", @@ -342,7 +344,7 @@ component("cpp") { ] deps = [ - "//ash/components/quick_answers/public/cpp:prefs", + "//ash/components/audio", "//ash/constants", "//ash/public/cpp/ambient/proto", "//ash/strings", @@ -356,6 +358,7 @@ 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", @@ -376,8 +379,10 @@ component("cpp") { ] public_deps = [ + "//ash/components/arc/mojom:notifications", "//ash/components/security_token_pin", "//ash/public/mojom", + "//ash/webui/personalization_app/proto", "//base", "//chromeos/crosapi/mojom", "//chromeos/services/assistant/public/mojom", @@ -385,7 +390,6 @@ component("cpp") { "//chromeos/services/cellular_setup/public/mojom", "//chromeos/services/network_config/public/mojom", "//components/app_restore", - "//components/arc/mojom:notifications", "//components/session_manager:base", "//components/user_manager", "//ui/base/ime/ash:ime_types", @@ -425,6 +429,7 @@ source_set("unit_tests") { "//mojo/public/cpp/bindings", "//testing/gtest", "//ui/aura:test_support", + "//ui/chromeos/styles:cros_styles_views", "//ui/compositor_extra", "//ui/gfx:test_support", "//ui/views", @@ -439,6 +444,8 @@ source_set("test_support") { "test/mock_projector_controller.h", "test/test_app_list_color_provider.cc", "test/test_app_list_color_provider.h", + "test/test_desks_templates_delegate.cc", + "test/test_desks_templates_delegate.h", "test/test_image_downloader.cc", "test/test_image_downloader.h", "test/test_keyboard_controller_observer.cc", @@ -456,6 +463,7 @@ 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/ambient/proto/BUILD.gn b/chromium/ash/public/cpp/ambient/proto/BUILD.gn index 709ad3c7f42..3d91205db35 100644 --- a/chromium/ash/public/cpp/ambient/proto/BUILD.gn +++ b/chromium/ash/public/cpp/ambient/proto/BUILD.gn @@ -2,8 +2,11 @@ # 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) + proto_library("proto") { sources = [ "photo_cache_entry.proto" ] } 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 ef496cffe99..7128b26f74e 100644 --- a/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn +++ b/chromium/ash/public/cpp/app_list/vector_icons/BUILD.gn @@ -2,8 +2,11 @@ # 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("//components/vector_icons/vector_icons.gni") +assert(is_chromeos_ash) + aggregate_vector_icons("app_list_vector_icons") { icon_directory = "." diff --git a/chromium/ash/public/cpp/assistant/test_support/BUILD.gn b/chromium/ash/public/cpp/assistant/test_support/BUILD.gn index 1f908b83c8c..4d52f09d79e 100644 --- a/chromium/ash/public/cpp/assistant/test_support/BUILD.gn +++ b/chromium/ash/public/cpp/assistant/test_support/BUILD.gn @@ -1,3 +1,11 @@ +# 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) + static_library("test_support") { testonly = true diff --git a/chromium/ash/public/cpp/external_arc/BUILD.gn b/chromium/ash/public/cpp/external_arc/BUILD.gn index 02eeccd8485..abccc98b8ed 100644 --- a/chromium/ash/public/cpp/external_arc/BUILD.gn +++ b/chromium/ash/public/cpp/external_arc/BUILD.gn @@ -1,7 +1,11 @@ # 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/ui.gni") + +import("//build/config/chromeos/ui_mode.gni") + +assert(is_chromeos_ash) + static_library("external_arc") { sources = [ "keyboard/arc_input_method_surface_manager.cc", @@ -36,14 +40,14 @@ static_library("external_arc") { defines = [ "ASH_PUBLIC_IMPLEMENTATION" ] deps = [ "//ash", + "//ash/components/arc:arc_base_utils", + "//ash/components/arc:arc_metrics_constants", + "//ash/components/arc/mojom:notifications", + "//ash/components/arc/session:connection_holder", "//ash/constants", "//ash/public/cpp", "//base", "//components/account_id", - "//components/arc:arc_base_utils", - "//components/arc:arc_metrics_constants", - "//components/arc:connection_holder", - "//components/arc/mojom:notifications", "//components/exo", "//mojo/public/cpp/system", "//ui/accessibility:accessibility", @@ -51,7 +55,6 @@ static_library("external_arc") { "//ui/aura", "//ui/color", "//ui/message_center", - "//ui/native_theme", "//ui/views", "//ui/wm", ] @@ -73,10 +76,10 @@ source_set("unit_tests") { ":test_support", "//ash", "//ash:test_support", + "//ash/components/arc:notification_test_support", + "//ash/components/arc/session:connection_holder", "//ash/public/cpp", "//base/test:test_support", - "//components/arc:connection_holder", - "//components/arc:notification_test_support", "//components/exo", "//components/exo:test_support", "//testing/gmock", @@ -87,7 +90,7 @@ source_set("unit_tests") { "//ui/views:test_support", ] - assert_no_deps = [ "//compponents/arc:arc_base" ] + assert_no_deps = [ "//ash/compponents/arc:arc_base" ] } source_set("test_support") { diff --git a/chromium/ash/public/cpp/holding_space/BUILD.gn b/chromium/ash/public/cpp/holding_space/BUILD.gn index fa9e064e692..36246bd54a9 100644 --- a/chromium/ash/public/cpp/holding_space/BUILD.gn +++ b/chromium/ash/public/cpp/holding_space/BUILD.gn @@ -2,6 +2,10 @@ # 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("test_support") { testonly = true diff --git a/chromium/ash/public/cpp/quick_answers/test_support/BUILD.gn b/chromium/ash/public/cpp/quick_answers/test_support/BUILD.gn deleted file mode 100644 index 2148d4ad551..00000000000 --- a/chromium/ash/public/cpp/quick_answers/test_support/BUILD.gn +++ /dev/null @@ -1,18 +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. - -static_library("test_support") { - testonly = true - - sources = [ - "quick_answers_test_base.cc", - "quick_answers_test_base.h", - ] - - deps = [ - "//ash/public/cpp", - "//chromeos/services/assistant:test_support", - "//testing/gtest", - ] -} diff --git a/chromium/ash/public/cpp/resources/BUILD.gn b/chromium/ash/public/cpp/resources/BUILD.gn index 99e663a3472..78b55b2d185 100644 --- a/chromium/ash/public/cpp/resources/BUILD.gn +++ b/chromium/ash/public/cpp/resources/BUILD.gn @@ -2,8 +2,11 @@ # 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/grit/grit_rule.gni") +assert(is_chromeos_ash) + grit("ash_public_unscaled_resources") { source = "ash_public_unscaled_resources.grd" outputs = [ diff --git a/chromium/ash/public/mojom/BUILD.gn b/chromium/ash/public/mojom/BUILD.gn index a069d914e8b..a27c2f5b44c 100644 --- a/chromium/ash/public/mojom/BUILD.gn +++ b/chromium/ash/public/mojom/BUILD.gn @@ -2,12 +2,16 @@ # 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") { disable_variants = true sources = [ + "accelerator_keys.mojom", "assistant_volume_control.mojom", "cros_display_config.mojom", "tray_action.mojom", @@ -15,7 +19,7 @@ mojom("mojom") { ] public_deps = [ - "//chromeos/components/proximity_auth/public/mojom", + "//ash/components/proximity_auth/public/mojom", "//components/account_id/mojom", "//components/sync/mojom", "//mojo/public/mojom/base", @@ -28,6 +32,23 @@ mojom("mojom") { "//url/mojom:url_mojom_gurl", ] + cpp_typemaps = [ + { + types = [ + { + mojom = "ash.accelerator_keys.mojom.VKey" + cpp = "::ui::KeyboardCode" + }, + ] + + traits_headers = [ + "//ui/events/keycodes/keyboard_codes_posix.h", + "accelerator_keys_mojom_traits.h", + ] + traits_sources = [ "accelerator_keys_mojom_traits.cc" ] + }, + ] + component_output_prefix = "ash_public_interfaces" export_class_attribute = "ASH_PUBLIC_EXPORT" export_define = "ASH_PUBLIC_IMPLEMENTATION=1" diff --git a/chromium/ash/public/mojom/accelerator_keys.mojom b/chromium/ash/public/mojom/accelerator_keys.mojom new file mode 100644 index 00000000000..609ff6eed24 --- /dev/null +++ b/chromium/ash/public/mojom/accelerator_keys.mojom @@ -0,0 +1,232 @@ +// 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.mojom; + +// Represents the v-key (main key) values of the accelerator. Values are +// based off of ui/events/keycodes/keyboard_codes_posix.h. +enum VKey { + kCancel = 0x03, + kBack = 0x08, + kTab = 0x09, + kBackTab = 0x0A, + kClear = 0x0C, + kReturn = 0x0D, + kShift = 0x10, + kControl = 0x11, + kMenu = 0x12, + kPause = 0x13, + kCapital = 0x14, + kKana = 0x15, + kHangul = 0x15, + kPaste = 0x16, + kJunja = 0x17, + kFinal = 0x18, + kHanja = 0x19, + kKanji = 0x19, + kEscape = 0x1B, + kConvert = 0x1C, + kNonConvert = 0x1D, + kAccept = 0x1E, + kModeChange = 0x1F, + kSpace = 0x20, + kPrior = 0x21, + kNext = 0x22, + kEnd = 0x23, + kHome = 0x24, + kLeft = 0x25, + kUp = 0x26, + kRight = 0x27, + kDown = 0x28, + kSelect = 0x29, + kPrint = 0x2A, + kExecute = 0x2B, + kSnapshot = 0x2C, // Print Screen / SysRq + kInsert = 0x2D, + kDelete = 0x2E, + kHelp = 0x2F, + kNum0 = 0x30, + kNum1 = 0x31, + kNum2 = 0x32, + kNum3 = 0x33, + kNum4 = 0x34, + kNum5 = 0x35, + kNum6 = 0x36, + kNum7 = 0x37, + kNum8 = 0x38, + kNum9 = 0x39, + kKeyA = 0x41, + kKeyB = 0x42, + kKeyC = 0x43, + kKeyD = 0x44, + kKeyE = 0x45, + kKeyF = 0x46, + kKeyG = 0x47, + kKeyH = 0x48, + kKeyI = 0x49, + kKeyJ = 0x4A, + kKeyK = 0x4B, + kKeyL = 0x4C, + kKeyM = 0x4D, + kKeyN = 0x4E, + kKeyO = 0x4F, + kKeyP = 0x50, + kKeyQ = 0x51, + kKeyR = 0x52, + kKeyS = 0x53, + kKeyT = 0x54, + kKeyU = 0x55, + kKeyV = 0x56, + kKeyW = 0x57, + kKeyX = 0x58, + kKeyY = 0x59, + kKeyZ = 0x5A, + kLWin = 0x5B, + kCommand = kLWin, // Provide the Mac name for convenience. + kRWin = 0x5C, + kApps = 0x5D, + kSleep = 0x5F, + kNumpad0 = 0x60, + kNumpad1 = 0x61, + kNumpad2 = 0x62, + kNumpad3 = 0x63, + kNumpad4 = 0x64, + kNumpad5 = 0x65, + kNumpad6 = 0x66, + kNumpad7 = 0x67, + kNumpad8 = 0x68, + kNumpad9 = 0x69, + kMultiply = 0x6A, + kAdd = 0x6B, + kSeparator = 0x6C, + kSubtract = 0x6D, + kDecimal = 0x6E, + kDivide = 0x6F, + kF1 = 0x70, + kF2 = 0x71, + kF3 = 0x72, + kF4 = 0x73, + kF5 = 0x74, + kF6 = 0x75, + kF7 = 0x76, + kF8 = 0x77, + kF9 = 0x78, + kF10 = 0x79, + kF11 = 0x7A, + kF12 = 0x7B, + kF13 = 0x7C, + kF14 = 0x7D, + kF15 = 0x7E, + kF16 = 0x7F, + kF17 = 0x80, + kF18 = 0x81, + kF19 = 0x82, + kF20 = 0x83, + kF21 = 0x84, + kF22 = 0x85, + kF23 = 0x86, + kF24 = 0x87, + kNumLock = 0x90, + kScroll = 0x91, + kLShift = 0xA0, + kRShift = 0xA1, + kLControl = 0xA2, + kRControl = 0xA3, + kLMenu = 0xA4, + kRMenu = 0xA5, + kBrowserBack = 0xA6, + kBrowserForward = 0xA7, + kBrowserRefresh = 0xA8, + kBrowserStop = 0xA9, + kBrowserSearch = 0xAA, + kBrowserFavorites = 0xAB, + kBrowserHome = 0xAC, + kVolumeMute = 0xAD, + kVolumeDown = 0xAE, + kVolumeUp = 0xAF, + kMediaNextTrack = 0xB0, + kMediaPrevTrack = 0xB1, + kMediaStop = 0xB2, + kMediaPlayPause = 0xB3, + kMediaLaunchMail = 0xB4, + kMediaLaunchMediaSelect = 0xB5, + kMediaLaunchApp1= 0xB6, + kMediaLaunchApp2 = 0xB7, + kOem1 = 0xBA, + kOemPlus = 0xBB, + kOemComma = 0xBC, + kOemMinus = 0xBD, + kOemPeriod = 0xBE, + kOem2 = 0xBF, + kOem3 = 0xC0, + kOem4 = 0xDB, + kOem5 = 0xDC, + kOem6 = 0xDD, + kOem7 = 0xDE, + kOem8 = 0xDF, + kOem102 = 0xE2, + kOem103 = 0xE3, // GTV KEYCODE_MEDIA_REWIND + kOem104 = 0xE4, // GTV KEYCODE_MEDIA_FAST_FORWARD + kProcessKey = 0xE5, + kPacket = 0xE7, + kOemAttn = 0xF0, // JIS DomKey::ALPHANUMERIC + kOemFinish = 0xF1, // JIS DomKey::KATAKANA + kOemCopy = 0xF2, // JIS DomKey::HIRAGANA + kDbeSbcsChar = 0xF3, // JIS DomKey::HANKAKU + kDbeDbcsChar = 0xF4, // JIS DomKey::ZENKAKU + kOemBacktab = 0xF5, // JIS DomKey::ROMAJI + kAttn = 0xF6, // DomKey::ATTN or JIS DomKey::KANA_MODE + kCrsel = 0xF7, + kExsel = 0xF8, + kEreof = 0xF9, + kPlay = 0xFA, + kZoom = 0xFB, + kNoName = 0xFC, + kPA1 = 0xFD, + kOemClear = 0xFE, + kUnknown = 0, + + // POSIX specific VKEYs. Note that as of Windows SDK 7.1, 0x97-9F, 0xD8-DA, + // and 0xE8 are unassigned. + kWlan = 0x97, + kPower = 0x98, + kAssistant = 0x99, + kSettings = 0x9A, + kPrivacyScreenToggle = 0x9B, + kMicrophoneMuteToggle = 0x9F, + kBrightnessDown = 0xD8, + kBrightnessUp = 0xD9, + kKbdBrightnessDown = 0xDA, + kKbdBrightnessUp = 0xE8, + + // Windows does not have a specific key code for AltGr. We use the unused 0xE1 + // (VK_OEM_AX) code to represent AltGr, matching the behaviour of Firefox on + // Linux. + kAltGr = 0xE1, + // Windows does not have a specific key code for Compose. We use the unused + // 0xE6 (VK_ICO_CLEAR) code to represent Compose. + kCompose = 0xE6, + // Windows does not have specific key codes for Media Play and Media Pause. We + // use the unused 0xE9 (VK_OEM_RESET) and 0xEA (VK_OEM_JUMP) codes to + // represent them. + kMediaPlay = 0xE9, + kMediaPause = 0xEA, +}; + +// Contains all sources of shortcuts, new sources must added to this enum. +enum AcceleratorSource { + // Accelerators that are owned by ash and handled in + // accelerator_controller_impl.cc. + kAsh, + // Event rewriters that are owned by ash and handled in + // event_rewriter_chromeos.cc. + kEventRewriter, + // Accelerators that are owned by the browser and sources from + // accelerator_table.cc. + kBrowser, + // Ambient accelerators such as Ctrl-C are not owned by any specific source. + kAmbient, + // Arc++ specific accelerators owned by Android apps. + kAndroid, +}; |