diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-17 17:24:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-22 07:51:41 +0000 |
| commit | 774f54339e5db91f785733232d3950366db65d07 (patch) | |
| tree | 068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/chrome/browser/ash/system_extensions | |
| parent | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff) | |
| download | qtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz | |
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ash/system_extensions')
| -rw-r--r-- | chromium/chrome/browser/ash/system_extensions/BUILD.gn | 10 | ||||
| -rw-r--r-- | chromium/chrome/browser/ash/system_extensions/api/window_management/BUILD.gn | 25 |
2 files changed, 31 insertions, 4 deletions
diff --git a/chromium/chrome/browser/ash/system_extensions/BUILD.gn b/chromium/chrome/browser/ash/system_extensions/BUILD.gn index 27f8bf9b7e8..ae14e5cf107 100644 --- a/chromium/chrome/browser/ash/system_extensions/BUILD.gn +++ b/chromium/chrome/browser/ash/system_extensions/BUILD.gn @@ -23,6 +23,8 @@ source_set("system_extensions") { "system_extensions_install_manager.cc", "system_extensions_install_manager.h", "system_extensions_install_status.h", + "system_extensions_internals_page_handler.cc", + "system_extensions_internals_page_handler.h", "system_extensions_profile_utils.cc", "system_extensions_profile_utils.h", "system_extensions_provider.cc", @@ -32,14 +34,13 @@ source_set("system_extensions") { "system_extensions_sandboxed_unpacker.cc", "system_extensions_sandboxed_unpacker.h", "system_extensions_status_or.h", - "system_extensions_ui.cc", - "system_extensions_ui.h", - "system_extensions_web_ui_config_map.cc", - "system_extensions_web_ui_config_map.h", + "system_extensions_webui_config.cc", + "system_extensions_webui_config.h", ] deps = [ ":system_extensions_group", "//ash/constants", + "//ash/webui/system_extensions_internals_ui/mojom", "//base", "//chrome/browser/chromeos", "//chrome/browser/profiles", @@ -65,6 +66,7 @@ source_set("browser_tests") { deps = [ ":system_extensions", + "api/window_management:browser_tests", "//chrome/test:test_support", "//chrome/test:test_support_ui", ] diff --git a/chromium/chrome/browser/ash/system_extensions/api/window_management/BUILD.gn b/chromium/chrome/browser/ash/system_extensions/api/window_management/BUILD.gn index 57b14a048fb..73a5c5819ae 100644 --- a/chromium/chrome/browser/ash/system_extensions/api/window_management/BUILD.gn +++ b/chromium/chrome/browser/ash/system_extensions/api/window_management/BUILD.gn @@ -2,17 +2,42 @@ # 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("window_management") { sources = [ "window_management_impl.cc", "window_management_impl.h", ] deps = [ + "//ash", + "//chrome/browser/ash/system_extensions:system_extensions_group", "//chrome/browser/profiles:profile", "//components/services/app_service/public/cpp:instance_update", "//components/services/app_service/public/mojom", "//third_party/blink/public/mojom:mojom_platform", + "//ui/aura", "//ui/views", "//ui/webui", ] } + +source_set("browser_tests") { + testonly = true + + sources = [ "cros_window_browsertest.cc" ] + + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + + deps = [ + ":window_management", + "//chrome/test:test_support", + ] + + data = [ + "//third_party/blink/web_tests/resources/testharness.js", + "//third_party/blink/web_tests/resources/testharness-helpers.js", + ] +} |