diff options
Diffstat (limited to 'chromium/chrome/browser/web_applications')
4 files changed, 101 insertions, 142 deletions
diff --git a/chromium/chrome/browser/web_applications/BUILD.gn b/chromium/chrome/browser/web_applications/BUILD.gn index 00d0ad6f6b9..a5a977d0293 100644 --- a/chromium/chrome/browser/web_applications/BUILD.gn +++ b/chromium/chrome/browser/web_applications/BUILD.gn @@ -12,10 +12,16 @@ group("web_app_test_group") { source_set("web_applications") { sources = [ "abstract_web_app_database.h", - "external_web_apps.cc", - "external_web_apps.h", + "external_web_app_manager.cc", + "external_web_app_manager.h", "file_utils_wrapper.cc", "file_utils_wrapper.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", "system_web_app_manager.cc", "system_web_app_manager.h", "web_app.cc", @@ -24,6 +30,8 @@ source_set("web_applications") { "web_app_database.h", "web_app_database_factory.cc", "web_app_database_factory.h", + "web_app_file_handler_manager.cc", + "web_app_file_handler_manager.h", "web_app_icon_manager.cc", "web_app_icon_manager.h", "web_app_install_finalizer.cc", @@ -34,12 +42,12 @@ source_set("web_applications") { "web_app_install_task.h", "web_app_registrar.cc", "web_app_registrar.h", + "web_app_registry_update.cc", + "web_app_registry_update.h", "web_app_sync_bridge.cc", "web_app_sync_bridge.h", "web_app_sync_manager.cc", "web_app_sync_manager.h", - "web_app_tab_helper.cc", - "web_app_tab_helper.h", ] deps = [ @@ -57,7 +65,7 @@ source_set("web_applications") { "//ash/public/cpp:cpp", "//chromeos/constants", "//components/arc:arc_base", - "//components/arc/common", + "//components/arc/mojom", ] } @@ -66,6 +74,7 @@ source_set("web_applications") { ] } +# This test_support library doesn't use extensions. source_set("web_applications_test_support") { testonly = true @@ -74,6 +83,8 @@ source_set("web_applications_test_support") { "test/test_app_registrar.h", "test/test_data_retriever.cc", "test/test_data_retriever.h", + "test/test_file_handler_manager.cc", + "test/test_file_handler_manager.h", "test/test_file_utils.cc", "test/test_file_utils.h", "test/test_install_finalizer.cc", @@ -90,7 +101,12 @@ source_set("web_applications_test_support") { "test/test_web_app_ui_manager.h", "test/test_web_app_url_loader.cc", "test/test_web_app_url_loader.h", - "test/web_app_test.cc", + "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_registration_waiter.cc", + "test/web_app_registration_waiter.h", "test/web_app_test.h", ] @@ -111,6 +127,8 @@ source_set("web_applications_unit_tests") { testonly = true sources = [ + "external_web_app_manager_unittest.cc", + "pending_app_manager_impl_unittest.cc", "web_app_database_unittest.cc", "web_app_icon_manager_unittest.cc", "web_app_install_manager_unittest.cc", @@ -121,6 +139,7 @@ source_set("web_applications_unit_tests") { deps = [ ":web_app_test_group", ":web_applications", + ":web_applications_on_extensions_test_support", ":web_applications_test_support", "//base/test:test_support", "//chrome/browser", @@ -137,13 +156,31 @@ source_set("web_applications_unit_tests") { "//chrome/browser/chromeos", "//components/arc:arc", "//components/arc:arc_test_support", - "//components/arc/common", + "//components/arc/mojom", ] } } -# TODO(loyso): Erase this and move WebAppProvider into web_applications set. -# crbug.com/877898 +source_set("web_applications_browser_tests") { + testonly = true + + sources = [ + "pending_app_manager_impl_browsertest.cc", + ] + + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + + deps = [ + ":web_applications", + ":web_applications_test_support", + "//chrome/browser/web_applications/components", + "//chrome/test:test_support", + "//chrome/test:test_support_ui", + ] +} + +# TODO(crbug.com/877898): Erase this and move WebAppProvider into +# web_applications set. source_set("web_applications_on_extensions") { sources = [ "web_app_provider.cc", @@ -155,7 +192,6 @@ source_set("web_applications_on_extensions") { deps = [ ":web_app_group", ":web_applications", - "//chrome/browser/web_applications/bookmark_apps", "//chrome/browser/web_applications/components", "//chrome/browser/web_applications/extensions", "//chrome/common", @@ -165,24 +201,45 @@ source_set("web_applications_on_extensions") { ] } -source_set("unit_tests") { +# TODO(crbug.com/877898): Erase this and move TestWebAppProvider into +# web_applications_test_support set. +source_set("web_applications_on_extensions_test_support") { + testonly = true + + sources = [ + "test/test_web_app_provider.cc", + "test/test_web_app_provider.h", + ] + + deps = [ + ":web_app_test_group", + ":web_applications", + ":web_applications_on_extensions", + ":web_applications_test_support", + "//base", + "//chrome/browser", + "//chrome/browser/web_applications/components", + "//components/keyed_service/content", + ] +} + +group("unit_tests") { testonly = true deps = [ ":web_app_test_group", ":web_applications_unit_tests", - "//chrome/browser/web_applications/bookmark_apps:unit_tests", "//chrome/browser/web_applications/components:unit_tests", "//chrome/browser/web_applications/extensions:unit_tests", ] } -source_set("browser_tests") { +group("browser_tests") { testonly = true deps = [ ":web_app_test_group", - "//chrome/browser/web_applications/bookmark_apps:browser_tests", + ":web_applications_browser_tests", "//chrome/browser/web_applications/components:browser_tests", "//chrome/browser/web_applications/extensions:browser_tests", ] diff --git a/chromium/chrome/browser/web_applications/bookmark_apps/BUILD.gn b/chromium/chrome/browser/web_applications/bookmark_apps/BUILD.gn deleted file mode 100644 index a0e5d37981a..00000000000 --- a/chromium/chrome/browser/web_applications/bookmark_apps/BUILD.gn +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 2018 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("//extensions/buildflags/buildflags.gni") - -assert(enable_extensions) - -source_set("bookmark_apps") { - sources = [ - "bookmark_app_install_manager.cc", - "bookmark_app_install_manager.h", - ] - - deps = [ - "//chrome/browser/extensions", - "//chrome/browser/web_applications:web_app_group", - "//chrome/browser/web_applications/components", - "//chrome/browser/web_applications/extensions", - "//chrome/common", - "//components/favicon/content", - "//components/pref_registry", - "//extensions/browser", - "//skia", - ] -} - -source_set("test_support") { - testonly = true - - sources = [ - "test_web_app_provider.cc", - "test_web_app_provider.h", - ] - - deps = [ - ":bookmark_apps", - "//base", - "//chrome/browser", - "//chrome/browser/web_applications", - "//chrome/browser/web_applications:web_app_test_group", - "//chrome/browser/web_applications:web_applications_on_extensions", - "//chrome/browser/web_applications:web_applications_test_support", - "//chrome/browser/web_applications/components", - "//components/keyed_service/content", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "bookmark_app_install_manager_unittest.cc", - "external_web_apps_unittest.cc", - "policy/web_app_policy_manager_unittest.cc", - "system_web_app_manager_unittest.cc", - ] - - deps = [ - ":bookmark_apps", - ":test_support", - "//base", - "//chrome/browser", - "//chrome/browser/web_applications", - "//chrome/browser/web_applications:web_app_test_group", - "//chrome/browser/web_applications:web_applications_on_extensions", - "//chrome/browser/web_applications:web_applications_test_support", - "//chrome/browser/web_applications/components", - "//chrome/browser/web_applications/extensions", - "//chrome/common:constants", - "//chrome/test:test_support", - "//components/account_id", - "//components/crx_file:crx_file", - "//components/sync_preferences:test_support", - "//content/test:test_support", - "//extensions/common", - "//skia", - "//testing/gmock", - "//testing/gtest", - "//url", - ] -} - -source_set("browser_tests") { - testonly = true - - defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] - - sources = [ - "system_web_app_manager_browsertest.cc", - "system_web_app_manager_browsertest.h", - ] - - deps = [ - ":bookmark_apps", - ":test_support", - "//base", - "//base/test:test_support", - "//chrome/app/theme:chrome_unscaled_resources_grit", - "//chrome/browser/web_applications", - "//chrome/browser/web_applications:web_applications_on_extensions", - "//chrome/browser/web_applications:web_applications_test_support", - "//chrome/browser/web_applications/components", - "//chrome/browser/web_applications/extensions", - "//chrome/common:constants", - "//chrome/test:test_support", - "//chrome/test:test_support_ui", - "//extensions/browser", - "//url", - ] -} diff --git a/chromium/chrome/browser/web_applications/components/BUILD.gn b/chromium/chrome/browser/web_applications/components/BUILD.gn index 3e00c9d2dc4..d8ff81bdce2 100644 --- a/chromium/chrome/browser/web_applications/components/BUILD.gn +++ b/chromium/chrome/browser/web_applications/components/BUILD.gn @@ -4,6 +4,8 @@ source_set("components") { sources = [ + "app_icon_manager.cc", + "app_icon_manager.h", "app_registrar.cc", "app_registrar.h", "app_registrar_observer.h", @@ -11,12 +13,17 @@ source_set("components") { "external_install_options.h", "externally_installed_web_app_prefs.cc", "externally_installed_web_app_prefs.h", + "file_handler_manager.h", "install_bounce_metric.cc", "install_bounce_metric.h", + "install_finalizer.cc", "install_finalizer.h", "install_manager.cc", "install_manager.h", - "install_manager_observer.h", + "manifest_update_manager.cc", + "manifest_update_manager.h", + "manifest_update_task.cc", + "manifest_update_task.h", "pending_app_manager.cc", "pending_app_manager.h", "policy/web_app_policy_constants.cc", @@ -25,6 +32,7 @@ source_set("components") { "policy/web_app_policy_manager.h", "web_app_audio_focus_id_map.cc", "web_app_audio_focus_id_map.h", + "web_app_constants.cc", "web_app_constants.h", "web_app_data_retriever.cc", "web_app_data_retriever.h", @@ -45,8 +53,8 @@ source_set("components") { "web_app_shortcut_mac.mm", "web_app_shortcut_win.cc", "web_app_shortcut_win.h", - "web_app_tab_helper_base.cc", - "web_app_tab_helper_base.h", + "web_app_tab_helper.cc", + "web_app_tab_helper.h", "web_app_ui_manager.h", "web_app_url_loader.cc", "web_app_url_loader.h", @@ -131,13 +139,16 @@ source_set("browser_tests") { testonly = true sources = [ + "manifest_update_manager_browsertest.cc", "web_app_url_loader_browsertest.cc", ] defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] deps = [ - "//chrome/browser/web_applications/components", + ":components", + "//chrome/app:command_ids", + "//chrome/browser/web_applications:web_applications_test_support", "//chrome/test:test_support", "//chrome/test:test_support_ui", "//net:test_support", diff --git a/chromium/chrome/browser/web_applications/extensions/BUILD.gn b/chromium/chrome/browser/web_applications/extensions/BUILD.gn index 6f05beba117..0f7147cf70b 100644 --- a/chromium/chrome/browser/web_applications/extensions/BUILD.gn +++ b/chromium/chrome/browser/web_applications/extensions/BUILD.gn @@ -8,18 +8,18 @@ assert(enable_extensions) source_set("extensions") { sources = [ + "bookmark_app_file_handler_manager.cc", + "bookmark_app_file_handler_manager.h", + "bookmark_app_finalizer_utils.cc", + "bookmark_app_finalizer_utils.h", + "bookmark_app_icon_manager.cc", + "bookmark_app_icon_manager.h", "bookmark_app_install_finalizer.cc", "bookmark_app_install_finalizer.h", - "bookmark_app_installation_task.cc", - "bookmark_app_installation_task.h", "bookmark_app_registrar.cc", "bookmark_app_registrar.h", - "bookmark_app_tab_helper.cc", - "bookmark_app_tab_helper.h", "bookmark_app_util.cc", "bookmark_app_util.h", - "pending_bookmark_app_manager.cc", - "pending_bookmark_app_manager.h", "web_app_extension_shortcut.cc", "web_app_extension_shortcut.h", "web_app_extension_shortcut_mac.h", @@ -42,14 +42,13 @@ source_set("unit_tests") { testonly = true sources = [ - # Deprecated tests. TODO(crbug.com/915043): Erase this .cc file: - "bookmark_app_helper_installation_task_unittest.cc", "bookmark_app_install_finalizer_unittest.cc", - "bookmark_app_installation_task_unittest.cc", "bookmark_app_util_unittest.cc", "externally_installed_web_app_prefs_unittest.cc", "install_manager_bookmark_app_unittest.cc", - "pending_bookmark_app_manager_unittest.cc", + "pending_app_install_task_unittest.cc", + "system_web_app_manager_unittest.cc", + "web_app_policy_manager_unittest.cc", "web_app_provider_unittest.cc", ] @@ -59,8 +58,8 @@ source_set("unit_tests") { "//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_on_extensions_test_support", "//chrome/browser/web_applications:web_applications_test_support", - "//chrome/browser/web_applications/bookmark_apps", "//chrome/browser/web_applications/components", "//chrome/common", "//chrome/test:test_support", @@ -79,8 +78,8 @@ source_set("browser_tests") { sources = [ "bookmark_app_registrar_browsertest.cc", - "install_manager_bookmark_app_browsertest.cc", - "pending_bookmark_app_manager_browsertest.cc", + "system_web_app_manager_browsertest.cc", + "system_web_app_manager_browsertest.h", "web_app_audio_focus_browsertest.cc", ] @@ -89,10 +88,13 @@ source_set("browser_tests") { deps = [ ":extensions", "//base/test:test_support", + "//chrome/app/theme:chrome_unscaled_resources_grit", "//chrome/browser", "//chrome/browser/ui", "//chrome/browser/web_applications:web_app_test_group", "//chrome/browser/web_applications:web_applications_on_extensions", + "//chrome/browser/web_applications:web_applications_on_extensions_test_support", + "//chrome/browser/web_applications:web_applications_test_support", "//chrome/browser/web_applications/components", "//chrome/test:test_support", "//chrome/test:test_support_ui", |