Commit 47675b38 authored by Nigel Tao's avatar Nigel Tao Committed by Commit Bot

Reland "Move the app_service code to //chrome/services"

This is a reland of f3fe6cc9 with
additional changed files:

chrome/browser/chromeos/apps/intent_helper/apps_navigation_throttle.cc
chrome/browser/chromeos/apps/intent_helper/apps_navigation_throttle.h
chrome/browser/chromeos/apps/intent_helper/apps_navigation_types.h
chrome/browser/ui/views/intent_picker_bubble_view.h

to fix some #include lines not being updated for the file renames, which
then required these DEPS changes:

chrome/browser/chromeos/DEPS
chrome/browser/ui/views/DEPS

Original change's description:
> 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/1312435
> Reviewed-by: Dominic Battré <battre@chromium.org>
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Reviewed-by: Ken Rockot <rockot@google.com>
> Reviewed-by: Dominick Ng <dominickn@chromium.org>
> Commit-Queue: Nigel Tao <nigeltao@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#605876}

Change-Id: I27729734618c7e023074b5e420c6350225d0774e
Reviewed-on: https://chromium-review.googlesource.com/c/1321530Reviewed-by: default avatarDominic Battré <battre@chromium.org>
Reviewed-by: default avatarSam McNally <sammc@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606378}
parent ceb8b993
......@@ -484,8 +484,7 @@ service_manifest("chrome_content_browser_manifest_overlay") {
]
}
if (!is_android) {
packaged_services +=
[ "//chrome/browser/apps/foundation/app_service:manifest" ]
packaged_services += [ "//chrome/services/app_service:manifest" ]
}
}
......
......@@ -3058,7 +3058,6 @@ jumbo_split_static_library("browser") {
deps += [
":theme_properties",
"//chrome/app/vector_icons",
"//chrome/browser/apps/foundation/app_service:lib",
"//chrome/browser/policy:path_parser",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
......@@ -3068,6 +3067,7 @@ jumbo_split_static_library("browser") {
"//chrome/browser/resources:component_extension_resources",
"//chrome/browser/search:generated",
"//chrome/common/importer:interfaces",
"//chrome/services/app_service:lib",
"//components/feedback",
"//components/keep_alive_registry",
"//components/vector_icons",
......
benwells@chromium.org
dominickn@chromium.org
......@@ -58,7 +58,6 @@ source_set("chromeos") {
"//cc/paint",
"//chrome/app:command_ids",
"//chrome/app/vector_icons",
"//chrome/browser/apps/foundation/app_service:lib",
"//chrome/browser/apps/platform_apps",
"//chrome/browser/apps/platform_apps/api",
"//chrome/browser/chromeos/android_sms:android_sms_urls",
......@@ -75,6 +74,7 @@ source_set("chromeos") {
"//chrome/common/extensions/api",
"//chrome/common/net",
"//chrome/common/safe_browsing:proto",
"//chrome/services/app_service:lib",
"//chrome/services/diagnosticsd/public/mojom",
"//chrome/services/file_util/public/cpp",
"//chromeos",
......
......@@ -4,6 +4,7 @@ include_rules = [
# crbug.com/728877
"+chrome/browser/ui/views/chrome_layout_provider.h",
"+chrome/services/app_service/public",
"+cros",
"+dbus",
"+device/bluetooth",
......
......@@ -11,7 +11,6 @@
#include "base/feature_list.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/post_task.h"
#include "chrome/browser/apps/foundation/app_service/public/mojom/types.mojom.h"
#include "chrome/browser/chromeos/apps/intent_helper/apps_navigation_types.h"
#include "chrome/browser/chromeos/apps/intent_helper/page_transition_util.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
......@@ -26,6 +25,7 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/common/chrome_features.h"
#include "chrome/services/app_service/public/mojom/types.mojom.h"
#include "components/arc/intent_helper/arc_intent_helper_bridge.h"
#include "components/arc/metrics/arc_metrics_constants.h"
#include "content/public/browser/browser_context.h"
......
......@@ -13,8 +13,8 @@
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/apps/foundation/app_service/public/mojom/types.mojom.h"
#include "chrome/browser/chromeos/apps/intent_helper/apps_navigation_types.h"
#include "chrome/services/app_service/public/mojom/types.mojom.h"
#include "content/public/browser/navigation_throttle.h"
#include "url/gurl.h"
......
......@@ -10,7 +10,7 @@
#include "base/callback_forward.h"
#include "base/macros.h"
#include "chrome/browser/apps/foundation/app_service/public/mojom/types.mojom.h"
#include "chrome/services/app_service/public/mojom/types.mojom.h"
#include "ui/gfx/image/image.h"
namespace chromeos {
......
specific_include_rules = {
"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
# should be used *only* for Identity Service creation.
"+services/identity/identity_service.h",
......
......@@ -185,8 +185,8 @@
#if defined(OS_ANDROID)
#include "chrome/browser/android/download/download_manager_service.h"
#else
#include "chrome/browser/apps/foundation/app_service/app_service.h"
#include "chrome/browser/apps/foundation/app_service/public/mojom/constants.mojom.h"
#include "chrome/services/app_service/app_service.h"
#include "chrome/services/app_service/public/mojom/constants.mojom.h"
#include "components/zoom/zoom_event_manager.h"
#include "content/public/common/page_zoom.h"
#endif
......
......@@ -1222,13 +1222,13 @@ jumbo_split_static_library("ui") {
deps += [
"//chrome/app/vector_icons",
"//chrome/browser:theme_properties",
"//chrome/browser/apps/foundation/app_service/public/mojom",
"//chrome/browser/media/router",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto",
"//chrome/browser/resource_coordinator/tab_ranker",
"//chrome/common:buildflags",
"//chrome/common:search_mojom",
"//chrome/services/app_service/public/mojom",
"//components/feedback/proto",
"//components/keep_alive_registry",
"//components/network_session_configurator/common",
......
include_rules = [
"+chrome/browser/ui/views",
"+chrome/services/app_service/public",
"+mash/common",
"+services/ws/public/cpp",
"+third_party/libaddressinput",
......
......@@ -10,10 +10,10 @@
#include <vector>
#include "base/macros.h"
#include "chrome/browser/apps/foundation/app_service/public/mojom/types.mojom.h"
#include "chrome/browser/chromeos/apps/intent_helper/apps_navigation_types.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
#include "chrome/services/app_service/public/mojom/types.mojom.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/gfx/image/image.h"
#include "ui/views/controls/button/button.h"
......
......@@ -24,7 +24,7 @@ source_set("lib") {
]
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 @@
#include <utility>
#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 "components/pref_registry/pref_registry_syncable.h"
......
......@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_
#define CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_
#ifndef CHROME_SERVICES_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_
#define CHROME_SERVICES_APP_SERVICE_APP_REGISTRY_APP_REGISTRY_H_
#include <memory>
#include <string>
#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"
class PrefRegistrySimple;
......@@ -45,4 +45,4 @@ class AppRegistry : public apps::mojom::AppRegistry {
} // 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 @@
#include "base/bind.h"
#include "base/message_loop/message_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 "testing/gtest/include/gtest/gtest.h"
......
......@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/apps/foundation/app_service/app_registry/app_registry.h"
#include "chrome/browser/apps/foundation/app_service/app_service.h"
#include "chrome/services/app_service/app_registry/app_registry.h"
#include "chrome/services/app_service/app_service.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "services/preferences/public/cpp/pref_service_factory.h"
......
......@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_SERVICE_H_
#define CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_SERVICE_H_
#ifndef CHROME_SERVICES_APP_SERVICE_APP_SERVICE_H_
#define CHROME_SERVICES_APP_SERVICE_APP_SERVICE_H_
#include <memory>
#include <vector>
#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/service.h"
......@@ -55,4 +55,4 @@ class AppService : public service_manager::Service {
} // namespace apps
#endif // CHROME_BROWSER_APPS_FOUNDATION_APP_SERVICE_APP_SERVICE_H_
#endif // CHROME_SERVICES_APP_SERVICE_APP_SERVICE_H_
......@@ -4,7 +4,7 @@
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
// installed apps.
......
......@@ -3242,8 +3242,8 @@ test("unit_tests") {
}
deps += [
"//chrome/browser/apps/foundation/app_service:unit_tests",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto",
"//chrome/services/app_service:unit_tests",
"//components/signin/core/browser:signin_buildflags",
"//services/metrics/public/cpp:ukm_builders",
"//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