Commit f3fe6cc9 authored by Nigel Tao's avatar Nigel Tao Committed by Commit Bot

Move the app_service code to //chrome/services

The app_service code was originally created under //chrome/browser,
specifically //chrome/browser/apps/foundation. This was because of an
early concern that the app_service implementation would need to be
tightly coupled to browser concepts, especially a Profile. More recent
prototyping suggests that this won't be the case.

This is just a "git mv" plus some semi-mechanical clean-up, e.g. keeping
"#include" lines sorted.

Change-Id: I0e511f5cab636afb7ac5e5235139873d75230377
Reviewed-on: https://chromium-review.googlesource.com/c/1312435Reviewed-by: default avatarDominic Battré <battre@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605876}
parent 51f716d8
...@@ -484,8 +484,7 @@ service_manifest("chrome_content_browser_manifest_overlay") { ...@@ -484,8 +484,7 @@ service_manifest("chrome_content_browser_manifest_overlay") {
] ]
} }
if (!is_android) { if (!is_android) {
packaged_services += packaged_services += [ "//chrome/services/app_service:manifest" ]
[ "//chrome/browser/apps/foundation/app_service:manifest" ]
} }
} }
......
...@@ -3070,7 +3070,6 @@ jumbo_split_static_library("browser") { ...@@ -3070,7 +3070,6 @@ jumbo_split_static_library("browser") {
deps += [ deps += [
":theme_properties", ":theme_properties",
"//chrome/app/vector_icons", "//chrome/app/vector_icons",
"//chrome/browser/apps/foundation/app_service:lib",
"//chrome/browser/policy:path_parser", "//chrome/browser/policy:path_parser",
"//chrome/browser/profile_resetter:profile_reset_report_proto", "//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto", "//chrome/browser/resource_coordinator:intervention_policy_database_proto",
...@@ -3080,6 +3079,7 @@ jumbo_split_static_library("browser") { ...@@ -3080,6 +3079,7 @@ jumbo_split_static_library("browser") {
"//chrome/browser/resources:component_extension_resources", "//chrome/browser/resources:component_extension_resources",
"//chrome/browser/search:generated", "//chrome/browser/search:generated",
"//chrome/common/importer:interfaces", "//chrome/common/importer:interfaces",
"//chrome/services/app_service:lib",
"//components/feedback", "//components/feedback",
"//components/keep_alive_registry", "//components/keep_alive_registry",
"//components/vector_icons", "//components/vector_icons",
......
benwells@chromium.org
dominickn@chromium.org
...@@ -58,7 +58,6 @@ source_set("chromeos") { ...@@ -58,7 +58,6 @@ source_set("chromeos") {
"//cc/paint", "//cc/paint",
"//chrome/app:command_ids", "//chrome/app:command_ids",
"//chrome/app/vector_icons", "//chrome/app/vector_icons",
"//chrome/browser/apps/foundation/app_service:lib",
"//chrome/browser/apps/platform_apps", "//chrome/browser/apps/platform_apps",
"//chrome/browser/apps/platform_apps/api", "//chrome/browser/apps/platform_apps/api",
"//chrome/browser/chromeos/android_sms:android_sms_urls", "//chrome/browser/chromeos/android_sms:android_sms_urls",
...@@ -75,6 +74,7 @@ source_set("chromeos") { ...@@ -75,6 +74,7 @@ source_set("chromeos") {
"//chrome/common/extensions/api", "//chrome/common/extensions/api",
"//chrome/common/net", "//chrome/common/net",
"//chrome/common/safe_browsing:proto", "//chrome/common/safe_browsing:proto",
"//chrome/services/app_service:lib",
"//chrome/services/diagnosticsd/public/mojom", "//chrome/services/diagnosticsd/public/mojom",
"//chrome/services/file_util/public/cpp", "//chrome/services/file_util/public/cpp",
"//chromeos", "//chromeos",
......
specific_include_rules = { specific_include_rules = {
"profile_impl.cc": [ "profile_impl.cc": [
# Profile creates the App Service that manages a profile's installed apps.
"+chrome/services/app_service/app_service.h",
"+chrome/services/app_service/public/mojom/constants.mojom.h",
# Profile embeds the Identity Service, but the dependence # Profile embeds the Identity Service, but the dependence
# should be used *only* for Identity Service creation. # should be used *only* for Identity Service creation.
"+services/identity/identity_service.h", "+services/identity/identity_service.h",
......
...@@ -185,8 +185,8 @@ ...@@ -185,8 +185,8 @@
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#include "chrome/browser/android/download/download_manager_service.h" #include "chrome/browser/android/download/download_manager_service.h"
#else #else
#include "chrome/browser/apps/foundation/app_service/app_service.h" #include "chrome/services/app_service/app_service.h"
#include "chrome/browser/apps/foundation/app_service/public/mojom/constants.mojom.h" #include "chrome/services/app_service/public/mojom/constants.mojom.h"
#include "components/zoom/zoom_event_manager.h" #include "components/zoom/zoom_event_manager.h"
#include "content/public/common/page_zoom.h" #include "content/public/common/page_zoom.h"
#endif #endif
......
...@@ -1222,13 +1222,13 @@ jumbo_split_static_library("ui") { ...@@ -1222,13 +1222,13 @@ jumbo_split_static_library("ui") {
deps += [ deps += [
"//chrome/app/vector_icons", "//chrome/app/vector_icons",
"//chrome/browser:theme_properties", "//chrome/browser:theme_properties",
"//chrome/browser/apps/foundation/app_service/public/mojom",
"//chrome/browser/media/router", "//chrome/browser/media/router",
"//chrome/browser/profile_resetter:profile_reset_report_proto", "//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto", "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
"//chrome/browser/resource_coordinator/tab_ranker", "//chrome/browser/resource_coordinator/tab_ranker",
"//chrome/common:buildflags", "//chrome/common:buildflags",
"//chrome/common:search_mojom", "//chrome/common:search_mojom",
"//chrome/services/app_service/public/mojom",
"//components/feedback/proto", "//components/feedback/proto",
"//components/keep_alive_registry", "//components/keep_alive_registry",
"//components/network_session_configurator/common", "//components/network_session_configurator/common",
......
...@@ -24,7 +24,7 @@ source_set("lib") { ...@@ -24,7 +24,7 @@ source_set("lib") {
] ]
public_deps = [ public_deps = [
"//chrome/browser/apps/foundation/app_service/public/mojom", "//chrome/services/app_service/public/mojom",
] ]
} }
......
include_rules = [
"+components/pref_registry",
"+components/prefs",
"+services/preferences/public",
]
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "chrome/browser/apps/foundation/app_service/app_registry/app_registry.h" #include "chrome/services/app_service/app_registry/app_registry.h"
#include "base/values.h" #include "base/values.h"
#include "components/pref_registry/pref_registry_syncable.h" #include "components/pref_registry/pref_registry_syncable.h"
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_ #ifndef CHROME_SERVICES_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_
#define CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_ #define CHROME_SERVICES_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_
#include <memory> #include <memory>
#include <string> #include <string>
#include "base/macros.h" #include "base/macros.h"
#include "chrome/browser/apps/foundation/app_service/public/mojom/app_registry.mojom.h" #include "chrome/services/app_service/public/mojom/app_registry.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/binding_set.h"
class PrefRegistrySimple; class PrefRegistrySimple;
...@@ -45,4 +45,4 @@ class AppRegistry : public apps::mojom::AppRegistry { ...@@ -45,4 +45,4 @@ class AppRegistry : public apps::mojom::AppRegistry {
} // namespace apps } // namespace apps
#endif // CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_ #endif // CHROME_SERVICES_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "chrome/browser/apps/foundation/app_service/app_registry/app_registry.h" #include "chrome/services/app_service/app_registry/app_registry.h"
#include "components/prefs/testing_pref_service.h" #include "components/prefs/testing_pref_service.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "chrome/browser/apps/foundation/app_service/app_registry/app_registry.h" #include "chrome/services/app_service/app_registry/app_registry.h"
#include "chrome/browser/apps/foundation/app_service/app_service.h" #include "chrome/services/app_service/app_service.h"
#include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
#include "services/preferences/public/cpp/pref_service_factory.h" #include "services/preferences/public/cpp/pref_service_factory.h"
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_SERVICE_H_ #ifndef CHROME_SERVICES_APP_SERVICE_APP_SERVICE_H_
#define CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_SERVICE_H_ #define CHROME_SERVICES_APP_SERVICE_APP_SERVICE_H_
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "base/macros.h" #include "base/macros.h"
#include "chrome/browser/apps/foundation/app_service/public/mojom/app_registry.mojom.h" #include "chrome/services/app_service/public/mojom/app_registry.mojom.h"
#include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/cpp/service.h" #include "services/service_manager/public/cpp/service.h"
...@@ -55,4 +55,4 @@ class AppService : public service_manager::Service { ...@@ -55,4 +55,4 @@ class AppService : public service_manager::Service {
} // namespace apps } // namespace apps
#endif // CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_SERVICE_H_ #endif // CHROME_SERVICES_APP_SERVICE_APP_SERVICE_H_
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
module apps.mojom; module apps.mojom;
import "chrome/browser/apps/foundation/app_service/public/mojom/types.mojom"; import "chrome/services/app_service/public/mojom/types.mojom";
// The interface through which clients of the App Service can query for data on // The interface through which clients of the App Service can query for data on
// installed apps. // installed apps.
......
...@@ -3245,8 +3245,8 @@ test("unit_tests") { ...@@ -3245,8 +3245,8 @@ test("unit_tests") {
} }
deps += [ deps += [
"//chrome/browser/apps/foundation/app_service:unit_tests",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto", "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
"//chrome/services/app_service:unit_tests",
"//components/signin/core/browser:signin_buildflags", "//components/signin/core/browser:signin_buildflags",
"//services/metrics/public/cpp:ukm_builders", "//services/metrics/public/cpp:ukm_builders",
"//third_party/libaddressinput", "//third_party/libaddressinput",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment