Move //mojo/services/X/public/... to //mojo/services/X/... (part 3).
X = navigation,
nfc,
notifications,
ozone_drm_gpu,
ozone_drm_host,
prediction,
sensors,
service_registry,
sharing,
speech_recognizer,
surfaces,
terminal,
tracing,
url_response_disk_cache
(Skipped network.)
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1394303004 .
diff --git a/apps/benchmark/BUILD.gn b/apps/benchmark/BUILD.gn
index 5bb84bb..220f763 100644
--- a/apps/benchmark/BUILD.gn
+++ b/apps/benchmark/BUILD.gn
@@ -22,7 +22,7 @@
]
public_deps = [
- "//mojo/services/tracing/public/interfaces",
+ "//mojo/services/tracing/interfaces",
]
}
diff --git a/apps/benchmark/README.md b/apps/benchmark/README.md
index 8380939..8f84f22 100644
--- a/apps/benchmark/README.md
+++ b/apps/benchmark/README.md
@@ -4,7 +4,7 @@
indicated period of time and computes a number of results based on the collected
traces. It can be used to measure performance of a mojo app, provided that the
app being benchmarked participates in the [tracing
-ecosystem](../../mojo/services/tracing/public/interfaces/tracing.mojom).
+ecosystem](../../mojo/services/tracing/interfaces/tracing.mojom).
## Arguments
diff --git a/apps/benchmark/benchmark_app.cc b/apps/benchmark/benchmark_app.cc
index bd7c8a9..bfdc299 100644
--- a/apps/benchmark/benchmark_app.cc
+++ b/apps/benchmark/benchmark_app.cc
@@ -24,7 +24,7 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
namespace benchmark {
namespace {
diff --git a/apps/benchmark/trace_collector_client.h b/apps/benchmark/trace_collector_client.h
index 3e5ba37..6c9bedb 100644
--- a/apps/benchmark/trace_collector_client.h
+++ b/apps/benchmark/trace_collector_client.h
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/data_pipe_utils/data_pipe_drainer.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
// Connects to trace collector in tracing.mojo to get traces and returns the
// results as a single string to the receiver.
diff --git a/apps/moterm/BUILD.gn b/apps/moterm/BUILD.gn
index efbe760..67c6479 100644
--- a/apps/moterm/BUILD.gn
+++ b/apps/moterm/BUILD.gn
@@ -24,8 +24,8 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/bindings:callback",
"//mojo/services/files/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
- "//mojo/services/terminal/public/interfaces",
+ "//mojo/services/surfaces/interfaces:surface_id",
+ "//mojo/services/terminal/interfaces",
"//mojo/services/view_manager/public/cpp",
"//skia",
"//third_party/dejavu-fonts-ttf-2.34:DejaVuSansMonoRegular",
@@ -44,7 +44,7 @@
"//mojo/services/geometry/interfaces",
"//mojo/services/gpu/interfaces",
"//mojo/services/native_viewport/interfaces",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/interfaces",
]
}
@@ -72,13 +72,13 @@
"//mojo/public/c/gpu",
"//mojo/public/interfaces/application",
"//mojo/services/gpu/interfaces",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/interfaces",
]
forward_dependent_configs_from = [
"//mojo/public/c/gpu",
"//mojo/services/gpu/interfaces",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/interfaces",
]
public_deps = [
@@ -86,8 +86,8 @@
"//mojo/public/c/gpu:GLES2",
"//mojo/services/geometry/cpp",
"//mojo/services/geometry/interfaces",
- "//mojo/services/surfaces/public/cpp",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/cpp",
+ "//mojo/services/surfaces/interfaces:surface_id",
]
}
diff --git a/apps/moterm/README.md b/apps/moterm/README.md
index 451f0dd..207ce12 100644
--- a/apps/moterm/README.md
+++ b/apps/moterm/README.md
@@ -24,4 +24,4 @@
* [//examples/moterm_example_app](../../examples/moterm_example_app)
* [//mojo/services/files/interfaces](../../mojo/services/files/interfaces)
-* [//mojo/services/terminal/public/interfaces](../../mojo/services/terminal/public/interfaces)
+* [//mojo/services/terminal/interfaces](../../mojo/services/terminal/interfaces)
diff --git a/apps/moterm/gl_helper.cc b/apps/moterm/gl_helper.cc
index 3ddb5d5..f1e2cb2 100644
--- a/apps/moterm/gl_helper.cc
+++ b/apps/moterm/gl_helper.cc
@@ -19,7 +19,7 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
#include "mojo/services/geometry/cpp/geometry_util.h"
-#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
+#include "mojo/services/surfaces/cpp/surfaces_utils.h"
// Maximum number of (live) textures to keep around.
const size_t kMaxTextures = 10;
diff --git a/apps/moterm/gl_helper.h b/apps/moterm/gl_helper.h
index 8898afc..a181815 100644
--- a/apps/moterm/gl_helper.h
+++ b/apps/moterm/gl_helper.h
@@ -16,8 +16,8 @@
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/services/geometry/interfaces/geometry.mojom.h"
#include "mojo/services/gpu/interfaces/gpu.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace mojo {
class Shell;
diff --git a/apps/moterm/gl_helper_test_app.cc b/apps/moterm/gl_helper_test_app.cc
index fdabb4f..7147f6d 100644
--- a/apps/moterm/gl_helper_test_app.cc
+++ b/apps/moterm/gl_helper_test_app.cc
@@ -19,9 +19,9 @@
#include "mojo/services/geometry/interfaces/geometry.mojom.h"
#include "mojo/services/gpu/interfaces/context_provider.mojom.h"
#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/interfaces/quads.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace {
diff --git a/apps/moterm/gl_helper_unittest.cc b/apps/moterm/gl_helper_unittest.cc
index f6a2c12..409aab6 100644
--- a/apps/moterm/gl_helper_unittest.cc
+++ b/apps/moterm/gl_helper_unittest.cc
@@ -15,7 +15,7 @@
#include "base/message_loop/message_loop.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/apps/moterm/moterm_view.cc b/apps/moterm/moterm_view.cc
index c4d0a84..838b817 100644
--- a/apps/moterm/moterm_view.cc
+++ b/apps/moterm/moterm_view.cc
@@ -21,7 +21,7 @@
#include "mojo/services/files/interfaces/types.mojom.h"
#include "mojo/services/input_events/interfaces/input_event_constants.mojom.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
-#include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
+#include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
#include "skia/ext/refptr.h"
#include "third_party/dejavu-fonts-ttf-2.34/kDejaVuSansMonoRegular.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/apps/moterm/moterm_view.h b/apps/moterm/moterm_view.h
index 70477cd..01f5d00 100644
--- a/apps/moterm/moterm_view.h
+++ b/apps/moterm/moterm_view.h
@@ -15,8 +15,8 @@
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/terminal/public/interfaces/terminal.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/terminal/interfaces/terminal.mojom.h"
#include "mojo/services/view_manager/public/cpp/view_observer.h"
#include "skia/ext/refptr.h"
#include "third_party/skia/include/core/SkBitmapDevice.h"
diff --git a/examples/bitmap_uploader/BUILD.gn b/examples/bitmap_uploader/BUILD.gn
index 401a9d7..af13601 100644
--- a/examples/bitmap_uploader/BUILD.gn
+++ b/examples/bitmap_uploader/BUILD.gn
@@ -12,7 +12,7 @@
"//base",
"//mojo/public/c/gpu",
"//mojo/services/gpu/interfaces",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/interfaces",
]
deps = [
"//mojo/application",
@@ -21,8 +21,8 @@
"//mojo/services/geometry/cpp",
"//mojo/services/geometry/interfaces",
"//mojo/services/input_events/interfaces",
- "//mojo/services/surfaces/public/cpp",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/cpp",
+ "//mojo/services/surfaces/interfaces:surface_id",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/interfaces",
"//ui/gfx/geometry",
diff --git a/examples/bitmap_uploader/bitmap_uploader.cc b/examples/bitmap_uploader/bitmap_uploader.cc
index bce95bb..066ec51 100644
--- a/examples/bitmap_uploader/bitmap_uploader.cc
+++ b/examples/bitmap_uploader/bitmap_uploader.cc
@@ -16,7 +16,7 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
#include "mojo/services/geometry/cpp/geometry_util.h"
-#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
+#include "mojo/services/surfaces/cpp/surfaces_utils.h"
#include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/examples/bitmap_uploader/bitmap_uploader.h b/examples/bitmap_uploader/bitmap_uploader.h
index 49030e3..e07791a 100644
--- a/examples/bitmap_uploader/bitmap_uploader.h
+++ b/examples/bitmap_uploader/bitmap_uploader.h
@@ -13,8 +13,8 @@
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/services/geometry/interfaces/geometry.mojom.h"
#include "mojo/services/gpu/interfaces/gpu.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace mojo {
class Shell;
diff --git a/examples/browser/BUILD.gn b/examples/browser/BUILD.gn
index 41fbb39..eae50f0 100644
--- a/examples/browser/BUILD.gn
+++ b/examples/browser/BUILD.gn
@@ -18,7 +18,7 @@
"//mojo/application",
"//mojo/converters/geometry",
"//mojo/services/geometry/interfaces",
- "//mojo/services/navigation/public/interfaces",
+ "//mojo/services/navigation/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/interfaces",
"//third_party/icu",
diff --git a/examples/browser/browser.cc b/examples/browser/browser.cc
index 32f19ff..89e6baa 100644
--- a/examples/browser/browser.cc
+++ b/examples/browser/browser.cc
@@ -15,7 +15,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
+#include "mojo/services/navigation/interfaces/navigation.mojom.h"
#include "mojo/services/view_manager/public/cpp/view.h"
#include "mojo/services/view_manager/public/cpp/view_manager.h"
#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
diff --git a/examples/echo_terminal/BUILD.gn b/examples/echo_terminal/BUILD.gn
index 0da27dd..50fee16 100644
--- a/examples/echo_terminal/BUILD.gn
+++ b/examples/echo_terminal/BUILD.gn
@@ -11,7 +11,7 @@
"//mojo/common",
"//mojo/public/cpp/application",
"//mojo/public/cpp/system",
- "//mojo/services/terminal/public/interfaces",
+ "//mojo/services/terminal/interfaces",
]
sources = [
diff --git a/examples/echo_terminal/main.cc b/examples/echo_terminal/main.cc
index 6c5fefb..ef6b40e 100644
--- a/examples/echo_terminal/main.cc
+++ b/examples/echo_terminal/main.cc
@@ -14,7 +14,7 @@
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/services/files/interfaces/file.mojom.h"
#include "mojo/services/files/interfaces/types.mojom.h"
-#include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
+#include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
const uint32_t kMaxBytesToRead = 1000;
diff --git a/examples/embedded_app/BUILD.gn b/examples/embedded_app/BUILD.gn
index bd06a5b..388b227 100644
--- a/examples/embedded_app/BUILD.gn
+++ b/examples/embedded_app/BUILD.gn
@@ -16,7 +16,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
"//mojo/services/geometry/interfaces",
- "//mojo/services/navigation/public/interfaces",
+ "//mojo/services/navigation/interfaces",
"//mojo/services/view_manager/public/cpp",
"//skia:skia",
"//url",
diff --git a/examples/embedded_app/embedded_app.cc b/examples/embedded_app/embedded_app.cc
index 2554a0e..1b0f4f0 100644
--- a/examples/embedded_app/embedded_app.cc
+++ b/examples/embedded_app/embedded_app.cc
@@ -15,7 +15,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
+#include "mojo/services/navigation/interfaces/navigation.mojom.h"
#include "mojo/services/view_manager/public/cpp/view.h"
#include "mojo/services/view_manager/public/cpp/view_manager.h"
#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
diff --git a/examples/ganesh_app/BUILD.gn b/examples/ganesh_app/BUILD.gn
index 13b6cf9..956eefd 100644
--- a/examples/ganesh_app/BUILD.gn
+++ b/examples/ganesh_app/BUILD.gn
@@ -25,9 +25,9 @@
"//mojo/public/interfaces/application",
"//mojo/services/geometry/cpp",
"//mojo/services/geometry/interfaces",
- "//mojo/services/surfaces/public/cpp",
- "//mojo/services/surfaces/public/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/cpp",
+ "//mojo/services/surfaces/interfaces",
+ "//mojo/services/surfaces/interfaces:surface_id",
"//mojo/services/view_manager/public/cpp",
"//mojo/skia",
"//skia",
diff --git a/examples/ganesh_app/ganesh_view.h b/examples/ganesh_app/ganesh_view.h
index 8d8ff12..c95b497 100644
--- a/examples/ganesh_app/ganesh_view.h
+++ b/examples/ganesh_app/ganesh_view.h
@@ -7,7 +7,7 @@
#include "examples/ganesh_app/texture_uploader.h"
#include "mojo/gpu/gl_context.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
#include "mojo/services/view_manager/public/cpp/view_observer.h"
#include "mojo/skia/ganesh_context.h"
diff --git a/examples/ganesh_app/texture_uploader.cc b/examples/ganesh_app/texture_uploader.cc
index a43a564..9639460 100644
--- a/examples/ganesh_app/texture_uploader.cc
+++ b/examples/ganesh_app/texture_uploader.cc
@@ -16,7 +16,7 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
#include "mojo/services/geometry/cpp/geometry_util.h"
-#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
+#include "mojo/services/surfaces/cpp/surfaces_utils.h"
namespace examples {
diff --git a/examples/ganesh_app/texture_uploader.h b/examples/ganesh_app/texture_uploader.h
index 086c60c..2b449e5 100644
--- a/examples/ganesh_app/texture_uploader.h
+++ b/examples/ganesh_app/texture_uploader.h
@@ -12,8 +12,8 @@
#include "mojo/gpu/gl_texture.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/services/geometry/interfaces/geometry.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace mojo {
class Shell;
diff --git a/examples/js/repl.js b/examples/js/repl.js
index ad99744..759daa7 100644
--- a/examples/js/repl.js
+++ b/examples/js/repl.js
@@ -28,7 +28,7 @@
define("main", [
"mojo/services/public/js/application",
"mojo/services/files/interfaces/types.mojom",
- "mojo/services/terminal/public/interfaces/terminal_client.mojom",
+ "mojo/services/terminal/interfaces/terminal_client.mojom",
], function(application, files_types, terminal_client) {
const Application = application.Application;
const TerminalClient = terminal_client.TerminalClient;
diff --git a/examples/keyboard_client/BUILD.gn b/examples/keyboard_client/BUILD.gn
index 289c2ad..4cd2dd8 100644
--- a/examples/keyboard_client/BUILD.gn
+++ b/examples/keyboard_client/BUILD.gn
@@ -17,9 +17,9 @@
"//mojo/services/geometry/cpp",
"//mojo/services/geometry/interfaces:interfaces__generator",
"//mojo/services/keyboard/interfaces",
- "//mojo/services/surfaces/public/cpp",
- "//mojo/services/surfaces/public/interfaces:interfaces_cpp_sources",
- "//mojo/services/surfaces/public/interfaces:surface_id_cpp_sources",
+ "//mojo/services/surfaces/cpp",
+ "//mojo/services/surfaces/interfaces:interfaces_cpp_sources",
+ "//mojo/services/surfaces/interfaces:surface_id_cpp_sources",
"//mojo/services/view_manager/public/cpp",
"//mojo/skia:skia",
"//skia",
diff --git a/examples/moterm_example_app/BUILD.gn b/examples/moterm_example_app/BUILD.gn
index 72c9674..3a01292 100644
--- a/examples/moterm_example_app/BUILD.gn
+++ b/examples/moterm_example_app/BUILD.gn
@@ -18,7 +18,7 @@
"//mojo/public/interfaces/application",
"//mojo/services/files/interfaces",
"//mojo/services/geometry/interfaces",
+ "//mojo/services/terminal/interfaces",
"//mojo/services/view_manager/public/cpp",
- "//mojo/services/terminal/public/interfaces",
]
}
diff --git a/examples/moterm_example_app/moterm_example_app.cc b/examples/moterm_example_app/moterm_example_app.cc
index 014da8f..25379ad 100644
--- a/examples/moterm_example_app/moterm_example_app.cc
+++ b/examples/moterm_example_app/moterm_example_app.cc
@@ -25,8 +25,8 @@
#include "mojo/public/interfaces/application/shell.mojom.h"
#include "mojo/services/files/interfaces/file.mojom.h"
#include "mojo/services/files/interfaces/types.mojom.h"
-#include "mojo/services/terminal/public/interfaces/terminal.mojom.h"
-#include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
+#include "mojo/services/terminal/interfaces/terminal.mojom.h"
+#include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
#include "mojo/services/view_manager/public/cpp/view.h"
#include "mojo/services/view_manager/public/cpp/view_manager.h"
#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
diff --git a/examples/native_run_app/BUILD.gn b/examples/native_run_app/BUILD.gn
index 38d5e48..b710b36 100644
--- a/examples/native_run_app/BUILD.gn
+++ b/examples/native_run_app/BUILD.gn
@@ -16,6 +16,6 @@
"//mojo/public/interfaces/application",
"//mojo/services/files/interfaces",
"//mojo/services/native_support/interfaces",
- "//mojo/services/terminal/public/interfaces",
+ "//mojo/services/terminal/interfaces",
]
}
diff --git a/examples/native_run_app/native_run_app.cc b/examples/native_run_app/native_run_app.cc
index 96abace..b6f4db0 100644
--- a/examples/native_run_app/native_run_app.cc
+++ b/examples/native_run_app/native_run_app.cc
@@ -34,7 +34,7 @@
#include "mojo/services/files/interfaces/ioctl_terminal.mojom.h"
#include "mojo/services/files/interfaces/types.mojom.h"
#include "mojo/services/native_support/interfaces/process.mojom.h"
-#include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
+#include "mojo/services/terminal/interfaces/terminal_client.mojom.h"
using mojo::terminal::TerminalClient;
diff --git a/examples/nesting_app/BUILD.gn b/examples/nesting_app/BUILD.gn
index 908d6fd..57e2125 100644
--- a/examples/nesting_app/BUILD.gn
+++ b/examples/nesting_app/BUILD.gn
@@ -17,7 +17,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
"//mojo/services/geometry/interfaces",
- "//mojo/services/navigation/public/interfaces",
+ "//mojo/services/navigation/interfaces",
"//mojo/services/view_manager/public/cpp",
"//skia",
"//url",
diff --git a/examples/nfc_sender/BUILD.gn b/examples/nfc_sender/BUILD.gn
index e5cae78..503eb75 100644
--- a/examples/nfc_sender/BUILD.gn
+++ b/examples/nfc_sender/BUILD.gn
@@ -16,7 +16,7 @@
"//mojo/common",
"//mojo/public/interfaces/application:application__generator",
"//mojo/services/geometry/interfaces",
- "//mojo/services/nfc/public/interfaces",
+ "//mojo/services/nfc/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/skia",
"//skia",
diff --git a/examples/nfc_sender/nfc_sender.cc b/examples/nfc_sender/nfc_sender.cc
index cb70535..55519b8 100644
--- a/examples/nfc_sender/nfc_sender.cc
+++ b/examples/nfc_sender/nfc_sender.cc
@@ -13,7 +13,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/connect.h"
-#include "mojo/services/nfc/public/interfaces/nfc.mojom.h"
+#include "mojo/services/nfc/interfaces/nfc.mojom.h"
#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
#include "mojo/services/view_manager/public/cpp/view_observer.h"
diff --git a/examples/notification_generator/BUILD.gn b/examples/notification_generator/BUILD.gn
index 292e026..27ec454 100644
--- a/examples/notification_generator/BUILD.gn
+++ b/examples/notification_generator/BUILD.gn
@@ -14,6 +14,6 @@
"//mojo/application",
"//mojo/common",
"//mojo/public/interfaces/application:application__generator",
- "//mojo/services/notifications/public/interfaces",
+ "//mojo/services/notifications/interfaces",
]
}
diff --git a/examples/notification_generator/notification_generator.cc b/examples/notification_generator/notification_generator.cc
index 11d2556..0d7f755 100644
--- a/examples/notification_generator/notification_generator.cc
+++ b/examples/notification_generator/notification_generator.cc
@@ -9,7 +9,7 @@
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/notifications/public/interfaces/notifications.mojom.h"
+#include "mojo/services/notifications/interfaces/notifications.mojom.h"
namespace examples {
diff --git a/examples/surfaces_app/BUILD.gn b/examples/surfaces_app/BUILD.gn
index 6a8e8a0..25a0b86 100644
--- a/examples/surfaces_app/BUILD.gn
+++ b/examples/surfaces_app/BUILD.gn
@@ -35,7 +35,7 @@
"//mojo/services/geometry/interfaces",
"//mojo/services/gpu/interfaces",
"//mojo/services/native_viewport/interfaces",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/interfaces",
]
sources = [
@@ -62,8 +62,8 @@
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
"//mojo/services/geometry/interfaces",
- "//mojo/services/surfaces/public/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/interfaces",
+ "//mojo/services/surfaces/interfaces:surface_id",
"//skia",
"//ui/gfx",
"//ui/gfx/geometry",
@@ -99,8 +99,8 @@
"//mojo/public/cpp/system",
"//mojo/services/geometry/interfaces",
"//mojo/services/gpu/interfaces",
- "//mojo/services/surfaces/public/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/interfaces",
+ "//mojo/services/surfaces/interfaces:surface_id",
"//skia",
"//ui/gfx",
"//ui/gfx/geometry",
@@ -130,8 +130,8 @@
mojom("bindings") {
deps = [
"//mojo/services/geometry/interfaces",
- "//mojo/services/surfaces/public/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/interfaces",
+ "//mojo/services/surfaces/interfaces:surface_id",
]
import_dirs = [ get_path_info("../../mojo/services", "abspath") ]
diff --git a/examples/surfaces_app/child.mojom b/examples/surfaces_app/child.mojom
index 18bf281..1a387cb 100644
--- a/examples/surfaces_app/child.mojom
+++ b/examples/surfaces_app/child.mojom
@@ -3,8 +3,8 @@
// found in the LICENSE file.
import "mojo/services/geometry/interfaces/geometry.mojom";
-import "mojo/services/surfaces/public/interfaces/quads.mojom";
-import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
+import "mojo/services/surfaces/interfaces/quads.mojom";
+import "mojo/services/surfaces/interfaces/surface_id.mojom";
interface Child {
ProduceFrame(mojo.Color color, mojo.Size size) =>
diff --git a/examples/surfaces_app/child_gl_impl.cc b/examples/surfaces_app/child_gl_impl.cc
index 9373957..c1ec508 100644
--- a/examples/surfaces_app/child_gl_impl.cc
+++ b/examples/surfaces_app/child_gl_impl.cc
@@ -25,8 +25,8 @@
#include "mojo/converters/surfaces/surfaces_type_converters.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/environment/environment.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/transform.h"
diff --git a/examples/surfaces_app/child_gl_impl.h b/examples/surfaces_app/child_gl_impl.h
index 081ad6f..752d227 100644
--- a/examples/surfaces_app/child_gl_impl.h
+++ b/examples/surfaces_app/child_gl_impl.h
@@ -17,8 +17,8 @@
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/size.h"
diff --git a/examples/surfaces_app/child_impl.cc b/examples/surfaces_app/child_impl.cc
index e4e35f0..e3f3611 100644
--- a/examples/surfaces_app/child_impl.cc
+++ b/examples/surfaces_app/child_impl.cc
@@ -13,8 +13,8 @@
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/transform.h"
diff --git a/examples/surfaces_app/child_impl.h b/examples/surfaces_app/child_impl.h
index 9b09eb0..c5c30f3 100644
--- a/examples/surfaces_app/child_impl.h
+++ b/examples/surfaces_app/child_impl.h
@@ -13,8 +13,8 @@
#include "examples/surfaces_app/child.mojom.h"
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/size.h"
diff --git a/examples/surfaces_app/embedder.cc b/examples/surfaces_app/embedder.cc
index 964a3bc..aaa13bc 100644
--- a/examples/surfaces_app/embedder.cc
+++ b/examples/surfaces_app/embedder.cc
@@ -11,7 +11,7 @@
#include "cc/quads/surface_draw_quad.h"
#include "examples/surfaces_app/surfaces_util.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
#include "ui/gfx/transform.h"
diff --git a/examples/surfaces_app/embedder.h b/examples/surfaces_app/embedder.h
index b4ceb59..bf5c0ed 100644
--- a/examples/surfaces_app/embedder.h
+++ b/examples/surfaces_app/embedder.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "cc/surfaces/surface_id.h"
-#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/interfaces/display.mojom.h"
#include "ui/gfx/size.h"
namespace mojo {
diff --git a/examples/surfaces_app/surfaces_app.cc b/examples/surfaces_app/surfaces_app.cc
index 7e4ae37..8d413ae 100644
--- a/examples/surfaces_app/surfaces_app.cc
+++ b/examples/surfaces_app/surfaces_app.cc
@@ -20,8 +20,8 @@
#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
#include "mojo/services/gpu/interfaces/gpu.mojom.h"
#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
#include "ui/gfx/rect.h"
namespace mojo {
diff --git a/examples/window_manager/BUILD.gn b/examples/window_manager/BUILD.gn
index 33982c5..a093f25 100644
--- a/examples/window_manager/BUILD.gn
+++ b/examples/window_manager/BUILD.gn
@@ -24,7 +24,7 @@
"//mojo/public/cpp/utility",
"//mojo/services/geometry/interfaces",
"//mojo/services/input_events/interfaces",
- "//mojo/services/navigation/public/interfaces",
+ "//mojo/services/navigation/interfaces",
"//mojo/services/view_manager/public/cpp",
"//services/window_manager:lib",
"//ui/events:events",
@@ -40,7 +40,7 @@
import_dirs = [ get_path_info("../../mojo/services", "abspath") ]
deps = [
"//mojo/services/geometry/interfaces",
- "//mojo/services/navigation/public/interfaces",
+ "//mojo/services/navigation/interfaces",
"//mojo/services/network/public/interfaces",
]
}
diff --git a/examples/window_manager/debug_panel.sky b/examples/window_manager/debug_panel.sky
index 3d172e5..4eb6eeb 100644
--- a/examples/window_manager/debug_panel.sky
+++ b/examples/window_manager/debug_panel.sky
@@ -7,7 +7,7 @@
<sky>
<import src="/gen/examples/window_manager/debug_panel_host.mojom.sky" as="example" />
-<import src="/mojo/services/navigation/public/interfaces/navigation.mojom.sky" as="navigation" />
+<import src="/mojo/services/navigation/interfaces/navigation.mojom.sky" as="navigation" />
<import src="/sky/framework/embedder.sky" as="embedder" />
<import src="/sky/framework/sky-box.sky" as="SkyBox" />
diff --git a/examples/window_manager/debug_panel_host.mojom b/examples/window_manager/debug_panel_host.mojom
index 00c1749..68073c8 100644
--- a/examples/window_manager/debug_panel_host.mojom
+++ b/examples/window_manager/debug_panel_host.mojom
@@ -4,7 +4,7 @@
module mojo.examples;
-import "mojo/services/navigation/public/interfaces/navigation.mojom";
+import "mojo/services/navigation/interfaces/navigation.mojom";
interface DebugPanelHost {
// Closes the top.
diff --git a/examples/window_manager/window_manager.cc b/examples/window_manager/window_manager.cc
index f9fcfd7..2d1564c 100644
--- a/examples/window_manager/window_manager.cc
+++ b/examples/window_manager/window_manager.cc
@@ -17,7 +17,7 @@
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
-#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
+#include "mojo/services/navigation/interfaces/navigation.mojom.h"
#include "mojo/services/view_manager/public/cpp/view.h"
#include "mojo/services/view_manager/public/cpp/view_manager.h"
#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
index 2420060..cdc4b64 100644
--- a/mojo/common/BUILD.gn
+++ b/mojo/common/BUILD.gn
@@ -69,6 +69,6 @@
"//base",
"//mojo/public/cpp/application",
"//mojo/public/cpp/bindings",
- "//mojo/services/tracing/public/interfaces",
+ "//mojo/services/tracing/interfaces",
]
}
diff --git a/mojo/common/trace_provider_impl.h b/mojo/common/trace_provider_impl.h
index 8d2124a..a1864ff 100644
--- a/mojo/common/trace_provider_impl.h
+++ b/mojo/common/trace_provider_impl.h
@@ -9,7 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
namespace mojo {
diff --git a/mojo/common/tracing_impl.h b/mojo/common/tracing_impl.h
index c798b3e..4fa2699 100644
--- a/mojo/common/tracing_impl.h
+++ b/mojo/common/tracing_impl.h
@@ -8,7 +8,7 @@
#include "base/macros.h"
#include "mojo/common/trace_provider_impl.h"
#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
namespace mojo {
diff --git a/mojo/converters/ozone_drm_gpu/BUILD.gn b/mojo/converters/ozone_drm_gpu/BUILD.gn
index d7061ad..2bb0826 100644
--- a/mojo/converters/ozone_drm_gpu/BUILD.gn
+++ b/mojo/converters/ozone_drm_gpu/BUILD.gn
@@ -14,6 +14,6 @@
"//mojo/converters/geometry",
"//mojo/environment:chromium",
"//mojo/public/c/system",
- "//mojo/services/ozone_drm_gpu/public/interfaces",
+ "//mojo/services/ozone_drm_gpu/interfaces",
]
}
diff --git a/mojo/converters/ozone_drm_gpu/ozone_drm_gpu_type_converters.h b/mojo/converters/ozone_drm_gpu/ozone_drm_gpu_type_converters.h
index 3bf0181..9ffb389 100644
--- a/mojo/converters/ozone_drm_gpu/ozone_drm_gpu_type_converters.h
+++ b/mojo/converters/ozone_drm_gpu/ozone_drm_gpu_type_converters.h
@@ -6,7 +6,7 @@
#define MOJO_CONVERTERS_OZONE_DRM_GPU_OZONE_DRM_GPU_TYPE_CONVERTERS_H_
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom.h"
+#include "mojo/services/ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom.h"
#include "ui/ozone/common/gpu/ozone_gpu_message_params.h"
namespace mojo {
diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn
index 4475e28..b8e2fa7 100644
--- a/mojo/converters/surfaces/BUILD.gn
+++ b/mojo/converters/surfaces/BUILD.gn
@@ -22,7 +22,7 @@
"//gpu",
"//mojo/environment:chromium",
"//mojo/public/c/system",
- "//mojo/services/surfaces/public/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/interfaces",
+ "//mojo/services/surfaces/interfaces:surface_id",
]
}
diff --git a/mojo/converters/surfaces/surfaces_type_converters.h b/mojo/converters/surfaces/surfaces_type_converters.h
index 2484b59..1f41613 100644
--- a/mojo/converters/surfaces/surfaces_type_converters.h
+++ b/mojo/converters/surfaces/surfaces_type_converters.h
@@ -11,9 +11,9 @@
#include "cc/surfaces/surface_id.h"
#include "gpu/command_buffer/common/mailbox.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
-#include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/quads.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
#include "third_party/skia/include/core/SkColor.h"
namespace cc {
diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn
index c7881bb..2a9499d 100644
--- a/mojo/converters/surfaces/tests/BUILD.gn
+++ b/mojo/converters/surfaces/tests/BUILD.gn
@@ -16,7 +16,7 @@
"//mojo/edk/test:run_all_unittests",
"//mojo/environment:chromium",
"//mojo/services/geometry/interfaces",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/interfaces",
"//skia",
"//testing/gtest",
"//ui/gfx",
diff --git a/mojo/devtools/common/docs/mojo_benchmark.md b/mojo/devtools/common/docs/mojo_benchmark.md
index 17bc76e..262f462 100644
--- a/mojo/devtools/common/docs/mojo_benchmark.md
+++ b/mojo/devtools/common/docs/mojo_benchmark.md
@@ -2,7 +2,7 @@
`mojo_benchmark` allows you to run performance tests for any Mojo application
that participates in the [tracing
-ecosystem](https://github.com/domokit/mojo/blob/master/mojo/services/tracing/public/interfaces/tracing.mojom)
+ecosystem](https://github.com/domokit/mojo/blob/master/mojo/services/tracing/interfaces/tracing.mojom)
with no app changes required.
The script reads a list of benchmarks to run from a file, runs each benchmark in
diff --git a/mojo/gpu/BUILD.gn b/mojo/gpu/BUILD.gn
index 3f2687f..27d2723 100644
--- a/mojo/gpu/BUILD.gn
+++ b/mojo/gpu/BUILD.gn
@@ -42,9 +42,9 @@
"//mojo/services/geometry/cpp",
"//mojo/services/geometry/interfaces",
"//mojo/services/gpu/interfaces",
- "//mojo/services/surfaces/public/cpp",
- "//mojo/services/surfaces/public/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/cpp",
+ "//mojo/services/surfaces/interfaces",
+ "//mojo/services/surfaces/interfaces:surface_id",
]
}
@@ -65,7 +65,7 @@
"//mojo/application:test_support",
"//mojo/public/cpp/bindings:callback",
"//mojo/services/geometry/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/surfaces/interfaces:surface_id",
"//testing/gtest",
]
}
diff --git a/mojo/gpu/texture_cache.h b/mojo/gpu/texture_cache.h
index 7b7c48b..d5af72c 100644
--- a/mojo/gpu/texture_cache.h
+++ b/mojo/gpu/texture_cache.h
@@ -14,7 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace mojo {
diff --git a/mojo/gpu/texture_cache_unittest.cc b/mojo/gpu/texture_cache_unittest.cc
index 7e040b7..c1b9558 100644
--- a/mojo/gpu/texture_cache_unittest.cc
+++ b/mojo/gpu/texture_cache_unittest.cc
@@ -11,7 +11,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/services/geometry/interfaces/geometry.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/mojo/gpu/texture_uploader.cc b/mojo/gpu/texture_uploader.cc
index e4b2517..57fbd27 100644
--- a/mojo/gpu/texture_uploader.cc
+++ b/mojo/gpu/texture_uploader.cc
@@ -12,7 +12,7 @@
#include <GLES2/gl2extmojo.h>
#include "mojo/services/geometry/cpp/geometry_util.h"
-#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
+#include "mojo/services/surfaces/cpp/surfaces_utils.h"
namespace mojo {
diff --git a/mojo/gpu/texture_uploader.h b/mojo/gpu/texture_uploader.h
index 6bec804..29ab680 100644
--- a/mojo/gpu/texture_uploader.h
+++ b/mojo/gpu/texture_uploader.h
@@ -9,7 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/gpu/gl_context.h"
#include "mojo/gpu/gl_texture.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace mojo {
diff --git a/mojo/gpu/texture_uploader_unittest.cc b/mojo/gpu/texture_uploader_unittest.cc
index 07b1d99..b7c99eb 100644
--- a/mojo/gpu/texture_uploader_unittest.cc
+++ b/mojo/gpu/texture_uploader_unittest.cc
@@ -10,7 +10,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/application/connect.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/mojo/services/mojo_services.gni b/mojo/services/mojo_services.gni
index e5e29e0..154580b 100644
--- a/mojo/services/mojo_services.gni
+++ b/mojo/services/mojo_services.gni
@@ -26,21 +26,21 @@
"//mojo/services/location/interfaces",
"//mojo/services/native_support/interfaces",
"//mojo/services/native_viewport/interfaces",
- "//mojo/services/navigation/public/interfaces",
+ "//mojo/services/navigation/interfaces",
"//mojo/services/network/public/interfaces",
- "//mojo/services/nfc/public/interfaces",
- "//mojo/services/notifications/public/interfaces",
- "//mojo/services/ozone_drm_gpu/public/interfaces",
- "//mojo/services/ozone_drm_host/public/interfaces",
- "//mojo/services/prediction/public/interfaces",
- "//mojo/services/sensors/public/interfaces",
- "//mojo/services/service_registry/public/interfaces",
- "//mojo/services/sharing/public/interfaces",
- "//mojo/services/speech_recognizer/public/interfaces",
- "//mojo/services/surfaces/public/interfaces",
- "//mojo/services/terminal/public/interfaces",
- "//mojo/services/tracing/public/interfaces",
- "//mojo/services/url_response_disk_cache/public/interfaces",
+ "//mojo/services/nfc/interfaces",
+ "//mojo/services/notifications/interfaces",
+ "//mojo/services/ozone_drm_gpu/interfaces",
+ "//mojo/services/ozone_drm_host/interfaces",
+ "//mojo/services/prediction/interfaces",
+ "//mojo/services/sensors/interfaces",
+ "//mojo/services/service_registry/interfaces",
+ "//mojo/services/sharing/interfaces",
+ "//mojo/services/speech_recognizer/interfaces",
+ "//mojo/services/surfaces/interfaces",
+ "//mojo/services/terminal/interfaces",
+ "//mojo/services/tracing/interfaces",
+ "//mojo/services/url_response_disk_cache/interfaces",
"//mojo/services/vanadium/security/public/interfaces",
"//mojo/services/view_manager/public/interfaces",
"//mojo/services/window_manager/public/interfaces",
diff --git a/mojo/services/native_viewport/interfaces/BUILD.gn b/mojo/services/native_viewport/interfaces/BUILD.gn
index 638a7ae..49a7d96 100644
--- a/mojo/services/native_viewport/interfaces/BUILD.gn
+++ b/mojo/services/native_viewport/interfaces/BUILD.gn
@@ -16,6 +16,6 @@
"../../geometry/interfaces",
"../../gpu/interfaces",
"../../input_events/interfaces",
- "../../surfaces/public/interfaces:surface_id",
+ "../../surfaces/interfaces:surface_id",
]
}
diff --git a/mojo/services/navigation/public/interfaces/BUILD.gn b/mojo/services/navigation/interfaces/BUILD.gn
similarity index 86%
rename from mojo/services/navigation/public/interfaces/BUILD.gn
rename to mojo/services/navigation/interfaces/BUILD.gn
index 59a940f..59008e3 100644
--- a/mojo/services/navigation/public/interfaces/BUILD.gn
+++ b/mojo/services/navigation/interfaces/BUILD.gn
@@ -10,7 +10,7 @@
"navigation.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
mojo_sdk_deps = [ "mojo/public/interfaces/network" ]
}
diff --git a/mojo/services/navigation/public/interfaces/navigation.mojom b/mojo/services/navigation/interfaces/navigation.mojom
similarity index 100%
rename from mojo/services/navigation/public/interfaces/navigation.mojom
rename to mojo/services/navigation/interfaces/navigation.mojom
diff --git a/mojo/services/nfc/public/interfaces/BUILD.gn b/mojo/services/nfc/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/nfc/public/interfaces/BUILD.gn
rename to mojo/services/nfc/interfaces/BUILD.gn
diff --git a/mojo/services/nfc/public/interfaces/nfc.mojom b/mojo/services/nfc/interfaces/nfc.mojom
similarity index 100%
rename from mojo/services/nfc/public/interfaces/nfc.mojom
rename to mojo/services/nfc/interfaces/nfc.mojom
diff --git a/mojo/services/notifications/public/interfaces/BUILD.gn b/mojo/services/notifications/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/notifications/public/interfaces/BUILD.gn
rename to mojo/services/notifications/interfaces/BUILD.gn
diff --git a/mojo/services/notifications/public/interfaces/notifications.mojom b/mojo/services/notifications/interfaces/notifications.mojom
similarity index 100%
rename from mojo/services/notifications/public/interfaces/notifications.mojom
rename to mojo/services/notifications/interfaces/notifications.mojom
diff --git a/mojo/services/ozone_drm_gpu/public/interfaces/BUILD.gn b/mojo/services/ozone_drm_gpu/interfaces/BUILD.gn
similarity index 79%
rename from mojo/services/ozone_drm_gpu/public/interfaces/BUILD.gn
rename to mojo/services/ozone_drm_gpu/interfaces/BUILD.gn
index 989a9c0..c4974e8 100644
--- a/mojo/services/ozone_drm_gpu/public/interfaces/BUILD.gn
+++ b/mojo/services/ozone_drm_gpu/interfaces/BUILD.gn
@@ -10,9 +10,9 @@
"ozone_drm_gpu.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
public_deps = [
- "../../../geometry/interfaces",
+ "../../geometry/interfaces",
]
}
diff --git a/mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom b/mojo/services/ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom
similarity index 100%
rename from mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom
rename to mojo/services/ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom
diff --git a/mojo/services/ozone_drm_host/public/interfaces/BUILD.gn b/mojo/services/ozone_drm_host/interfaces/BUILD.gn
similarity index 77%
rename from mojo/services/ozone_drm_host/public/interfaces/BUILD.gn
rename to mojo/services/ozone_drm_host/interfaces/BUILD.gn
index 0b7c3da..d2f8a0d 100644
--- a/mojo/services/ozone_drm_host/public/interfaces/BUILD.gn
+++ b/mojo/services/ozone_drm_host/interfaces/BUILD.gn
@@ -10,9 +10,9 @@
"ozone_drm_host.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
public_deps = [
- "../../../ozone_drm_gpu/public/interfaces",
+ "../../ozone_drm_gpu/interfaces",
]
}
diff --git a/mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom b/mojo/services/ozone_drm_host/interfaces/ozone_drm_host.mojom
similarity index 84%
rename from mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom
rename to mojo/services/ozone_drm_host/interfaces/ozone_drm_host.mojom
index 69e51cc..0960edf 100644
--- a/mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom
+++ b/mojo/services/ozone_drm_host/interfaces/ozone_drm_host.mojom
@@ -5,7 +5,7 @@
module mojo;
import "geometry/interfaces/geometry.mojom";
-import "ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom";
+import "ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom";
interface OzoneDrmHost {
UpdateNativeDisplays(array<DisplaySnapshot> displays);
diff --git a/mojo/services/prediction/public/interfaces/BUILD.gn b/mojo/services/prediction/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/prediction/public/interfaces/BUILD.gn
rename to mojo/services/prediction/interfaces/BUILD.gn
diff --git a/mojo/services/prediction/public/interfaces/prediction.mojom b/mojo/services/prediction/interfaces/prediction.mojom
similarity index 100%
rename from mojo/services/prediction/public/interfaces/prediction.mojom
rename to mojo/services/prediction/interfaces/prediction.mojom
diff --git a/mojo/services/sensors/public/interfaces/BUILD.gn b/mojo/services/sensors/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/sensors/public/interfaces/BUILD.gn
rename to mojo/services/sensors/interfaces/BUILD.gn
diff --git a/mojo/services/sensors/public/interfaces/sensors.mojom b/mojo/services/sensors/interfaces/sensors.mojom
similarity index 100%
rename from mojo/services/sensors/public/interfaces/sensors.mojom
rename to mojo/services/sensors/interfaces/sensors.mojom
diff --git a/mojo/services/service_registry/public/interfaces/BUILD.gn b/mojo/services/service_registry/interfaces/BUILD.gn
similarity index 87%
rename from mojo/services/service_registry/public/interfaces/BUILD.gn
rename to mojo/services/service_registry/interfaces/BUILD.gn
index 3c647d0..e3fd066 100644
--- a/mojo/services/service_registry/public/interfaces/BUILD.gn
+++ b/mojo/services/service_registry/interfaces/BUILD.gn
@@ -10,7 +10,7 @@
"service_registry.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
}
diff --git a/mojo/services/service_registry/public/interfaces/service_registry.mojom b/mojo/services/service_registry/interfaces/service_registry.mojom
similarity index 100%
rename from mojo/services/service_registry/public/interfaces/service_registry.mojom
rename to mojo/services/service_registry/interfaces/service_registry.mojom
diff --git a/mojo/services/sharing/public/interfaces/BUILD.gn b/mojo/services/sharing/interfaces/BUILD.gn
similarity index 86%
rename from mojo/services/sharing/public/interfaces/BUILD.gn
rename to mojo/services/sharing/interfaces/BUILD.gn
index b5e0c3c..b63e51e 100644
--- a/mojo/services/sharing/public/interfaces/BUILD.gn
+++ b/mojo/services/sharing/interfaces/BUILD.gn
@@ -10,7 +10,7 @@
"sharing.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
}
diff --git a/mojo/services/sharing/public/interfaces/sharing.mojom b/mojo/services/sharing/interfaces/sharing.mojom
similarity index 100%
rename from mojo/services/sharing/public/interfaces/sharing.mojom
rename to mojo/services/sharing/interfaces/sharing.mojom
diff --git a/mojo/services/speech_recognizer/public/interfaces/BUILD.gn b/mojo/services/speech_recognizer/interfaces/BUILD.gn
similarity index 87%
rename from mojo/services/speech_recognizer/public/interfaces/BUILD.gn
rename to mojo/services/speech_recognizer/interfaces/BUILD.gn
index 1c50a65..576ae39 100644
--- a/mojo/services/speech_recognizer/public/interfaces/BUILD.gn
+++ b/mojo/services/speech_recognizer/interfaces/BUILD.gn
@@ -10,7 +10,7 @@
"speech_recognizer.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
}
diff --git a/mojo/services/speech_recognizer/public/interfaces/speech_recognizer.mojom b/mojo/services/speech_recognizer/interfaces/speech_recognizer.mojom
similarity index 100%
rename from mojo/services/speech_recognizer/public/interfaces/speech_recognizer.mojom
rename to mojo/services/speech_recognizer/interfaces/speech_recognizer.mojom
diff --git a/mojo/services/surfaces/public/cpp/BUILD.gn b/mojo/services/surfaces/cpp/BUILD.gn
similarity index 73%
rename from mojo/services/surfaces/public/cpp/BUILD.gn
rename to mojo/services/surfaces/cpp/BUILD.gn
index 345ee0c..edc2b3f 100644
--- a/mojo/services/surfaces/public/cpp/BUILD.gn
+++ b/mojo/services/surfaces/cpp/BUILD.gn
@@ -7,14 +7,14 @@
mojo_sdk_source_set("cpp") {
restrict_external_deps = false
- public_configs = [ "../../../public/build/config:mojo_services" ]
+ public_configs = [ "../../public/build/config:mojo_services" ]
sources = [
"surfaces_utils.cc",
"surfaces_utils.h",
]
deps = [
- "../../../geometry/interfaces",
- "../../../surfaces/public/interfaces",
+ "../../geometry/interfaces",
+ "../interfaces",
]
}
diff --git a/mojo/services/surfaces/public/cpp/surfaces_utils.cc b/mojo/services/surfaces/cpp/surfaces_utils.cc
similarity index 96%
rename from mojo/services/surfaces/public/cpp/surfaces_utils.cc
rename to mojo/services/surfaces/cpp/surfaces_utils.cc
index 70fa249..b675f73 100644
--- a/mojo/services/surfaces/public/cpp/surfaces_utils.cc
+++ b/mojo/services/surfaces/cpp/surfaces_utils.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "surfaces/public/cpp/surfaces_utils.h"
+#include "surfaces/cpp/surfaces_utils.h"
#include "geometry/interfaces/geometry.mojom.h"
diff --git a/mojo/services/surfaces/public/cpp/surfaces_utils.h b/mojo/services/surfaces/cpp/surfaces_utils.h
similarity index 68%
rename from mojo/services/surfaces/public/cpp/surfaces_utils.h
rename to mojo/services/surfaces/cpp/surfaces_utils.h
index f74731e..1b61e84 100644
--- a/mojo/services/surfaces/public/cpp/surfaces_utils.h
+++ b/mojo/services/surfaces/cpp/surfaces_utils.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_SURFACES_PUBLIC_CPP_SURFACES_UTILS_H_
-#define MOJO_SERVICES_SURFACES_PUBLIC_CPP_SURFACES_UTILS_H_
+#ifndef MOJO_SERVICES_SURFACES_CPP_SURFACES_UTILS_H_
+#define MOJO_SERVICES_SURFACES_CPP_SURFACES_UTILS_H_
-#include "surfaces/public/interfaces/quads.mojom.h"
+#include "surfaces/interfaces/quads.mojom.h"
namespace mojo {
class Rect;
@@ -20,4 +20,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_SURFACES_PUBLIC_CPP_SURFACES_UTILS_H_
+#endif // MOJO_SERVICES_SURFACES_CPP_SURFACES_UTILS_H_
diff --git a/mojo/services/surfaces/public/interfaces/BUILD.gn b/mojo/services/surfaces/interfaces/BUILD.gn
similarity index 73%
rename from mojo/services/surfaces/public/interfaces/BUILD.gn
rename to mojo/services/surfaces/interfaces/BUILD.gn
index 8ada0ff..848f188 100644
--- a/mojo/services/surfaces/public/interfaces/BUILD.gn
+++ b/mojo/services/surfaces/interfaces/BUILD.gn
@@ -12,13 +12,13 @@
"surfaces.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
deps = [
":surface_id",
- "../../../geometry/interfaces",
- "../../../gpu/interfaces",
- "../../../native_viewport/interfaces",
+ "../../geometry/interfaces",
+ "../../gpu/interfaces",
+ "../../native_viewport/interfaces",
]
}
diff --git a/mojo/services/surfaces/public/interfaces/display.mojom b/mojo/services/surfaces/interfaces/display.mojom
similarity index 95%
rename from mojo/services/surfaces/public/interfaces/display.mojom
rename to mojo/services/surfaces/interfaces/display.mojom
index 663c229..bb94787 100644
--- a/mojo/services/surfaces/public/interfaces/display.mojom
+++ b/mojo/services/surfaces/interfaces/display.mojom
@@ -7,7 +7,7 @@
import "gpu/interfaces/context_provider.mojom";
import "gpu/interfaces/viewport_parameter_listener.mojom";
-import "surfaces/public/interfaces/surfaces.mojom";
+import "surfaces/interfaces/surfaces.mojom";
interface Display {
// Submits a new frame to the display to be drawn when possible. The callback
diff --git a/mojo/services/surfaces/public/interfaces/quads.mojom b/mojo/services/surfaces/interfaces/quads.mojom
similarity index 98%
rename from mojo/services/surfaces/public/interfaces/quads.mojom
rename to mojo/services/surfaces/interfaces/quads.mojom
index 0a0c83f..b410d72 100644
--- a/mojo/services/surfaces/public/interfaces/quads.mojom
+++ b/mojo/services/surfaces/interfaces/quads.mojom
@@ -6,7 +6,7 @@
module mojo;
import "geometry/interfaces/geometry.mojom";
-import "surfaces/public/interfaces/surface_id.mojom";
+import "surfaces/interfaces/surface_id.mojom";
struct Color {
uint32 rgba;
diff --git a/mojo/services/surfaces/public/interfaces/surface_id.mojom b/mojo/services/surfaces/interfaces/surface_id.mojom
similarity index 100%
rename from mojo/services/surfaces/public/interfaces/surface_id.mojom
rename to mojo/services/surfaces/interfaces/surface_id.mojom
diff --git a/mojo/services/surfaces/public/interfaces/surfaces.mojom b/mojo/services/surfaces/interfaces/surfaces.mojom
similarity index 94%
rename from mojo/services/surfaces/public/interfaces/surfaces.mojom
rename to mojo/services/surfaces/interfaces/surfaces.mojom
index c5509f6..d31b505 100644
--- a/mojo/services/surfaces/public/interfaces/surfaces.mojom
+++ b/mojo/services/surfaces/interfaces/surfaces.mojom
@@ -6,8 +6,8 @@
module mojo;
import "geometry/interfaces/geometry.mojom";
-import "surfaces/public/interfaces/quads.mojom";
-import "surfaces/public/interfaces/surface_id.mojom";
+import "surfaces/interfaces/quads.mojom";
+import "surfaces/interfaces/surface_id.mojom";
enum ResourceFormat {
RGBA_8888,
diff --git a/mojo/services/terminal/public/interfaces/BUILD.gn b/mojo/services/terminal/interfaces/BUILD.gn
similarity index 80%
rename from mojo/services/terminal/public/interfaces/BUILD.gn
rename to mojo/services/terminal/interfaces/BUILD.gn
index d8afbc6..22e15ad 100644
--- a/mojo/services/terminal/public/interfaces/BUILD.gn
+++ b/mojo/services/terminal/interfaces/BUILD.gn
@@ -11,9 +11,9 @@
"terminal_client.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
public_deps = [
- "../../../files/interfaces",
+ "../../files/interfaces",
]
}
diff --git a/mojo/services/terminal/public/interfaces/terminal.mojom b/mojo/services/terminal/interfaces/terminal.mojom
similarity index 96%
rename from mojo/services/terminal/public/interfaces/terminal.mojom
rename to mojo/services/terminal/interfaces/terminal.mojom
index c9c928a..363312d 100644
--- a/mojo/services/terminal/public/interfaces/terminal.mojom
+++ b/mojo/services/terminal/interfaces/terminal.mojom
@@ -7,7 +7,7 @@
import "files/interfaces/file.mojom";
import "files/interfaces/types.mojom";
-import "terminal/public/interfaces/terminal_client.mojom";
+import "terminal/interfaces/terminal_client.mojom";
// Interface for actual terminal programs, in particular, for a single terminal
// display. For terminals that display output and are embeddable, this will
diff --git a/mojo/services/terminal/public/interfaces/terminal_client.mojom b/mojo/services/terminal/interfaces/terminal_client.mojom
similarity index 100%
rename from mojo/services/terminal/public/interfaces/terminal_client.mojom
rename to mojo/services/terminal/interfaces/terminal_client.mojom
diff --git a/mojo/services/tracing/public/interfaces/BUILD.gn b/mojo/services/tracing/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/tracing/public/interfaces/BUILD.gn
rename to mojo/services/tracing/interfaces/BUILD.gn
diff --git a/mojo/services/tracing/public/interfaces/tracing.mojom b/mojo/services/tracing/interfaces/tracing.mojom
similarity index 100%
rename from mojo/services/tracing/public/interfaces/tracing.mojom
rename to mojo/services/tracing/interfaces/tracing.mojom
diff --git a/mojo/services/url_response_disk_cache/public/interfaces/BUILD.gn b/mojo/services/url_response_disk_cache/interfaces/BUILD.gn
similarity index 87%
rename from mojo/services/url_response_disk_cache/public/interfaces/BUILD.gn
rename to mojo/services/url_response_disk_cache/interfaces/BUILD.gn
index 4320ff1..08bce03 100644
--- a/mojo/services/url_response_disk_cache/public/interfaces/BUILD.gn
+++ b/mojo/services/url_response_disk_cache/interfaces/BUILD.gn
@@ -10,7 +10,7 @@
"url_response_disk_cache.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
mojo_sdk_deps = [ "mojo/public/interfaces/network" ]
}
diff --git a/mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom b/mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom
similarity index 100%
rename from mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom
rename to mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom
diff --git a/mojo/services/view_manager/public/cpp/BUILD.gn b/mojo/services/view_manager/public/cpp/BUILD.gn
index 8f2620a..e352d41 100644
--- a/mojo/services/view_manager/public/cpp/BUILD.gn
+++ b/mojo/services/view_manager/public/cpp/BUILD.gn
@@ -37,7 +37,7 @@
"../interfaces",
"../../../geometry/interfaces",
"../../../input_events/interfaces",
- "../../../surfaces/public/interfaces:surface_id",
+ "../../../surfaces/interfaces:surface_id",
"../../../window_manager/public/interfaces",
"//base",
]
diff --git a/mojo/services/view_manager/public/cpp/view.h b/mojo/services/view_manager/public/cpp/view.h
index dbd5196..6578db8 100644
--- a/mojo/services/view_manager/public/cpp/view.h
+++ b/mojo/services/view_manager/public/cpp/view.h
@@ -13,7 +13,7 @@
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "surfaces/public/interfaces/surface_id.mojom.h"
+#include "surfaces/interfaces/surface_id.mojom.h"
#include "view_manager/public/cpp/types.h"
#include "view_manager/public/interfaces/view_manager.mojom.h"
#include "view_manager/public/interfaces/view_manager_constants.mojom.h"
diff --git a/mojo/services/view_manager/public/interfaces/BUILD.gn b/mojo/services/view_manager/public/interfaces/BUILD.gn
index ea75021..b2273ad 100644
--- a/mojo/services/view_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/view_manager/public/interfaces/BUILD.gn
@@ -20,6 +20,6 @@
"../../../geometry/interfaces",
"../../../input_events/interfaces",
"../../../native_viewport/interfaces",
- "../../../surfaces/public/interfaces:surface_id",
+ "../../../surfaces/interfaces:surface_id",
]
}
diff --git a/mojo/services/view_manager/public/interfaces/view_manager.mojom b/mojo/services/view_manager/public/interfaces/view_manager.mojom
index 18acdbd..c3f1d4d 100644
--- a/mojo/services/view_manager/public/interfaces/view_manager.mojom
+++ b/mojo/services/view_manager/public/interfaces/view_manager.mojom
@@ -9,7 +9,7 @@
import "input_events/interfaces/input_events.mojom";
import "mojo/public/interfaces/application/service_provider.mojom";
import "native_viewport/interfaces/native_viewport.mojom";
-import "surfaces/public/interfaces/surface_id.mojom";
+import "surfaces/interfaces/surface_id.mojom";
import "view_manager/public/interfaces/view_manager_constants.mojom";
struct ViewData {
diff --git a/services/android/BUILD.gn b/services/android/BUILD.gn
index 281d79a..7eba11c 100644
--- a/services/android/BUILD.gn
+++ b/services/android/BUILD.gn
@@ -22,7 +22,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//mojo/services/content_handler/interfaces",
- "//mojo/services/url_response_disk_cache/public/interfaces",
+ "//mojo/services/url_response_disk_cache/interfaces",
]
java_sources = [ "java/src/org/chromium/services/android/JavaHandler.java" ]
diff --git a/services/android/java_handler.h b/services/android/java_handler.h
index 58df813..13f1cea 100644
--- a/services/android/java_handler.h
+++ b/services/android/java_handler.h
@@ -14,7 +14,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory_impl.h"
#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
namespace services {
namespace android {
diff --git a/services/dart/BUILD.gn b/services/dart/BUILD.gn
index 1aee326..f40dce6 100644
--- a/services/dart/BUILD.gn
+++ b/services/dart/BUILD.gn
@@ -49,8 +49,8 @@
"//mojo/public/interfaces/application",
"//mojo/services/content_handler/interfaces",
"//mojo/services/network/public/interfaces",
- "//mojo/services/tracing/public/interfaces",
- "//mojo/services/url_response_disk_cache/public/interfaces",
+ "//mojo/services/tracing/interfaces",
+ "//mojo/services/url_response_disk_cache/interfaces",
"//third_party/zlib:zip",
"//url:url",
]
diff --git a/services/dart/content_handler_main.cc b/services/dart/content_handler_main.cc
index 2579cd3..5250e55 100644
--- a/services/dart/content_handler_main.cc
+++ b/services/dart/content_handler_main.cc
@@ -18,8 +18,8 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
#include "services/dart/content_handler_app_service_connector.h"
#include "services/dart/dart_app.h"
#include "services/dart/dart_tracing.h"
diff --git a/services/dart/dart_tracing.h b/services/dart/dart_tracing.h
index 43c4633..b3a10fd 100644
--- a/services/dart/dart_tracing.h
+++ b/services/dart/dart_tracing.h
@@ -8,7 +8,7 @@
#include "base/trace_event/trace_event.h"
#include "mojo/common/tracing_impl.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
namespace dart {
@@ -60,4 +60,4 @@
} // namespace dart
-#endif // SERVICES_DART_DART_TRACING_H_
\ No newline at end of file
+#endif // SERVICES_DART_DART_TRACING_H_
diff --git a/services/debugger/BUILD.gn b/services/debugger/BUILD.gn
index 7be1e75..4eea5b9 100644
--- a/services/debugger/BUILD.gn
+++ b/services/debugger/BUILD.gn
@@ -24,7 +24,7 @@
"//mojo/services/http_server/cpp",
"//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
- "//mojo/services/tracing/public/interfaces",
+ "//mojo/services/tracing/interfaces",
"//mojo/services/window_manager/public/interfaces",
]
}
diff --git a/services/debugger/debugger.cc b/services/debugger/debugger.cc
index 486c474..1c4c5a6 100644
--- a/services/debugger/debugger.cc
+++ b/services/debugger/debugger.cc
@@ -18,7 +18,7 @@
#include "mojo/services/http_server/interfaces/http_server.mojom.h"
#include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
#include "mojo/services/network/public/interfaces/net_address.mojom.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
#include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
#include "services/debugger/trace_collector.h"
diff --git a/services/fake_surfaces/BUILD.gn b/services/fake_surfaces/BUILD.gn
index 6d3cc7a..187952e 100644
--- a/services/fake_surfaces/BUILD.gn
+++ b/services/fake_surfaces/BUILD.gn
@@ -18,6 +18,6 @@
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
"//mojo/services/gpu/interfaces",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/interfaces",
]
}
diff --git a/services/fake_surfaces/fake_surfaces_service_application.cc b/services/fake_surfaces/fake_surfaces_service_application.cc
index 19e4d3a..4eb25c3 100644
--- a/services/fake_surfaces/fake_surfaces_service_application.cc
+++ b/services/fake_surfaces/fake_surfaces_service_application.cc
@@ -8,7 +8,7 @@
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
using mojo::ApplicationConnection;
using mojo::Display;
diff --git a/services/fake_surfaces/fake_surfaces_service_application.h b/services/fake_surfaces/fake_surfaces_service_application.h
index 43a7c04..8b02782 100644
--- a/services/fake_surfaces/fake_surfaces_service_application.h
+++ b/services/fake_surfaces/fake_surfaces_service_application.h
@@ -9,8 +9,8 @@
#include "mojo/common/tracing_impl.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace mojo {
class ApplicationConnection;
diff --git a/services/keyboard_native/BUILD.gn b/services/keyboard_native/BUILD.gn
index 096d2d0..562c922 100644
--- a/services/keyboard_native/BUILD.gn
+++ b/services/keyboard_native/BUILD.gn
@@ -46,10 +46,10 @@
"//mojo/services/geometry/cpp",
"//mojo/services/geometry/interfaces",
"//mojo/services/keyboard/interfaces",
- "//mojo/services/prediction/public/interfaces",
- "//mojo/services/surfaces/public/cpp",
- "//mojo/services/surfaces/public/interfaces",
- "//mojo/services/surfaces/public/interfaces:surface_id",
+ "//mojo/services/prediction/interfaces",
+ "//mojo/services/surfaces/cpp",
+ "//mojo/services/surfaces/interfaces",
+ "//mojo/services/surfaces/interfaces:surface_id",
"//mojo/services/view_manager/public/cpp",
"//mojo/skia",
"//skia",
diff --git a/services/keyboard_native/predictor.h b/services/keyboard_native/predictor.h
index a6f5418..7a22eae 100644
--- a/services/keyboard_native/predictor.h
+++ b/services/keyboard_native/predictor.h
@@ -10,7 +10,7 @@
#include "base/callback.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
#include "services/keyboard_native/key_layout.h"
namespace keyboard {
diff --git a/services/keyboard_native/view_observer_delegate.cc b/services/keyboard_native/view_observer_delegate.cc
index f122976..ebdb9b0 100644
--- a/services/keyboard_native/view_observer_delegate.cc
+++ b/services/keyboard_native/view_observer_delegate.cc
@@ -11,7 +11,7 @@
#include "mojo/gpu/gl_texture.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/connect.h"
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
#include "mojo/skia/ganesh_surface.h"
#include "services/keyboard_native/clip_animation.h"
#include "services/keyboard_native/keyboard_service_impl.h"
diff --git a/services/kiosk_wm/BUILD.gn b/services/kiosk_wm/BUILD.gn
index 1b25d86..0b7f1f3 100644
--- a/services/kiosk_wm/BUILD.gn
+++ b/services/kiosk_wm/BUILD.gn
@@ -28,7 +28,7 @@
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
"//mojo/services/input_events/interfaces",
- "//mojo/services/navigation/public/interfaces",
+ "//mojo/services/navigation/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/window_manager/public/interfaces:interfaces",
"//services/window_manager:lib",
diff --git a/services/kiosk_wm/kiosk_wm_controller.h b/services/kiosk_wm/kiosk_wm_controller.h
index 3ec883f..1791b11 100644
--- a/services/kiosk_wm/kiosk_wm_controller.h
+++ b/services/kiosk_wm/kiosk_wm_controller.h
@@ -10,7 +10,7 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/input_events/interfaces/input_events.mojom.h"
-#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
+#include "mojo/services/navigation/interfaces/navigation.mojom.h"
#include "mojo/services/view_manager/public/cpp/view_manager.h"
#include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
#include "mojo/services/view_manager/public/cpp/view_observer.h"
diff --git a/services/kiosk_wm/merged_service_provider.h b/services/kiosk_wm/merged_service_provider.h
index 27265c1..4a84e43 100644
--- a/services/kiosk_wm/merged_service_provider.h
+++ b/services/kiosk_wm/merged_service_provider.h
@@ -9,7 +9,7 @@
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
-#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
+#include "mojo/services/navigation/interfaces/navigation.mojom.h"
namespace kiosk_wm {
diff --git a/services/kiosk_wm/navigator_host_impl.h b/services/kiosk_wm/navigator_host_impl.h
index 7e0f5cc..5c494da 100644
--- a/services/kiosk_wm/navigator_host_impl.h
+++ b/services/kiosk_wm/navigator_host_impl.h
@@ -8,7 +8,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/common/binding_set.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
+#include "mojo/services/navigation/interfaces/navigation.mojom.h"
namespace kiosk_wm {
class KioskWMController;
diff --git a/services/native_viewport/BUILD.gn b/services/native_viewport/BUILD.gn
index c12448a..360b650 100644
--- a/services/native_viewport/BUILD.gn
+++ b/services/native_viewport/BUILD.gn
@@ -69,8 +69,8 @@
if (use_ozone) {
sources += [ "ozone/app_delegate_ozone.cc" ]
deps += [
- "//mojo/services/ozone_drm_gpu/public/interfaces",
- "//mojo/services/ozone_drm_host/public/interfaces",
+ "//mojo/services/ozone_drm_gpu/interfaces",
+ "//mojo/services/ozone_drm_host/interfaces",
"//ui/events/ozone:events_ozone_evdev",
"//ui/ozone",
]
diff --git a/services/notifications/BUILD.gn b/services/notifications/BUILD.gn
index e8f4980..339de57 100644
--- a/services/notifications/BUILD.gn
+++ b/services/notifications/BUILD.gn
@@ -20,7 +20,7 @@
deps = [
"//mojo/public/interfaces/application:application_java",
"//mojo/public/java:application",
- "//mojo/services/notifications/public/interfaces:interfaces_java",
+ "//mojo/services/notifications/interfaces:interfaces_java",
"//services/intent_receiver:bindings_java",
]
}
@@ -42,7 +42,7 @@
"//mojo/public/cpp/bindings:callback",
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system:system",
- "//mojo/services/notifications/public/interfaces:interfaces_cpp_sources",
+ "//mojo/services/notifications/interfaces:interfaces_cpp_sources",
"//shell/test:bindings",
]
}
diff --git a/services/notifications/apptests/notifications_apptest.cc b/services/notifications/apptests/notifications_apptest.cc
index af5e1f0..8315587 100644
--- a/services/notifications/apptests/notifications_apptest.cc
+++ b/services/notifications/apptests/notifications_apptest.cc
@@ -9,7 +9,7 @@
#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/public/cpp/environment/logging.h"
#include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/notifications/public/interfaces/notifications.mojom.h"
+#include "mojo/services/notifications/interfaces/notifications.mojom.h"
namespace mojo {
namespace {
diff --git a/services/prediction/BUILD.gn b/services/prediction/BUILD.gn
index 647ad4c..387d1bd 100644
--- a/services/prediction/BUILD.gn
+++ b/services/prediction/BUILD.gn
@@ -26,7 +26,7 @@
":dict_file",
"//base",
"//mojo/application",
- "//mojo/services/prediction/public/interfaces",
+ "//mojo/services/prediction/interfaces",
"//third_party/android_prediction:suggest",
]
}
@@ -44,7 +44,7 @@
"//base",
"//mojo/application",
"//mojo/application:test_support",
- "//mojo/services/prediction/public/interfaces",
+ "//mojo/services/prediction/interfaces",
]
data_deps = [ ":prediction($default_toolchain)" ]
diff --git a/services/prediction/README.chromium b/services/prediction/README.chromium
index c77e8ae..bd715b3 100644
--- a/services/prediction/README.chromium
+++ b/services/prediction/README.chromium
@@ -1,6 +1,6 @@
PredictionService interface provides only one function GetPredictionList
which takes infos about previous words and current word (format details in
-mojo/services/prediction/public/interfaces/prediction.mojom).
+mojo/services/prediction/interfaces/prediction.mojom).
Connect to "mojo:prediction_service" to use the service.
Description of each class:
diff --git a/services/prediction/dictionary_service.cc b/services/prediction/dictionary_service.cc
index 6661d9a..a771b39 100644
--- a/services/prediction/dictionary_service.cc
+++ b/services/prediction/dictionary_service.cc
@@ -12,7 +12,7 @@
#include "base/path_service.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
#include "mojo/tools/embed/data.h"
#include "services/prediction/dictionary_service.h"
#include "services/prediction/input_info.h"
diff --git a/services/prediction/dictionary_service.h b/services/prediction/dictionary_service.h
index ba174db..7af1d56 100644
--- a/services/prediction/dictionary_service.h
+++ b/services/prediction/dictionary_service.h
@@ -7,7 +7,7 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
#include "services/prediction/proximity_info_factory.h"
namespace latinime {
diff --git a/services/prediction/input_info.h b/services/prediction/input_info.h
index 5f7caa4..a3fe629 100644
--- a/services/prediction/input_info.h
+++ b/services/prediction/input_info.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_PREDICTION_INPUT_INFO_H_
#define SERVICES_PREDICTION_INPUT_INFO_H_
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
namespace prediction {
diff --git a/services/prediction/key_set.h b/services/prediction/key_set.h
index 8b72b22..d60ed6b 100644
--- a/services/prediction/key_set.h
+++ b/services/prediction/key_set.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_PREDICTION_KEY_SET_H_
#define SERVICES_PREDICTION_KEY_SET_H_
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
// qwerty keyboard key sets
diff --git a/services/prediction/prediction_apptests.cc b/services/prediction/prediction_apptests.cc
index 611c54c..2522fe7 100644
--- a/services/prediction/prediction_apptests.cc
+++ b/services/prediction/prediction_apptests.cc
@@ -8,7 +8,7 @@
#include "base/message_loop/message_loop.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
namespace prediction {
diff --git a/services/prediction/prediction_service_impl.h b/services/prediction/prediction_service_impl.h
index 6238f2e..4963004 100644
--- a/services/prediction/prediction_service_impl.h
+++ b/services/prediction/prediction_service_impl.h
@@ -6,7 +6,7 @@
#define SERVICES_PREDICTION_PREDICTION_SERVICE_IMPL_H_
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
namespace prediction {
diff --git a/services/prediction/proximity_info_factory.h b/services/prediction/proximity_info_factory.h
index 3ac8186..0434151 100644
--- a/services/prediction/proximity_info_factory.h
+++ b/services/prediction/proximity_info_factory.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_PREDICTION_PROXIMITY_INFO_FACTORY_H_
#define SERVICES_PREDICTION_PROXIMITY_INFO_FACTORY_H_
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
#include "services/prediction/key_set.h"
#include "third_party/android_prediction/suggest/core/layout/proximity_info.h"
diff --git a/services/prediction/touch_position_correction.h b/services/prediction/touch_position_correction.h
index 1ccf880..771532f 100644
--- a/services/prediction/touch_position_correction.h
+++ b/services/prediction/touch_position_correction.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_PREDICTION_TOUCH_POSITION_CORRECTION_H_
#define SERVICES_PREDICTION_TOUCH_POSITION_CORRECTION_H_
-#include "mojo/services/prediction/public/interfaces/prediction.mojom.h"
+#include "mojo/services/prediction/interfaces/prediction.mojom.h"
// NOTE: This class has been translated to C++ and modified from the Android
// Open Source Project. Specifically from some functions of the following file:
diff --git a/services/sensors/BUILD.gn b/services/sensors/BUILD.gn
index dd38556..f6af3a6 100644
--- a/services/sensors/BUILD.gn
+++ b/services/sensors/BUILD.gn
@@ -17,7 +17,7 @@
":sensors_lib",
"//mojo/public/interfaces/application:application_java",
"//mojo/public/java:application",
- "//mojo/services/sensors/public/interfaces:interfaces_java",
+ "//mojo/services/sensors/interfaces:interfaces_java",
]
}
@@ -30,7 +30,7 @@
deps = [
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//mojo/services/sensors/public/interfaces:interfaces_java",
+ "//mojo/services/sensors/interfaces:interfaces_java",
]
}
}
diff --git a/services/sharing/BUILD.gn b/services/sharing/BUILD.gn
index 5403373..5b42640 100644
--- a/services/sharing/BUILD.gn
+++ b/services/sharing/BUILD.gn
@@ -14,6 +14,6 @@
deps = [
"//mojo/public/interfaces/application:application_java",
"//mojo/public/java:application",
- "//mojo/services/sharing/public/interfaces:interfaces_java",
+ "//mojo/services/sharing/interfaces:interfaces_java",
]
}
diff --git a/services/speech_recognizer/BUILD.gn b/services/speech_recognizer/BUILD.gn
index 293b960..a9e1c75 100644
--- a/services/speech_recognizer/BUILD.gn
+++ b/services/speech_recognizer/BUILD.gn
@@ -17,6 +17,6 @@
"//base:base_java",
"//mojo/public/interfaces/application:application_java",
"//mojo/public/java:application",
- "//mojo/services/speech_recognizer/public/interfaces:interfaces_java",
+ "//mojo/services/speech_recognizer/interfaces:interfaces_java",
]
}
diff --git a/services/surfaces/BUILD.gn b/services/surfaces/BUILD.gn
index c4e268a..1cdc736 100644
--- a/services/surfaces/BUILD.gn
+++ b/services/surfaces/BUILD.gn
@@ -42,7 +42,7 @@
"//mojo/public/cpp/system",
"//mojo/services/geometry/interfaces",
"//mojo/services/gpu/interfaces",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/interfaces",
"//ui/gfx/geometry",
]
}
diff --git a/services/surfaces/display_factory_impl.h b/services/surfaces/display_factory_impl.h
index d500fe6..745b9f0 100644
--- a/services/surfaces/display_factory_impl.h
+++ b/services/surfaces/display_factory_impl.h
@@ -6,7 +6,7 @@
#define SERVICES_SURFACES_DISPLAY_FACTORY_IMPL_H_
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/interfaces/display.mojom.h"
#include "services/surfaces/display_impl.h"
namespace cc {
diff --git a/services/surfaces/display_impl.h b/services/surfaces/display_impl.h
index e6af5ce..50bac99 100644
--- a/services/surfaces/display_impl.h
+++ b/services/surfaces/display_impl.h
@@ -10,7 +10,7 @@
#include "cc/surfaces/surface_factory.h"
#include "cc/surfaces/surface_factory_client.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/interfaces/display.mojom.h"
namespace cc {
class Display;
diff --git a/services/surfaces/surfaces_impl.h b/services/surfaces/surfaces_impl.h
index 43decd3..84f11d8 100644
--- a/services/surfaces/surfaces_impl.h
+++ b/services/surfaces/surfaces_impl.h
@@ -12,7 +12,7 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
#include "mojo/services/gpu/interfaces/viewport_parameter_listener.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace cc {
class Display;
diff --git a/services/surfaces/surfaces_service_application.h b/services/surfaces/surfaces_service_application.h
index 092696f..8e3c12b 100644
--- a/services/surfaces/surfaces_service_application.h
+++ b/services/surfaces/surfaces_service_application.h
@@ -10,8 +10,8 @@
#include "mojo/common/tracing_impl.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
namespace mojo {
class ApplicationConnection;
diff --git a/services/tracing/BUILD.gn b/services/tracing/BUILD.gn
index 0ac1bb6..ae3e221 100644
--- a/services/tracing/BUILD.gn
+++ b/services/tracing/BUILD.gn
@@ -23,6 +23,6 @@
"//mojo/data_pipe_utils",
"//mojo/public/cpp/application",
"//mojo/public/cpp/system",
- "//mojo/services/tracing/public/interfaces",
+ "//mojo/services/tracing/interfaces",
]
}
diff --git a/services/tracing/trace_recorder_impl.h b/services/tracing/trace_recorder_impl.h
index e3a5ef9..2f8aa3a 100644
--- a/services/tracing/trace_recorder_impl.h
+++ b/services/tracing/trace_recorder_impl.h
@@ -8,7 +8,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/string.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
#include "services/tracing/trace_data_sink.h"
namespace tracing {
diff --git a/services/tracing/tracing_app.h b/services/tracing/tracing_app.h
index d562a3f..19c88c2 100644
--- a/services/tracing/tracing_app.h
+++ b/services/tracing/tracing_app.h
@@ -12,7 +12,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
#include "services/tracing/trace_data_sink.h"
#include "services/tracing/trace_recorder_impl.h"
diff --git a/services/url_response_disk_cache/BUILD.gn b/services/url_response_disk_cache/BUILD.gn
index 2adba41..0a0938f 100644
--- a/services/url_response_disk_cache/BUILD.gn
+++ b/services/url_response_disk_cache/BUILD.gn
@@ -37,7 +37,7 @@
"//mojo/public/cpp/application",
"//mojo/public/cpp/system",
"//mojo/public/interfaces/network",
- "//mojo/services/url_response_disk_cache/public/interfaces",
+ "//mojo/services/url_response_disk_cache/interfaces",
"//third_party/zlib:zip",
"//url:url",
]
@@ -83,7 +83,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system:system",
"//mojo/services/network/public/interfaces:interfaces",
- "//mojo/services/url_response_disk_cache/public/interfaces",
+ "//mojo/services/url_response_disk_cache/interfaces",
]
data_deps = [ ":url_response_disk_cache" ]
diff --git a/services/url_response_disk_cache/url_response_disk_cache_app.h b/services/url_response_disk_cache/url_response_disk_cache_app.h
index 5f5a701..776db21 100644
--- a/services/url_response_disk_cache/url_response_disk_cache_app.h
+++ b/services/url_response_disk_cache/url_response_disk_cache_app.h
@@ -13,7 +13,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
#include "services/url_response_disk_cache/url_response_disk_cache_db.h"
#include "services/url_response_disk_cache/url_response_disk_cache_delegate.h"
diff --git a/services/url_response_disk_cache/url_response_disk_cache_apptest.cc b/services/url_response_disk_cache/url_response_disk_cache_apptest.cc
index 1ef3bcd..af5a139 100644
--- a/services/url_response_disk_cache/url_response_disk_cache_apptest.cc
+++ b/services/url_response_disk_cache/url_response_disk_cache_apptest.cc
@@ -10,7 +10,7 @@
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/system/data_pipe.h"
#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
#include "services/url_response_disk_cache/kTestData.h"
namespace mojo {
diff --git a/services/url_response_disk_cache/url_response_disk_cache_impl.h b/services/url_response_disk_cache/url_response_disk_cache_impl.h
index 6f4e64f..6d8bc66 100644
--- a/services/url_response_disk_cache/url_response_disk_cache_impl.h
+++ b/services/url_response_disk_cache/url_response_disk_cache_impl.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/task_runner.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
#include "services/url_response_disk_cache/url_response_disk_cache_db.h"
#include "services/url_response_disk_cache/url_response_disk_cache_delegate.h"
diff --git a/services/view_manager/BUILD.gn b/services/view_manager/BUILD.gn
index d678107..6dc39c6 100644
--- a/services/view_manager/BUILD.gn
+++ b/services/view_manager/BUILD.gn
@@ -87,8 +87,8 @@
"//mojo/services/geometry/interfaces",
"//mojo/services/input_events/interfaces",
"//mojo/services/native_viewport/interfaces",
- "//mojo/services/surfaces/public/cpp",
- "//mojo/services/surfaces/public/interfaces",
+ "//mojo/services/surfaces/cpp",
+ "//mojo/services/surfaces/interfaces",
"//mojo/services/view_manager/public/interfaces",
"//mojo/services/view_manager/public/cpp:common",
"//mojo/services/window_manager/public/interfaces",
diff --git a/services/view_manager/display_manager.cc b/services/view_manager/display_manager.cc
index 6fd1b33..b6ec195 100644
--- a/services/view_manager/display_manager.cc
+++ b/services/view_manager/display_manager.cc
@@ -10,9 +10,9 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/services/gpu/interfaces/gpu.mojom.h"
-#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
-#include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
+#include "mojo/services/surfaces/cpp/surfaces_utils.h"
+#include "mojo/services/surfaces/interfaces/quads.mojom.h"
+#include "mojo/services/surfaces/interfaces/surfaces.mojom.h"
#include "services/view_manager/connection_manager.h"
#include "services/view_manager/server_view.h"
#include "services/view_manager/view_coordinate_conversions.h"
diff --git a/services/view_manager/display_manager.h b/services/view_manager/display_manager.h
index ad71d1f..9d308a1 100644
--- a/services/view_manager/display_manager.h
+++ b/services/view_manager/display_manager.h
@@ -13,7 +13,7 @@
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
-#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/interfaces/display.mojom.h"
#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
#include "ui/gfx/rect.h"
diff --git a/services/view_manager/view_manager_service_impl.h b/services/view_manager/view_manager_service_impl.h
index e92e1fa..d4d7f81 100644
--- a/services/view_manager/view_manager_service_impl.h
+++ b/services/view_manager/view_manager_service_impl.h
@@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "base/containers/hash_tables.h"
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
#include "services/view_manager/access_policy_delegate.h"
#include "services/view_manager/ids.h"
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index 3b0929f..774a6d3 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -204,7 +204,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
"//mojo/services/network/public/interfaces",
- "//mojo/services/tracing/public/interfaces",
+ "//mojo/services/tracing/interfaces",
"//services/url_response_disk_cache",
"//shell/application_manager",
"//url",
@@ -361,7 +361,7 @@
"//services/native_viewport:interfaces_java",
"//services/nfc_message_sink:bindings_java",
"//services/sharing_sink:bindings_java",
- "//mojo/services/nfc/public/interfaces:interfaces_java",
+ "//mojo/services/nfc/interfaces:interfaces_java",
"//services/keyboard",
"//services/native_viewport:native_viewport_java",
]
@@ -664,7 +664,7 @@
"//mojo/public/cpp/bindings:callback",
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system:system",
- "//mojo/services/nfc/public/interfaces",
+ "//mojo/services/nfc/interfaces",
"//shell/test:bindings",
]
}
diff --git a/shell/android/android_handler.h b/shell/android/android_handler.h
index 0607d0f..468d824 100644
--- a/shell/android/android_handler.h
+++ b/shell/android/android_handler.h
@@ -12,7 +12,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory_impl.h"
#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
namespace base {
class FilePath;
diff --git a/shell/android/nfc_apptest.cc b/shell/android/nfc_apptest.cc
index 5b9d3a5..6165925 100644
--- a/shell/android/nfc_apptest.cc
+++ b/shell/android/nfc_apptest.cc
@@ -9,7 +9,7 @@
#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/public/cpp/environment/logging.h"
#include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/nfc/public/interfaces/nfc.mojom.h"
+#include "mojo/services/nfc/interfaces/nfc.mojom.h"
namespace mojo {
namespace {
diff --git a/shell/application_manager/BUILD.gn b/shell/application_manager/BUILD.gn
index f2cb7d1..b9fb219 100644
--- a/shell/application_manager/BUILD.gn
+++ b/shell/application_manager/BUILD.gn
@@ -37,7 +37,7 @@
"//mojo/services/authenticating_url_loader_interceptor/interfaces",
"//mojo/services/authentication/interfaces",
"//mojo/services/network/public/interfaces",
- "//mojo/services/url_response_disk_cache/public/interfaces",
+ "//mojo/services/url_response_disk_cache/interfaces",
"//url",
]
deps = [
diff --git a/shell/application_manager/application_manager.h b/shell/application_manager/application_manager.h
index 9365ef4..ee47ed7 100644
--- a/shell/application_manager/application_manager.h
+++ b/shell/application_manager/application_manager.h
@@ -15,7 +15,7 @@
#include "mojo/public/interfaces/application/application.mojom.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
#include "mojo/services/network/public/interfaces/network_service.mojom.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
#include "shell/application_manager/application_loader.h"
#include "shell/application_manager/identity.h"
#include "shell/application_manager/native_application_options.h"
diff --git a/shell/application_manager/network_fetcher.h b/shell/application_manager/network_fetcher.h
index 6161dd8..357d60c 100644
--- a/shell/application_manager/network_fetcher.h
+++ b/shell/application_manager/network_fetcher.h
@@ -11,7 +11,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "mojo/services/url_response_disk_cache/public/interfaces/url_response_disk_cache.mojom.h"
+#include "mojo/services/url_response_disk_cache/interfaces/url_response_disk_cache.mojom.h"
#include "url/gurl.h"
namespace shell {
diff --git a/shell/context.cc b/shell/context.cc
index 7247559..abd30a1 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -29,7 +29,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
#include "shell/application_manager/application_loader.h"
#include "shell/application_manager/application_manager.h"
#include "shell/application_manager/native_application_options.h"
diff --git a/shell/tracer.h b/shell/tracer.h
index 604a446..db61416 100644
--- a/shell/tracer.h
+++ b/shell/tracer.h
@@ -14,7 +14,7 @@
#include "base/memory/ref_counted_memory.h"
#include "mojo/common/trace_provider_impl.h"
#include "mojo/data_pipe_utils/data_pipe_drainer.h"
-#include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
+#include "mojo/services/tracing/interfaces/tracing.mojom.h"
namespace shell {
diff --git a/ui/ozone/platform/drm/BUILD.gn b/ui/ozone/platform/drm/BUILD.gn
index e530fac..5f011b1 100644
--- a/ui/ozone/platform/drm/BUILD.gn
+++ b/ui/ozone/platform/drm/BUILD.gn
@@ -117,8 +117,8 @@
"//mojo/common",
"//mojo/converters/geometry",
"//mojo/converters/ozone_drm_gpu",
- "//mojo/services/ozone_drm_gpu/public/interfaces",
- "//mojo/services/ozone_drm_host/public/interfaces",
+ "//mojo/services/ozone_drm_gpu/interfaces",
+ "//mojo/services/ozone_drm_host/interfaces",
"//ui/base",
"//ui/display/types",
"//ui/display/util",
diff --git a/ui/ozone/platform/drm/mojo/drm_gpu_delegate.h b/ui/ozone/platform/drm/mojo/drm_gpu_delegate.h
index fa14023..2cac766 100644
--- a/ui/ozone/platform/drm/mojo/drm_gpu_delegate.h
+++ b/ui/ozone/platform/drm/mojo/drm_gpu_delegate.h
@@ -6,7 +6,7 @@
#define UI_OZONE_PLATFORM_DRM_MOJO_DRM_GPU_DELEGATE_H_
#include "base/macros.h"
-#include "mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom.h"
+#include "mojo/services/ozone_drm_host/interfaces/ozone_drm_host.mojom.h"
#include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
namespace ui {
diff --git a/ui/ozone/platform/drm/mojo/drm_gpu_impl.h b/ui/ozone/platform/drm/mojo/drm_gpu_impl.h
index bf0d117..5834ce9 100644
--- a/ui/ozone/platform/drm/mojo/drm_gpu_impl.h
+++ b/ui/ozone/platform/drm/mojo/drm_gpu_impl.h
@@ -7,7 +7,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom.h"
+#include "mojo/services/ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom.h"
#include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
namespace ui {
diff --git a/ui/ozone/platform/drm/mojo/drm_host_delegate.h b/ui/ozone/platform/drm/mojo/drm_host_delegate.h
index 033b3b2..a651781 100644
--- a/ui/ozone/platform/drm/mojo/drm_host_delegate.h
+++ b/ui/ozone/platform/drm/mojo/drm_host_delegate.h
@@ -6,7 +6,7 @@
#define UI_OZONE_PLATFORM_DRM_MOJO_DRM_HOST_DELEGATE_H_
#include "base/macros.h"
-#include "mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom.h"
+#include "mojo/services/ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom.h"
#include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
namespace ui {
diff --git a/ui/ozone/platform/drm/mojo/drm_host_impl.h b/ui/ozone/platform/drm/mojo/drm_host_impl.h
index 86f76d4..8040447 100644
--- a/ui/ozone/platform/drm/mojo/drm_host_impl.h
+++ b/ui/ozone/platform/drm/mojo/drm_host_impl.h
@@ -7,7 +7,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom.h"
+#include "mojo/services/ozone_drm_host/interfaces/ozone_drm_host.mojom.h"
#include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
namespace ui {
@@ -31,4 +31,4 @@
} // namespace ui
-#endif
\ No newline at end of file
+#endif
diff --git a/ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc b/ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc
index 172ee67..598f96b 100644
--- a/ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc
+++ b/ui/ozone/platform/drm/mojo/drm_ipc_init_helper.cc
@@ -4,8 +4,8 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom.h"
-#include "mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom.h"
+#include "mojo/services/ozone_drm_gpu/interfaces/ozone_drm_gpu.mojom.h"
+#include "mojo/services/ozone_drm_host/interfaces/ozone_drm_host.mojom.h"
#include "ui/ozone/platform/drm/mojo/drm_gpu_delegate.h"
#include "ui/ozone/platform/drm/mojo/drm_gpu_impl.h"
#include "ui/ozone/platform/drm/mojo/drm_host_delegate.h"
