Commit 881e0822 authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

Move services/public/catalog/{interfaces => mojom}

TBR=dcheng@chromium.org
TBR=jam@chromium.org

Bug: 806965
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ifb8c81ad55ebef52a93cff1f85a1d6e125fd4224
Reviewed-on: https://chromium-review.googlesource.com/912313
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535953}
parent 4c0f91d8
...@@ -119,7 +119,7 @@ jumbo_source_set("browser") { ...@@ -119,7 +119,7 @@ jumbo_source_set("browser") {
"//printing/features", "//printing/features",
"//services/catalog:constants", "//services/catalog:constants",
"//services/catalog/public/cpp", "//services/catalog/public/cpp",
"//services/catalog/public/interfaces:constants", "//services/catalog/public/mojom:constants",
"//services/data_decoder/public/cpp", "//services/data_decoder/public/cpp",
"//services/data_decoder/public/mojom", "//services/data_decoder/public/mojom",
"//services/device:lib", "//services/device:lib",
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include "mojo/edk/embedder/incoming_broker_client_invitation.h" #include "mojo/edk/embedder/incoming_broker_client_invitation.h"
#include "services/catalog/manifest_provider.h" #include "services/catalog/manifest_provider.h"
#include "services/catalog/public/cpp/manifest_parsing_util.h" #include "services/catalog/public/cpp/manifest_parsing_util.h"
#include "services/catalog/public/interfaces/constants.mojom.h" #include "services/catalog/public/mojom/constants.mojom.h"
#include "services/data_decoder/public/mojom/constants.mojom.h" #include "services/data_decoder/public/mojom/constants.mojom.h"
#include "services/device/device_service.h" #include "services/device/device_service.h"
#include "services/device/public/interfaces/constants.mojom.h" #include "services/device/public/interfaces/constants.mojom.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "ios/web/service_manager_connection_impl.h" #include "ios/web/service_manager_connection_impl.h"
#include "services/catalog/manifest_provider.h" #include "services/catalog/manifest_provider.h"
#include "services/catalog/public/cpp/manifest_parsing_util.h" #include "services/catalog/public/cpp/manifest_parsing_util.h"
#include "services/catalog/public/interfaces/constants.mojom.h" #include "services/catalog/public/mojom/constants.mojom.h"
#include "services/service_manager/connect_params.h" #include "services/service_manager/connect_params.h"
#include "services/service_manager/embedder/manifest_utils.h" #include "services/service_manager/embedder/manifest_utils.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
......
...@@ -17,7 +17,7 @@ source_set("lib") { ...@@ -17,7 +17,7 @@ source_set("lib") {
"//base", "//base",
"//mash/public/interfaces", "//mash/public/interfaces",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//services/catalog/public/interfaces", "//services/catalog/public/mojom",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/service_manager/public/mojom", "//services/service_manager/public/mojom",
"//ui/resources", "//ui/resources",
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
#include "services/catalog/public/interfaces/catalog.mojom.h" #include "services/catalog/public/mojom/catalog.mojom.h"
#include "services/catalog/public/interfaces/constants.mojom.h" #include "services/catalog/public/mojom/constants.mojom.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service_context.h" #include "services/service_manager/public/cpp/service_context.h"
#include "ui/base/models/table_model.h" #include "ui/base/models/table_model.h"
......
...@@ -18,7 +18,7 @@ source_set("lib") { ...@@ -18,7 +18,7 @@ source_set("lib") {
"//base", "//base",
"//mash/public/interfaces", "//mash/public/interfaces",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//services/catalog/public/interfaces", "//services/catalog/public/mojom",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/service_manager/public/mojom", "//services/service_manager/public/mojom",
"//ui/views", "//ui/views",
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "mash/public/interfaces/launchable.mojom.h" #include "mash/public/interfaces/launchable.mojom.h"
#include "services/catalog/public/interfaces/catalog.mojom.h" #include "services/catalog/public/mojom/catalog.mojom.h"
#include "services/catalog/public/interfaces/constants.mojom.h" #include "services/catalog/public/mojom/constants.mojom.h"
#include "services/service_manager/public/c/main.h" #include "services/service_manager/public/c/main.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service.h" #include "services/service_manager/public/cpp/service.h"
......
...@@ -17,7 +17,7 @@ source_set("lib") { ...@@ -17,7 +17,7 @@ source_set("lib") {
"//base", "//base",
"//mash/public/interfaces", "//mash/public/interfaces",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//services/catalog/public/interfaces", "//services/catalog/public/mojom",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/service_manager/public/mojom", "//services/service_manager/public/mojom",
"//ui/resources", "//ui/resources",
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
#include "services/catalog/public/interfaces/catalog.mojom.h" #include "services/catalog/public/mojom/catalog.mojom.h"
#include "services/catalog/public/interfaces/constants.mojom.h" #include "services/catalog/public/mojom/constants.mojom.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service_context.h" #include "services/service_manager/public/cpp/service_context.h"
#include "services/service_manager/public/mojom/constants.mojom.h" #include "services/service_manager/public/mojom/constants.mojom.h"
......
...@@ -40,7 +40,7 @@ source_set("lib") { ...@@ -40,7 +40,7 @@ source_set("lib") {
"//base", "//base",
"//components/filesystem:lib", "//components/filesystem:lib",
"//services/catalog/public/cpp", "//services/catalog/public/cpp",
"//services/catalog/public/interfaces", "//services/catalog/public/mojom",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
] ]
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "mojo/public/cpp/bindings/binding.h" #include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/binding_set.h"
#include "services/catalog/entry_cache.h" #include "services/catalog/entry_cache.h"
#include "services/catalog/public/interfaces/catalog.mojom.h" #include "services/catalog/public/mojom/catalog.mojom.h"
#include "services/service_manager/public/cpp/service.h" #include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/public/mojom/service.mojom.h" #include "services/service_manager/public/mojom/service.mojom.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/macros.h" #include "base/macros.h"
#include "services/catalog/public/interfaces/catalog.mojom.h" #include "services/catalog/public/mojom/catalog.mojom.h"
#include "services/service_manager/public/cpp/interface_provider_spec.h" #include "services/service_manager/public/cpp/interface_provider_spec.h"
namespace base { namespace base {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/values.h" #include "base/values.h"
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/binding_set.h"
#include "services/catalog/entry.h" #include "services/catalog/entry.h"
#include "services/catalog/public/interfaces/catalog.mojom.h" #include "services/catalog/public/mojom/catalog.mojom.h"
#include "services/catalog/store.h" #include "services/catalog/store.h"
namespace catalog { namespace catalog {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni") import("//mojo/public/tools/bindings/mojom.gni")
mojom("interfaces") { mojom("mojom") {
sources = [ sources = [
"catalog.mojom", "catalog.mojom",
] ]
......
...@@ -45,7 +45,7 @@ source_set("service_manager") { ...@@ -45,7 +45,7 @@ source_set("service_manager") {
"//base", "//base",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//services/catalog:lib", "//services/catalog:lib",
"//services/catalog/public/interfaces:constants", "//services/catalog/public/mojom:constants",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/service_manager/public/mojom", "//services/service_manager/public/mojom",
"//services/service_manager/runner/host:lib", "//services/service_manager/runner/host:lib",
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/catalog/entry.h" #include "services/catalog/entry.h"
#include "services/catalog/instance.h" #include "services/catalog/instance.h"
#include "services/catalog/public/interfaces/constants.mojom.h" #include "services/catalog/public/mojom/constants.mojom.h"
#include "services/service_manager/connect_util.h" #include "services/service_manager/connect_util.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service.h" #include "services/service_manager/public/cpp/service.h"
......
...@@ -58,7 +58,7 @@ source_set("lib") { ...@@ -58,7 +58,7 @@ source_set("lib") {
"//components/viz/service", "//components/viz/service",
"//mojo/common:common_base", "//mojo/common:common_base",
"//services/catalog/public/cpp", "//services/catalog/public/cpp",
"//services/catalog/public/interfaces:constants", "//services/catalog/public/mojom:constants",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/ui/clipboard:lib", "//services/ui/clipboard:lib",
"//services/ui/ime:lib", "//services/ui/ime:lib",
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "components/discardable_memory/service/discardable_shared_memory_manager.h" #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/catalog/public/cpp/resource_loader.h" #include "services/catalog/public/cpp/resource_loader.h"
#include "services/catalog/public/interfaces/constants.mojom.h" #include "services/catalog/public/mojom/constants.mojom.h"
#include "services/service_manager/public/c/main.h" #include "services/service_manager/public/c/main.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service_context.h" #include "services/service_manager/public/cpp/service_context.h"
......
...@@ -53,7 +53,7 @@ jumbo_component("mus") { ...@@ -53,7 +53,7 @@ jumbo_component("mus") {
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//net", "//net",
"//services/catalog/public/cpp", "//services/catalog/public/cpp",
"//services/catalog/public/interfaces:constants", "//services/catalog/public/mojom:constants",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
"//services/service_manager/public/mojom", "//services/service_manager/public/mojom",
"//services/ui/public/cpp", "//services/ui/public/cpp",
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "base/path_service.h" #include "base/path_service.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "services/catalog/public/cpp/resource_loader.h" #include "services/catalog/public/cpp/resource_loader.h"
#include "services/catalog/public/interfaces/constants.mojom.h" #include "services/catalog/public/mojom/constants.mojom.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
#include "ui/aura/env.h" #include "ui/aura/env.h"
#include "ui/base/ime/input_method_initializer.h" #include "ui/base/ime/input_method_initializer.h"
......
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