From 21ba0c5d4bf8fba15dddd97cd693bad2358b77fd Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 3 Sep 2021 13:32:17 +0200 Subject: BASELINE: Update Chromium to 92.0.4515.166 Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364 --- chromium/chrome/browser/web_applications/BUILD.gn | 121 ++++++++++++--------- .../browser/web_applications/components/BUILD.gn | 29 +++-- .../browser/web_applications/extensions/BUILD.gn | 6 +- .../preinstalled_web_apps/BUILD.gn | 4 + .../chrome/browser/web_applications/proto/BUILD.gn | 5 +- .../web_applications/system_web_apps/BUILD.gn | 10 ++ 6 files changed, 103 insertions(+), 72 deletions(-) create mode 100644 chromium/chrome/browser/web_applications/system_web_apps/BUILD.gn (limited to 'chromium/chrome/browser/web_applications') diff --git a/chromium/chrome/browser/web_applications/BUILD.gn b/chromium/chrome/browser/web_applications/BUILD.gn index c0b171f8245..88ee85c704f 100644 --- a/chromium/chrome/browser/web_applications/BUILD.gn +++ b/chromium/chrome/browser/web_applications/BUILD.gn @@ -16,25 +16,25 @@ source_set("web_applications") { "daily_metrics_helper.cc", "daily_metrics_helper.h", "extension_status_utils.h", - "external_web_app_manager.cc", - "external_web_app_manager.h", - "external_web_app_utils.cc", - "external_web_app_utils.h", + "externally_managed_app_install_task.cc", + "externally_managed_app_install_task.h", + "externally_managed_app_manager_impl.cc", + "externally_managed_app_manager_impl.h", + "externally_managed_app_registration_task.cc", + "externally_managed_app_registration_task.h", "file_utils_wrapper.cc", "file_utils_wrapper.h", "manifest_update_manager.cc", "manifest_update_manager.h", "manifest_update_task.cc", "manifest_update_task.h", - "pending_app_install_task.cc", - "pending_app_install_task.h", - "pending_app_manager_impl.cc", - "pending_app_manager_impl.h", - "pending_app_registration_task.cc", - "pending_app_registration_task.h", "policy/web_app_policy_manager.cc", "policy/web_app_policy_manager.h", "policy/web_app_policy_manager_observer.h", + "preinstalled_web_app_manager.cc", + "preinstalled_web_app_manager.h", + "preinstalled_web_app_utils.cc", + "preinstalled_web_app_utils.h", "system_web_apps/system_web_app_background_task.cc", "system_web_apps/system_web_app_background_task.h", "system_web_apps/system_web_app_manager.cc", @@ -57,7 +57,6 @@ source_set("web_applications") { "web_app_install_task.h", "web_app_installation_utils.cc", "web_app_installation_utils.h", - "web_app_migration_manager.h", "web_app_mover.cc", "web_app_mover.h", "web_app_proto_utils.cc", @@ -81,6 +80,7 @@ source_set("web_applications") { "web_app_tab_helper.h", ] + # web_applications must not depend on //chrome/browser/extensions and //extensions deps = [ ":web_app_group", "//build:chromeos_buildflags", @@ -103,11 +103,15 @@ source_set("web_applications") { "//content/public/browser", "//services/metrics/public/cpp:ukm_builders", "//skia", + "//ui/base/idle", ] if (is_chromeos_ash) { deps += [ + "//ash/components/os_feedback_ui", "//ash/constants", + "//ash/content/shimless_rma", + "//ash/content/shortcut_customization_ui", "//ash/public/cpp", "//chromeos/components/camera_app_ui", "//chromeos/components/connectivity_diagnostics", @@ -134,6 +138,39 @@ source_set("web_applications") { ] } +# The set of dependencies that //chrome/test:test_support{_ui} have on +# web_applications test support. Split out from the below target as the below +# target itself depends on //chrome/test:test_support{_ui}. +source_set("web_applications_test_support_minimal") { + testonly = true + + sources = [ + "system_web_apps/test/test_system_web_app_manager.cc", + "system_web_apps/test/test_system_web_app_manager.h", + "test/service_worker_registration_waiter.cc", + "test/service_worker_registration_waiter.h", + "test/test_web_app_provider.cc", + "test/test_web_app_provider.h", + "test/web_app_install_observer.cc", + "test/web_app_install_observer.h", + "test/web_app_install_test_utils.cc", + "test/web_app_install_test_utils.h", + ] + deps = [ + "//base", + "//base/test:test_support", + "//chrome/browser/profiles:profile", + "//chrome/browser/web_applications", + "//chrome/browser/web_applications/components", + "//chrome/common:chrome_features", + "//chrome/common:non_code_constants", + "//components/keyed_service/content", + "//components/webapps/browser", + "//content/public/browser", + "//url", + ] +} + # This test_support library doesn't use extensions. source_set("web_applications_test_support") { testonly = true @@ -143,8 +180,6 @@ source_set("web_applications_test_support") { "system_web_apps/test/system_web_app_browsertest_base.h", "system_web_apps/test/test_system_web_app_installation.cc", "system_web_apps/test/test_system_web_app_installation.h", - "system_web_apps/test/test_system_web_app_manager.cc", - "system_web_apps/test/test_system_web_app_manager.h", "system_web_apps/test/test_system_web_app_url_data_source.cc", "system_web_apps/test/test_system_web_app_url_data_source.h", "system_web_apps/test/test_system_web_app_web_ui_controller_factory.cc", @@ -155,14 +190,16 @@ source_set("web_applications_test_support") { "test/fake_url_handler_manager.h", "test/fake_web_app_origin_association_manager.cc", "test/fake_web_app_origin_association_manager.h", - "test/service_worker_registration_waiter.cc", - "test/service_worker_registration_waiter.h", "test/test_app_registrar.cc", "test/test_app_registrar.h", "test/test_app_registry_controller.cc", "test/test_app_registry_controller.h", "test/test_data_retriever.cc", "test/test_data_retriever.h", + "test/test_externally_managed_app_manager.cc", + "test/test_externally_managed_app_manager.h", + "test/test_externally_managed_app_manager_impl.cc", + "test/test_externally_managed_app_manager_impl.h", "test/test_file_handler_manager.cc", "test/test_file_handler_manager.h", "test/test_file_utils.cc", @@ -171,14 +208,8 @@ source_set("web_applications_test_support") { "test/test_install_finalizer.h", "test/test_os_integration_manager.cc", "test/test_os_integration_manager.h", - "test/test_pending_app_manager.cc", - "test/test_pending_app_manager.h", - "test/test_pending_app_manager_impl.cc", - "test/test_pending_app_manager_impl.h", "test/test_web_app_database_factory.cc", "test/test_web_app_database_factory.h", - "test/test_web_app_provider.cc", - "test/test_web_app_provider.h", "test/test_web_app_registry_controller.cc", "test/test_web_app_registry_controller.h", "test/test_web_app_ui_manager.cc", @@ -187,18 +218,17 @@ source_set("web_applications_test_support") { "test/test_web_app_url_loader.h", "test/web_app_icon_test_utils.cc", "test/web_app_icon_test_utils.h", - "test/web_app_install_observer.cc", - "test/web_app_install_observer.h", - "test/web_app_install_test_utils.cc", - "test/web_app_install_test_utils.h", "test/web_app_registration_waiter.cc", "test/web_app_registration_waiter.h", - "test/web_app_test.cc", "test/web_app_test.h", + "test/web_app_test_utils.cc", + "test/web_app_test_utils.h", "test/web_app_uninstall_waiter.cc", "test/web_app_uninstall_waiter.h", ] + public_deps = [ ":web_applications_test_support_minimal" ] + deps = [ ":web_app_test_group", ":web_applications", @@ -208,10 +238,12 @@ source_set("web_applications_test_support") { "//chrome/browser/profiles:profile", "//chrome/browser/ui:ui", "//chrome/browser/web_applications/components", + "//chrome/test:test_support", "//chrome/test:test_support_ui", "//components/crx_file:crx_file", "//components/keyed_service/content:content", "//components/services/app_service/public/cpp:app_url_handling", + "//components/services/app_service/public/cpp:types", "//components/sync:test_support_model", "//components/webapps/browser", "//content/test:test_support", @@ -225,10 +257,10 @@ source_set("web_applications_unit_tests") { sources = [ "daily_metrics_helper_unittest.cc", - "external_web_app_manager_unittest.cc", - "external_web_app_utils_unittest.cc", + "externally_managed_app_manager_impl_unittest.cc", "manifest_update_task_unittest.cc", - "pending_app_manager_impl_unittest.cc", + "preinstalled_web_app_manager_unittest.cc", + "preinstalled_web_app_utils_unittest.cc", "system_web_apps/test/system_web_app_manager_unittest.cc", "web_app_database_unittest.cc", "web_app_icon_manager_unittest.cc", @@ -262,6 +294,8 @@ source_set("web_applications_unit_tests") { "//skia", "//testing/gmock", "//testing/gtest", + "//ui/base/idle:idle", + "//ui/base/idle:test_support", ] if (is_chromeos_ash) { @@ -284,15 +318,14 @@ source_set("web_applications_browser_tests") { testonly = true sources = [ - "external_web_app_manager_browsertest.cc", - "external_web_app_migration_browsertest.cc", + "externally_managed_app_manager_impl_browsertest.cc", "manifest_update_manager_browsertest.cc", - "pending_app_manager_impl_browsertest.cc", + "preinstalled_web_app_manager_browsertest.cc", + "preinstalled_web_app_migration_browsertest.cc", "preinstalled_web_apps_browsertest.cc", "system_web_apps/test/system_web_app_manager_browsertest.cc", "web_app_audio_focus_browsertest.cc", "web_app_icon_manager_browsertest.cc", - "web_app_migration_manager_browsertest.cc", "web_app_mover_browsertest.cc", ] @@ -300,7 +333,6 @@ source_set("web_applications_browser_tests") { deps = [ ":web_applications", - ":web_applications_on_extensions", ":web_applications_test_support", "//build:branding_buildflags", "//build:chromeos_buildflags", @@ -317,6 +349,8 @@ source_set("web_applications_browser_tests") { "//components/services/app_service/public/cpp:intents", "//components/webapps/browser", "//extensions/browser:test_support", + "//ui/base/idle:idle", + "//ui/base/idle:test_support", ] if (is_chromeos_ash) { @@ -328,25 +362,6 @@ source_set("web_applications_browser_tests") { } } -# TODO(crbug.com/877898): Erase this and move all migration code to -# //chrome/browser/web_applications/extensions:extensions GN source set. -source_set("web_applications_on_extensions") { - sources = [ "web_app_migration_manager.cc" ] - - deps = [ - ":web_app_group", - ":web_applications", - "//chrome/browser/profiles:profile", - "//chrome/browser/web_applications/components", - "//chrome/browser/web_applications/extensions", - "//chrome/common", - "//components/keyed_service/content", - "//components/pref_registry:pref_registry", - "//components/sync", - "//extensions/browser", - ] -} - group("unit_tests") { testonly = true diff --git a/chromium/chrome/browser/web_applications/components/BUILD.gn b/chromium/chrome/browser/web_applications/components/BUILD.gn index d51025045b1..cd56b58374f 100644 --- a/chromium/chrome/browser/web_applications/components/BUILD.gn +++ b/chromium/chrome/browser/web_applications/components/BUILD.gn @@ -16,14 +16,18 @@ source_set("components") { "app_registry_controller.h", "app_shortcut_manager.cc", "app_shortcut_manager.h", - "external_app_install_features.cc", - "external_app_install_features.h", "external_install_options.cc", "external_install_options.h", "externally_installed_web_app_prefs.cc", "externally_installed_web_app_prefs.h", + "externally_managed_app_manager.cc", + "externally_managed_app_manager.h", "file_handler_manager.cc", "file_handler_manager.h", + "file_handling_permission_context.cc", + "file_handling_permission_context.h", + "file_handling_permission_request_impl.cc", + "file_handling_permission_request_impl.h", "install_bounce_metric.cc", "install_bounce_metric.h", "install_finalizer.cc", @@ -32,10 +36,10 @@ source_set("components") { "install_manager.h", "os_integration_manager.cc", "os_integration_manager.h", - "pending_app_manager.cc", - "pending_app_manager.h", "policy/web_app_policy_constants.cc", "policy/web_app_policy_constants.h", + "preinstalled_app_install_features.cc", + "preinstalled_app_install_features.h", "protocol_handler_manager.cc", "protocol_handler_manager.h", "url_handler_manager.cc", @@ -117,10 +121,7 @@ source_set("components") { } if (is_linux) { - sources += [ - "web_app_protocol_handler_registration_linux.cc", - "web_app_run_on_os_login_linux.cc", - ] + sources += [ "web_app_run_on_os_login_linux.cc" ] } if (is_chromeos_ash || is_chromeos_lacros) { @@ -132,7 +133,6 @@ source_set("components") { "app_shim_registry_mac.cc", "app_shim_registry_mac.h", "web_app_file_handler_registration_mac.cc", - "web_app_protocol_handler_registration_mac.cc", "web_app_run_on_os_login_mac.mm", "web_app_shortcut_mac.h", "web_app_shortcut_mac.mm", @@ -181,6 +181,7 @@ source_set("components") { "//chrome/common", "//components/crx_file", "//components/keyed_service/content", + "//components/permissions:permissions", "//components/pref_registry", "//components/services/app_service/public/cpp:protocol_handling", "//components/services/app_service/public/mojom", @@ -215,11 +216,11 @@ source_set("unit_tests") { testonly = true sources = [ - "external_app_install_features_unittest.cc", + "externally_managed_app_manager_unittest.cc", "file_handler_manager_unittest.cc", "install_finalizer_unittest.cc", "os_integration_manager_unittest.cc", - "pending_app_manager_unittest.cc", + "preinstalled_app_install_features_unittest.cc", "protocol_handler_manager_unittest.cc", "web_app_constants_unittest.cc", "web_app_data_retriever_unittest.cc", @@ -246,7 +247,6 @@ source_set("unit_tests") { if (is_mac) { sources += [ "app_shim_registry_mac_unittest.cc", - "web_app_protocol_handler_registration_mac_unittest.cc", "web_app_run_on_os_login_mac_unittest.mm", "web_app_shortcut_mac_unittest.mm", ] @@ -261,10 +261,7 @@ source_set("unit_tests") { } if (is_linux) { - sources += [ - "web_app_protocol_handler_registration_linux_unittest.cc", - "web_app_run_on_os_login_linux_unittest.cc", - ] + sources += [ "web_app_run_on_os_login_linux_unittest.cc" ] } if (is_win || is_mac || (is_linux && !is_chromeos_lacros)) { diff --git a/chromium/chrome/browser/web_applications/extensions/BUILD.gn b/chromium/chrome/browser/web_applications/extensions/BUILD.gn index 94a384261c9..8951b66219f 100644 --- a/chromium/chrome/browser/web_applications/extensions/BUILD.gn +++ b/chromium/chrome/browser/web_applications/extensions/BUILD.gn @@ -7,6 +7,7 @@ import("//extensions/buildflags/buildflags.gni") assert(enable_extensions) +# TODO(crbug.com/1065748): Delete web_applications/extensions/ directory. source_set("extensions") { sources = [ "bookmark_app_file_handler_manager.cc", @@ -49,6 +50,7 @@ source_set("extensions") { "//components/pref_registry", "//components/services/app_service/public/mojom", "//components/sync/model", + "//components/webapps/browser:browser", "//content/public/browser", "//extensions/browser", "//skia", @@ -62,7 +64,7 @@ source_set("unit_tests") { "bookmark_app_install_finalizer_unittest.cc", "bookmark_app_util_unittest.cc", "externally_installed_web_app_prefs_unittest.cc", - "pending_app_install_task_unittest.cc", + "externally_managed_app_install_task_unittest.cc", "web_app_policy_manager_unittest.cc", "web_app_provider_unittest.cc", ] @@ -72,12 +74,12 @@ source_set("unit_tests") { "//chrome/browser", "//chrome/browser/web_applications:web_app_test_group", "//chrome/browser/web_applications:web_applications", - "//chrome/browser/web_applications:web_applications_on_extensions", "//chrome/browser/web_applications:web_applications_test_support", "//chrome/browser/web_applications/components", "//chrome/common", "//chrome/test:test_support", "//components/crx_file:crx_file", + "//components/webapps/browser:browser", "//content/public/browser", "//content/test:test_support", "//extensions/browser/install", diff --git a/chromium/chrome/browser/web_applications/preinstalled_web_apps/BUILD.gn b/chromium/chrome/browser/web_applications/preinstalled_web_apps/BUILD.gn index 77d24831ac6..a816327b794 100644 --- a/chromium/chrome/browser/web_applications/preinstalled_web_apps/BUILD.gn +++ b/chromium/chrome/browser/web_applications/preinstalled_web_apps/BUILD.gn @@ -44,6 +44,10 @@ source_set("preinstalled_web_apps") { sources += [ "google_calendar.cc", "google_calendar.h", + "google_chat.cc", + "google_chat.h", + "google_meet.cc", + "google_meet.h", ] } diff --git a/chromium/chrome/browser/web_applications/proto/BUILD.gn b/chromium/chrome/browser/web_applications/proto/BUILD.gn index d80992e8b61..f9ba942e24d 100644 --- a/chromium/chrome/browser/web_applications/proto/BUILD.gn +++ b/chromium/chrome/browser/web_applications/proto/BUILD.gn @@ -10,5 +10,8 @@ proto_library("proto") { "web_app.proto", "web_app_share_target.proto", ] - link_deps = [ "//components/sync/protocol" ] + link_deps = [ + "//chrome/browser/web_applications/system_web_apps:proto", + "//components/sync/protocol", + ] } diff --git a/chromium/chrome/browser/web_applications/system_web_apps/BUILD.gn b/chromium/chrome/browser/web_applications/system_web_apps/BUILD.gn new file mode 100644 index 00000000000..376424a254d --- /dev/null +++ b/chromium/chrome/browser/web_applications/system_web_apps/BUILD.gn @@ -0,0 +1,10 @@ +# 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("//third_party/protobuf/proto_library.gni") + +proto_library("proto") { + proto_in_dir = "//" + sources = [ "system_web_app_data.proto" ] +} -- cgit v1.2.1