Move //mojo/services/X/public/... to //mojo/services/X/... (part 2).
X = geometry,
gpu,
http_server,
icu_data,
input_events,
keyboard,
location,
native_support,
native_viewport
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1398973004 .
diff --git a/apps/moterm/BUILD.gn b/apps/moterm/BUILD.gn
index c28f108..efbe760 100644
--- a/apps/moterm/BUILD.gn
+++ b/apps/moterm/BUILD.gn
@@ -41,9 +41,9 @@
":gl_helper",
"//base",
"//mojo/application",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/gpu/public/interfaces",
- "//mojo/services/native_viewport/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/gpu/interfaces",
+ "//mojo/services/native_viewport/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
}
@@ -71,21 +71,21 @@
"//mojo/public/cpp/application",
"//mojo/public/c/gpu",
"//mojo/public/interfaces/application",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/gpu/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
forward_dependent_configs_from = [
"//mojo/public/c/gpu",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/gpu/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
public_deps = [
"//base",
"//mojo/public/c/gpu:GLES2",
- "//mojo/services/geometry/public/cpp",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/cpp",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/surfaces/public/cpp",
"//mojo/services/surfaces/public/interfaces:surface_id",
]
@@ -102,7 +102,7 @@
]
public_deps = [
- "//mojo/services/input_events/public/interfaces",
+ "//mojo/services/input_events/interfaces",
]
}
diff --git a/apps/moterm/gl_helper.cc b/apps/moterm/gl_helper.cc
index 85a801a..3ddb5d5 100644
--- a/apps/moterm/gl_helper.cc
+++ b/apps/moterm/gl_helper.cc
@@ -18,7 +18,7 @@
#include "base/task_runner.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/geometry/public/cpp/geometry_util.h"
+#include "mojo/services/geometry/cpp/geometry_util.h"
#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
// Maximum number of (live) textures to keep around.
diff --git a/apps/moterm/gl_helper.h b/apps/moterm/gl_helper.h
index 0df2fa8..8898afc 100644
--- a/apps/moterm/gl_helper.h
+++ b/apps/moterm/gl_helper.h
@@ -14,8 +14,8 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.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"
diff --git a/apps/moterm/gl_helper_test_app.cc b/apps/moterm/gl_helper_test_app.cc
index e47959f..fdabb4f 100644
--- a/apps/moterm/gl_helper_test_app.cc
+++ b/apps/moterm/gl_helper_test_app.cc
@@ -16,9 +16,9 @@
#include "mojo/application/application_runner_chromium.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/gpu/public/interfaces/context_provider.mojom.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#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"
diff --git a/apps/moterm/key_util.cc b/apps/moterm/key_util.cc
index c6ca004..b37234e 100644
--- a/apps/moterm/key_util.cc
+++ b/apps/moterm/key_util.cc
@@ -5,8 +5,8 @@
#include "apps/moterm/key_util.h"
#include "base/logging.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
-#include "mojo/services/input_events/public/interfaces/input_key_codes.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_key_codes.mojom.h"
// TODO(vtl): Handle more stuff and verify that we're consistent about the
// sequences we generate.
diff --git a/apps/moterm/key_util_unittest.cc b/apps/moterm/key_util_unittest.cc
index 54a0138..af4cb57 100644
--- a/apps/moterm/key_util_unittest.cc
+++ b/apps/moterm/key_util_unittest.cc
@@ -6,8 +6,8 @@
#include <string>
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
-#include "mojo/services/input_events/public/interfaces/input_key_codes.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_key_codes.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 82f30d6..c4d0a84 100644
--- a/apps/moterm/moterm_view.cc
+++ b/apps/moterm/moterm_view.cc
@@ -19,8 +19,8 @@
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/services/files/interfaces/file.mojom.h"
#include "mojo/services/files/interfaces/types.mojom.h"
-#include "mojo/services/input_events/public/interfaces/input_event_constants.mojom.h"
-#include "mojo/services/input_events/public/interfaces/input_events.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 "skia/ext/refptr.h"
#include "third_party/dejavu-fonts-ttf-2.34/kDejaVuSansMonoRegular.h"
diff --git a/examples/bitmap_uploader/BUILD.gn b/examples/bitmap_uploader/BUILD.gn
index 3877243..401a9d7 100644
--- a/examples/bitmap_uploader/BUILD.gn
+++ b/examples/bitmap_uploader/BUILD.gn
@@ -11,16 +11,16 @@
public_deps = [
"//base",
"//mojo/public/c/gpu",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/gpu/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
deps = [
"//mojo/application",
"//mojo/public/cpp/bindings:bindings",
"//mojo/public/interfaces/application",
- "//mojo/services/geometry/public/cpp",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/input_events/public/interfaces",
+ "//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/view_manager/public/cpp",
diff --git a/examples/bitmap_uploader/bitmap_uploader.cc b/examples/bitmap_uploader/bitmap_uploader.cc
index 8fbe65e..bce95bb 100644
--- a/examples/bitmap_uploader/bitmap_uploader.cc
+++ b/examples/bitmap_uploader/bitmap_uploader.cc
@@ -15,7 +15,7 @@
#include "base/bind.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/geometry/public/cpp/geometry_util.h"
+#include "mojo/services/geometry/cpp/geometry_util.h"
#include "mojo/services/surfaces/public/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 4ffb065..49030e3 100644
--- a/examples/bitmap_uploader/bitmap_uploader.h
+++ b/examples/bitmap_uploader/bitmap_uploader.h
@@ -11,8 +11,8 @@
#include "base/containers/hash_tables.h"
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.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"
diff --git a/examples/browser/BUILD.gn b/examples/browser/BUILD.gn
index e9eec57..41fbb39 100644
--- a/examples/browser/BUILD.gn
+++ b/examples/browser/BUILD.gn
@@ -17,7 +17,7 @@
"//examples/window_manager:bindings",
"//mojo/application",
"//mojo/converters/geometry",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/interfaces",
diff --git a/examples/embedded_app/BUILD.gn b/examples/embedded_app/BUILD.gn
index d54cf80..bd06a5b 100644
--- a/examples/embedded_app/BUILD.gn
+++ b/examples/embedded_app/BUILD.gn
@@ -15,7 +15,7 @@
"//mojo/application",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//skia:skia",
diff --git a/examples/ganesh_app/BUILD.gn b/examples/ganesh_app/BUILD.gn
index 29ff175..13b6cf9 100644
--- a/examples/ganesh_app/BUILD.gn
+++ b/examples/ganesh_app/BUILD.gn
@@ -23,8 +23,8 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//mojo/public/interfaces/application",
- "//mojo/services/geometry/public/cpp",
- "//mojo/services/geometry/public/interfaces",
+ "//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",
diff --git a/examples/ganesh_app/texture_uploader.cc b/examples/ganesh_app/texture_uploader.cc
index 08d27f1..a43a564 100644
--- a/examples/ganesh_app/texture_uploader.cc
+++ b/examples/ganesh_app/texture_uploader.cc
@@ -15,7 +15,7 @@
#include "base/trace_event/trace_event.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/geometry/public/cpp/geometry_util.h"
+#include "mojo/services/geometry/cpp/geometry_util.h"
#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
namespace examples {
diff --git a/examples/ganesh_app/texture_uploader.h b/examples/ganesh_app/texture_uploader.h
index 2a45525..086c60c 100644
--- a/examples/ganesh_app/texture_uploader.h
+++ b/examples/ganesh_app/texture_uploader.h
@@ -11,7 +11,7 @@
#include "mojo/gpu/gl_context.h"
#include "mojo/gpu/gl_texture.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.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"
diff --git a/examples/go/BUILD.gn b/examples/go/BUILD.gn
index 94d33d5..455f4c4 100644
--- a/examples/go/BUILD.gn
+++ b/examples/go/BUILD.gn
@@ -37,6 +37,7 @@
"http_handler.go",
]
deps = [
+ "//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
]
}
diff --git a/examples/go/http_handler.go b/examples/go/http_handler.go
index 14c6e43..8db9a82 100644
--- a/examples/go/http_handler.go
+++ b/examples/go/http_handler.go
@@ -12,10 +12,10 @@
"mojo/public/go/bindings"
"mojo/public/go/system"
- "mojo/services/http_server/public/interfaces/http_request"
- "mojo/services/http_server/public/interfaces/http_response"
- "mojo/services/http_server/public/interfaces/http_server"
- "mojo/services/http_server/public/interfaces/http_server_factory"
+ "mojo/services/http_server/interfaces/http_request"
+ "mojo/services/http_server/interfaces/http_response"
+ "mojo/services/http_server/interfaces/http_server"
+ "mojo/services/http_server/interfaces/http_server_factory"
"mojo/services/network/public/interfaces/net_address"
)
diff --git a/examples/http_handler/BUILD.gn b/examples/http_handler/BUILD.gn
index 05bf19b..70c719e 100644
--- a/examples/http_handler/BUILD.gn
+++ b/examples/http_handler/BUILD.gn
@@ -14,8 +14,8 @@
"//mojo/application",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//mojo/services/http_server/public/cpp",
- "//mojo/services/http_server/public/interfaces",
+ "//mojo/services/http_server/cpp",
+ "//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
"//services/http_server",
]
diff --git a/examples/http_handler/http_handler.cc b/examples/http_handler/http_handler.cc
index bf6b39e..ebe3fad 100644
--- a/examples/http_handler/http_handler.cc
+++ b/examples/http_handler/http_handler.cc
@@ -9,9 +9,9 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/bindings/interface_ptr.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "mojo/services/http_server/public/cpp/http_server_util.h"
-#include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
+#include "mojo/services/http_server/cpp/http_server_util.h"
+#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"
namespace mojo {
diff --git a/examples/js/cube.js b/examples/js/cube.js
index 57cf127..d2fd7e2 100644
--- a/examples/js/cube.js
+++ b/examples/js/cube.js
@@ -7,8 +7,8 @@
"console",
"mojo/public/js/bindings",
"mojo/public/js/core",
- "mojo/services/geometry/public/interfaces/geometry.mojom",
- "mojo/services/native_viewport/public/interfaces/native_viewport.mojom",
+ "mojo/services/geometry/interfaces/geometry.mojom",
+ "mojo/services/native_viewport/interfaces/native_viewport.mojom",
"mojo/services/public/js/application",
"services/js/modules/gl",
"services/js/modules/clock",
diff --git a/examples/keyboard_client/BUILD.gn b/examples/keyboard_client/BUILD.gn
index 49b61d6..289c2ad 100644
--- a/examples/keyboard_client/BUILD.gn
+++ b/examples/keyboard_client/BUILD.gn
@@ -14,10 +14,10 @@
"//mojo/application",
"//mojo/gpu",
"//mojo/public/interfaces/application:application__generator",
- "//mojo/services/geometry/public/cpp:cpp",
- "//mojo/services/geometry/public/interfaces:interfaces__generator",
- "//mojo/services/keyboard/public/interfaces",
- "//mojo/services/surfaces/public/cpp:cpp",
+ "//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/view_manager/public/cpp",
diff --git a/examples/keyboard_client/keyboard_client.cc b/examples/keyboard_client/keyboard_client.cc
index d9f7a62..e40206f 100644
--- a/examples/keyboard_client/keyboard_client.cc
+++ b/examples/keyboard_client/keyboard_client.cc
@@ -14,7 +14,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/keyboard/public/interfaces/keyboard.mojom.h"
+#include "mojo/services/keyboard/interfaces/keyboard.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/location/geocoder_demo.js b/examples/location/geocoder_demo.js
index 5442be4..392dd7f 100644
--- a/examples/location/geocoder_demo.js
+++ b/examples/location/geocoder_demo.js
@@ -1,5 +1,9 @@
#!mojo mojo:js_content_handler
-// Demonstate a Mojo wrapper for the Geocoder JSON API. The application
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Demonstrate a Mojo wrapper for the Geocoder JSON API. The application
// connects to geocoder_service.js which implements geocoder.mojom.
// To run this application with mojo_shell, set DIR to be the absolute path
// for this directory, then:
@@ -9,8 +13,8 @@
"console",
"mojo/public/js/core",
"mojo/public/js/unicode",
- "mojo/services/location/public/interfaces/geocoder.mojom",
- "mojo/services/location/public/interfaces/location.mojom",
+ "mojo/services/location/interfaces/geocoder.mojom",
+ "mojo/services/location/interfaces/location.mojom",
"mojo/services/public/js/application",
"third_party/js/url",
], function(console, core, unicode, geocoder, location, application, url) {
diff --git a/examples/location/location.sky b/examples/location/location.sky
index eb574fc..24f39f1 100644
--- a/examples/location/location.sky
+++ b/examples/location/location.sky
@@ -11,7 +11,7 @@
import 'package:sky/framework/embedder.dart';
-import 'package:mojo/services/location/public/interfaces/location_service.mojom.dart';
+import 'package:mojo/services/location/interfaces/location_service.mojom.dart';
main() async {
var locationService = new LocationServiceProxy.unbound();
diff --git a/examples/moterm_example_app/BUILD.gn b/examples/moterm_example_app/BUILD.gn
index 0319d43..72c9674 100644
--- a/examples/moterm_example_app/BUILD.gn
+++ b/examples/moterm_example_app/BUILD.gn
@@ -17,7 +17,7 @@
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
"//mojo/services/files/interfaces",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/terminal/public/interfaces",
]
diff --git a/examples/native_run_app/BUILD.gn b/examples/native_run_app/BUILD.gn
index aa00f90..38d5e48 100644
--- a/examples/native_run_app/BUILD.gn
+++ b/examples/native_run_app/BUILD.gn
@@ -15,7 +15,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
"//mojo/services/files/interfaces",
- "//mojo/services/native_support/public/interfaces",
+ "//mojo/services/native_support/interfaces",
"//mojo/services/terminal/public/interfaces",
]
}
diff --git a/examples/native_run_app/native_run_app.cc b/examples/native_run_app/native_run_app.cc
index ea4ed82..96abace 100644
--- a/examples/native_run_app/native_run_app.cc
+++ b/examples/native_run_app/native_run_app.cc
@@ -33,7 +33,7 @@
#include "mojo/services/files/interfaces/ioctl.mojom.h"
#include "mojo/services/files/interfaces/ioctl_terminal.mojom.h"
#include "mojo/services/files/interfaces/types.mojom.h"
-#include "mojo/services/native_support/public/interfaces/process.mojom.h"
+#include "mojo/services/native_support/interfaces/process.mojom.h"
#include "mojo/services/terminal/public/interfaces/terminal_client.mojom.h"
using mojo::terminal::TerminalClient;
diff --git a/examples/nesting_app/BUILD.gn b/examples/nesting_app/BUILD.gn
index db68c7a..908d6fd 100644
--- a/examples/nesting_app/BUILD.gn
+++ b/examples/nesting_app/BUILD.gn
@@ -16,7 +16,7 @@
"//mojo/application",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//skia",
diff --git a/examples/nfc_sender/BUILD.gn b/examples/nfc_sender/BUILD.gn
index c64ebd1..e5cae78 100644
--- a/examples/nfc_sender/BUILD.gn
+++ b/examples/nfc_sender/BUILD.gn
@@ -15,7 +15,7 @@
"//mojo/gpu",
"//mojo/common",
"//mojo/public/interfaces/application:application__generator",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/nfc/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/skia",
diff --git a/examples/pdf_viewer/BUILD.gn b/examples/pdf_viewer/BUILD.gn
index 2ca8038..e9dcc01 100644
--- a/examples/pdf_viewer/BUILD.gn
+++ b/examples/pdf_viewer/BUILD.gn
@@ -17,7 +17,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
"//mojo/services/content_handler/interfaces",
- "//mojo/services/input_events/public/interfaces",
+ "//mojo/services/input_events/interfaces",
"//mojo/services/network/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//third_party/pdfium",
diff --git a/examples/pdf_viewer/pdf_viewer.cc b/examples/pdf_viewer/pdf_viewer.cc
index 681ea50..3869266 100644
--- a/examples/pdf_viewer/pdf_viewer.cc
+++ b/examples/pdf_viewer/pdf_viewer.cc
@@ -15,8 +15,8 @@
#include "mojo/public/cpp/application/interface_factory_impl.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/services/content_handler/interfaces/content_handler.mojom.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
-#include "mojo/services/input_events/public/interfaces/input_key_codes.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_key_codes.mojom.h"
#include "mojo/services/view_manager/public/cpp/types.h"
#include "mojo/services/view_manager/public/cpp/view.h"
#include "mojo/services/view_manager/public/cpp/view_manager.h"
diff --git a/examples/spinning_cube/BUILD.gn b/examples/spinning_cube/BUILD.gn
index 5143ac4..29eb6a9 100644
--- a/examples/spinning_cube/BUILD.gn
+++ b/examples/spinning_cube/BUILD.gn
@@ -21,8 +21,8 @@
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/native_viewport/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/native_viewport/interfaces",
]
}
diff --git a/examples/spinning_cube/gles2_client_impl.h b/examples/spinning_cube/gles2_client_impl.h
index 9b3f2db..4ba6600 100644
--- a/examples/spinning_cube/gles2_client_impl.h
+++ b/examples/spinning_cube/gles2_client_impl.h
@@ -7,8 +7,8 @@
#include "examples/spinning_cube/spinning_cube.h"
#include "mojo/public/c/gpu/MGL/mgl.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
namespace examples {
diff --git a/examples/spinning_cube/spinning_cube_app.cc b/examples/spinning_cube/spinning_cube_app.cc
index bf4dcf0..613510d 100644
--- a/examples/spinning_cube/spinning_cube_app.cc
+++ b/examples/spinning_cube/spinning_cube_app.cc
@@ -16,7 +16,7 @@
#include "mojo/public/cpp/system/core.h"
#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
namespace examples {
diff --git a/examples/surfaces_app/BUILD.gn b/examples/surfaces_app/BUILD.gn
index f8fae69..6a8e8a0 100644
--- a/examples/surfaces_app/BUILD.gn
+++ b/examples/surfaces_app/BUILD.gn
@@ -32,9 +32,9 @@
"//mojo/converters/surfaces",
"//mojo/environment:chromium",
"//mojo/public/cpp/system",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/gpu/public/interfaces",
- "//mojo/services/native_viewport/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/gpu/interfaces",
+ "//mojo/services/native_viewport/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
@@ -61,7 +61,7 @@
"//mojo/converters/surfaces",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
"//skia",
@@ -97,8 +97,8 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/gpu/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
"//skia",
@@ -129,7 +129,7 @@
mojom("bindings") {
deps = [
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
]
diff --git a/examples/surfaces_app/child.mojom b/examples/surfaces_app/child.mojom
index 1dd60cf..18bf281 100644
--- a/examples/surfaces_app/child.mojom
+++ b/examples/surfaces_app/child.mojom
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import "mojo/services/geometry/public/interfaces/geometry.mojom";
+import "mojo/services/geometry/interfaces/geometry.mojom";
import "mojo/services/surfaces/public/interfaces/quads.mojom";
import "mojo/services/surfaces/public/interfaces/surface_id.mojom";
diff --git a/examples/surfaces_app/child_gl_app.cc b/examples/surfaces_app/child_gl_app.cc
index 7866748..029fbfc 100644
--- a/examples/surfaces_app/child_gl_app.cc
+++ b/examples/surfaces_app/child_gl_app.cc
@@ -11,7 +11,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/bindings/string.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
+#include "mojo/services/gpu/interfaces/gpu.mojom.h"
namespace mojo {
namespace examples {
diff --git a/examples/surfaces_app/child_gl_impl.h b/examples/surfaces_app/child_gl_impl.h
index 6dca282..081ad6f 100644
--- a/examples/surfaces_app/child_gl_impl.h
+++ b/examples/surfaces_app/child_gl_impl.h
@@ -16,7 +16,7 @@
#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/gpu/public/interfaces/command_buffer.mojom.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 "third_party/skia/include/core/SkColor.h"
diff --git a/examples/surfaces_app/surfaces_app.cc b/examples/surfaces_app/surfaces_app.cc
index 2e07629..7e4ae37 100644
--- a/examples/surfaces_app/surfaces_app.cc
+++ b/examples/surfaces_app/surfaces_app.cc
@@ -17,9 +17,9 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/system/core.h"
-#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#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 "ui/gfx/rect.h"
diff --git a/examples/window_manager/BUILD.gn b/examples/window_manager/BUILD.gn
index 1fcee9c..33982c5 100644
--- a/examples/window_manager/BUILD.gn
+++ b/examples/window_manager/BUILD.gn
@@ -22,8 +22,8 @@
"//mojo/converters/input_events",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/input_events/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/input_events/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//services/window_manager:lib",
@@ -39,7 +39,7 @@
]
import_dirs = [ get_path_info("../../mojo/services", "abspath") ]
deps = [
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/network/public/interfaces",
]
diff --git a/examples/window_manager/window_manager.cc b/examples/window_manager/window_manager.cc
index 2119238..f9fcfd7 100644
--- a/examples/window_manager/window_manager.cc
+++ b/examples/window_manager/window_manager.cc
@@ -16,7 +16,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
#include "mojo/services/view_manager/public/cpp/view.h"
#include "mojo/services/view_manager/public/cpp/view_manager.h"
diff --git a/examples/window_manager/window_manager.mojom b/examples/window_manager/window_manager.mojom
index e715a82..d2e161f 100644
--- a/examples/window_manager/window_manager.mojom
+++ b/examples/window_manager/window_manager.mojom
@@ -4,7 +4,7 @@
module examples;
-import "mojo/services/geometry/public/interfaces/geometry.mojom";
+import "mojo/services/geometry/interfaces/geometry.mojom";
interface IWindowManager {
CloseWindow(uint32 node_id);
diff --git a/examples/wm_flow/BUILD.gn b/examples/wm_flow/BUILD.gn
index b069b82..823b5c9 100644
--- a/examples/wm_flow/BUILD.gn
+++ b/examples/wm_flow/BUILD.gn
@@ -18,9 +18,9 @@
output_name = "wm_flow_wm"
sources = [
- "wm/wm.cc",
"wm/frame_controller.cc",
"wm/frame_controller.h",
+ "wm/wm.cc",
]
deps = [
@@ -29,7 +29,7 @@
"//mojo/application",
"//mojo/converters/geometry",
"//mojo/public/interfaces/application",
- "//mojo/services/input_events/public/interfaces",
+ "//mojo/services/input_events/interfaces",
"//mojo/services/view_manager/public/cpp",
"//services/window_manager:lib",
"//skia",
diff --git a/examples/wm_flow/wm/wm.cc b/examples/wm_flow/wm/wm.cc
index 588e312..5b11f58 100644
--- a/examples/wm_flow/wm/wm.cc
+++ b/examples/wm_flow/wm/wm.cc
@@ -8,7 +8,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.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/mojo/converters/geometry/BUILD.gn b/mojo/converters/geometry/BUILD.gn
index 634bfe4..164f12c 100644
--- a/mojo/converters/geometry/BUILD.gn
+++ b/mojo/converters/geometry/BUILD.gn
@@ -14,7 +14,7 @@
"//ui/gfx/geometry",
"//mojo/environment:chromium",
"//mojo/public/c/system",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
]
sources = [
diff --git a/mojo/converters/geometry/geometry_type_converters.h b/mojo/converters/geometry/geometry_type_converters.h
index b44144b..7dfc0a6 100644
--- a/mojo/converters/geometry/geometry_type_converters.h
+++ b/mojo/converters/geometry/geometry_type_converters.h
@@ -5,7 +5,7 @@
#ifndef MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
#define MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/point_f.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn
index 7ca96f4..c95808e 100644
--- a/mojo/converters/input_events/BUILD.gn
+++ b/mojo/converters/input_events/BUILD.gn
@@ -18,7 +18,7 @@
"//mojo/converters/geometry",
"//mojo/environment:chromium",
"//mojo/public/c/system",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/input_events/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/input_events/interfaces",
]
}
diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc
index e5b37df..6f2495f 100644
--- a/mojo/converters/input_events/input_events_type_converters.cc
+++ b/mojo/converters/input_events/input_events_type_converters.cc
@@ -14,7 +14,7 @@
#include "base/time/time.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/mojo_extended_key_event_data.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "ui/events/keycodes/keyboard_codes.h"
namespace mojo {
diff --git a/mojo/converters/input_events/input_events_type_converters.h b/mojo/converters/input_events/input_events_type_converters.h
index 4cbe3a1..df3d01d 100644
--- a/mojo/converters/input_events/input_events_type_converters.h
+++ b/mojo/converters/input_events/input_events_type_converters.h
@@ -6,7 +6,7 @@
#define MOJO_CONVERTERS_INPUT_EVENTS_INPUT_EVENTS_TYPE_CONVERTERS_H_
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "ui/events/event.h"
namespace mojo {
diff --git a/mojo/converters/native_viewport/BUILD.gn b/mojo/converters/native_viewport/BUILD.gn
index c70f119..b4b2cee 100644
--- a/mojo/converters/native_viewport/BUILD.gn
+++ b/mojo/converters/native_viewport/BUILD.gn
@@ -13,6 +13,6 @@
"//ui/gl",
"//mojo/environment:chromium",
"//mojo/public/c/system",
- "//mojo/services/native_viewport/public/interfaces",
+ "//mojo/services/native_viewport/interfaces",
]
}
diff --git a/mojo/converters/native_viewport/surface_configuration_type_converters.h b/mojo/converters/native_viewport/surface_configuration_type_converters.h
index 4389adf..c465c53 100644
--- a/mojo/converters/native_viewport/surface_configuration_type_converters.h
+++ b/mojo/converters/native_viewport/surface_configuration_type_converters.h
@@ -6,7 +6,7 @@
#define MOJO_CONVERTERS_NATIVE_VIEWPORT_SURFACE_CONFIGURATION_TYPE_CONVERTERS_H_
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
#include "ui/gl/gl_surface.h"
namespace mojo {
diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn
index 4d8e2e8..c7881bb 100644
--- a/mojo/converters/surfaces/tests/BUILD.gn
+++ b/mojo/converters/surfaces/tests/BUILD.gn
@@ -15,7 +15,7 @@
"//mojo/converters/surfaces",
"//mojo/edk/test:run_all_unittests",
"//mojo/environment:chromium",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//skia",
"//testing/gtest",
diff --git a/mojo/gles2/BUILD.gn b/mojo/gles2/BUILD.gn
index bb67923..6ff568a 100644
--- a/mojo/gles2/BUILD.gn
+++ b/mojo/gles2/BUILD.gn
@@ -36,7 +36,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//services/gles2:lib",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/gpu/interfaces",
]
}
diff --git a/mojo/gles2/command_buffer_client_impl.h b/mojo/gles2/command_buffer_client_impl.h
index 1db0ae3..90d3fc5 100644
--- a/mojo/gles2/command_buffer_client_impl.h
+++ b/mojo/gles2/command_buffer_client_impl.h
@@ -13,7 +13,7 @@
#include "gpu/command_buffer/common/command_buffer.h"
#include "gpu/command_buffer/common/command_buffer_shared.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
namespace base {
class RunLoop;
diff --git a/mojo/gpu/BUILD.gn b/mojo/gpu/BUILD.gn
index 9b6a7a2..3f2687f 100644
--- a/mojo/gpu/BUILD.gn
+++ b/mojo/gpu/BUILD.gn
@@ -39,9 +39,9 @@
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
- "//mojo/services/geometry/public/cpp",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/gpu/public/interfaces",
+ "//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",
@@ -64,7 +64,7 @@
"//mojo/application",
"//mojo/application:test_support",
"//mojo/public/cpp/bindings:callback",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
"//testing/gtest",
]
diff --git a/mojo/gpu/gl_context.cc b/mojo/gpu/gl_context.cc
index e12c710..691292e 100644
--- a/mojo/gpu/gl_context.cc
+++ b/mojo/gpu/gl_context.cc
@@ -6,7 +6,7 @@
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
+#include "mojo/services/gpu/interfaces/gpu.mojom.h"
#include "mojo/gpu/mojo_gles2_impl_autogen.h"
namespace mojo {
diff --git a/mojo/gpu/gl_texture.h b/mojo/gpu/gl_texture.h
index 4a2e71b..93a9904 100644
--- a/mojo/gpu/gl_texture.h
+++ b/mojo/gpu/gl_texture.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "mojo/gpu/gl_context.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
namespace mojo {
diff --git a/mojo/gpu/texture_cache.cc b/mojo/gpu/texture_cache.cc
index f2cac43..ca68003 100644
--- a/mojo/gpu/texture_cache.cc
+++ b/mojo/gpu/texture_cache.cc
@@ -10,7 +10,7 @@
#include "mojo/gpu/gl_context.h"
#include "mojo/gpu/gl_texture.h"
#include "mojo/gpu/texture_cache.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
namespace mojo {
diff --git a/mojo/gpu/texture_cache_unittest.cc b/mojo/gpu/texture_cache_unittest.cc
index 348e41e..7e040b7 100644
--- a/mojo/gpu/texture_cache_unittest.cc
+++ b/mojo/gpu/texture_cache_unittest.cc
@@ -10,7 +10,7 @@
#include "mojo/gpu/gl_texture.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/gpu/texture_uploader.cc b/mojo/gpu/texture_uploader.cc
index 858c6ad..e4b2517 100644
--- a/mojo/gpu/texture_uploader.cc
+++ b/mojo/gpu/texture_uploader.cc
@@ -11,7 +11,7 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2extmojo.h>
-#include "mojo/services/geometry/public/cpp/geometry_util.h"
+#include "mojo/services/geometry/cpp/geometry_util.h"
#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
namespace mojo {
diff --git a/mojo/icu/BUILD.gn b/mojo/icu/BUILD.gn
index bd32738..554b52b 100644
--- a/mojo/icu/BUILD.gn
+++ b/mojo/icu/BUILD.gn
@@ -33,7 +33,7 @@
"//mojo/public/cpp/application",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//mojo/services/icu_data/public/interfaces",
+ "//mojo/services/icu_data/interfaces",
"//third_party/icu",
":generate_icu_constants",
]
diff --git a/mojo/icu/icu.cc b/mojo/icu/icu.cc
index dd452a8..803b3d7 100644
--- a/mojo/icu/icu.cc
+++ b/mojo/icu/icu.cc
@@ -6,7 +6,7 @@
#include "mojo/icu/constants.h"
#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/icu_data/public/interfaces/icu_data.mojom.h"
+#include "mojo/services/icu_data/interfaces/icu_data.mojom.h"
#include "third_party/icu/source/common/unicode/putil.h"
#include "third_party/icu/source/common/unicode/udata.h"
diff --git a/mojo/services/geometry/public/cpp/BUILD.gn b/mojo/services/geometry/cpp/BUILD.gn
similarity index 85%
rename from mojo/services/geometry/public/cpp/BUILD.gn
rename to mojo/services/geometry/cpp/BUILD.gn
index c527c93..2a42aa0 100644
--- a/mojo/services/geometry/public/cpp/BUILD.gn
+++ b/mojo/services/geometry/cpp/BUILD.gn
@@ -7,7 +7,7 @@
mojo_sdk_source_set("cpp") {
restrict_external_deps = false
- public_configs = [ "../../../public/build/config:mojo_services" ]
+ public_configs = [ "../../public/build/config:mojo_services" ]
sources = [
"geometry_util.h",
]
diff --git a/mojo/services/geometry/public/cpp/geometry_util.h b/mojo/services/geometry/cpp/geometry_util.h
similarity index 78%
rename from mojo/services/geometry/public/cpp/geometry_util.h
rename to mojo/services/geometry/cpp/geometry_util.h
index f69fac3..3d4d35e 100644
--- a/mojo/services/geometry/public/cpp/geometry_util.h
+++ b/mojo/services/geometry/cpp/geometry_util.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_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_
-#define MOJO_SERVICES_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_
+#ifndef MOJO_SERVICES_GEOMETRY_CPP_GEOMETRY_UTIL_H_
+#define MOJO_SERVICES_GEOMETRY_CPP_GEOMETRY_UTIL_H_
-#include "geometry/public/interfaces/geometry.mojom.h"
+#include "geometry/interfaces/geometry.mojom.h"
namespace mojo {
@@ -34,6 +34,6 @@
return !(lhs == rhs);
}
-}
+} // namespace mojo
-#endif // MOJO_SERVICES_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_
+#endif // MOJO_SERVICES_GEOMETRY_CPP_GEOMETRY_UTIL_H_
diff --git a/mojo/services/geometry/public/interfaces/BUILD.gn b/mojo/services/geometry/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/geometry/public/interfaces/BUILD.gn
rename to mojo/services/geometry/interfaces/BUILD.gn
diff --git a/mojo/services/geometry/public/interfaces/geometry.mojom b/mojo/services/geometry/interfaces/geometry.mojom
similarity index 100%
rename from mojo/services/geometry/public/interfaces/geometry.mojom
rename to mojo/services/geometry/interfaces/geometry.mojom
diff --git a/mojo/services/gpu/public/interfaces/BUILD.gn b/mojo/services/gpu/interfaces/BUILD.gn
similarity index 82%
rename from mojo/services/gpu/public/interfaces/BUILD.gn
rename to mojo/services/gpu/interfaces/BUILD.gn
index ec061df..a86d3e2 100644
--- a/mojo/services/gpu/public/interfaces/BUILD.gn
+++ b/mojo/services/gpu/interfaces/BUILD.gn
@@ -14,9 +14,9 @@
"viewport_parameter_listener.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
deps = [
- "../../../geometry/public/interfaces",
+ "../../geometry/interfaces",
]
}
diff --git a/mojo/services/gpu/public/interfaces/command_buffer.mojom b/mojo/services/gpu/interfaces/command_buffer.mojom
similarity index 96%
rename from mojo/services/gpu/public/interfaces/command_buffer.mojom
rename to mojo/services/gpu/interfaces/command_buffer.mojom
index 46e18e4..3376499 100644
--- a/mojo/services/gpu/public/interfaces/command_buffer.mojom
+++ b/mojo/services/gpu/interfaces/command_buffer.mojom
@@ -5,7 +5,7 @@
[DartPackage="mojo_services"]
module mojo;
-import "gpu/public/interfaces/gpu_capabilities.mojom";
+import "gpu/interfaces/gpu_capabilities.mojom";
struct CommandBufferState {
int32 num_entries;
diff --git a/mojo/services/gpu/public/interfaces/context_provider.mojom b/mojo/services/gpu/interfaces/context_provider.mojom
similarity index 90%
rename from mojo/services/gpu/public/interfaces/context_provider.mojom
rename to mojo/services/gpu/interfaces/context_provider.mojom
index 88950e5..9c6cc52 100644
--- a/mojo/services/gpu/public/interfaces/context_provider.mojom
+++ b/mojo/services/gpu/interfaces/context_provider.mojom
@@ -5,8 +5,8 @@
[DartPackage="mojo_services"]
module mojo;
-import "gpu/public/interfaces/command_buffer.mojom";
-import "gpu/public/interfaces/viewport_parameter_listener.mojom";
+import "gpu/interfaces/command_buffer.mojom";
+import "gpu/interfaces/viewport_parameter_listener.mojom";
// A ContextProvider can be used to provide new command buffers related to a
// particular context, for instance configured to draw to a particular display.
diff --git a/mojo/services/gpu/public/interfaces/gpu.mojom b/mojo/services/gpu/interfaces/gpu.mojom
similarity index 86%
rename from mojo/services/gpu/public/interfaces/gpu.mojom
rename to mojo/services/gpu/interfaces/gpu.mojom
index a448ed9..dae6363 100644
--- a/mojo/services/gpu/public/interfaces/gpu.mojom
+++ b/mojo/services/gpu/interfaces/gpu.mojom
@@ -5,7 +5,7 @@
[DartPackage="mojo_services"]
module mojo;
-import "gpu/public/interfaces/command_buffer.mojom";
+import "gpu/interfaces/command_buffer.mojom";
interface Gpu {
// Creates a new offscreen OpenGL ES 2.0 context.
diff --git a/mojo/services/gpu/public/interfaces/gpu_capabilities.mojom b/mojo/services/gpu/interfaces/gpu_capabilities.mojom
similarity index 100%
rename from mojo/services/gpu/public/interfaces/gpu_capabilities.mojom
rename to mojo/services/gpu/interfaces/gpu_capabilities.mojom
diff --git a/mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom b/mojo/services/gpu/interfaces/viewport_parameter_listener.mojom
similarity index 100%
rename from mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom
rename to mojo/services/gpu/interfaces/viewport_parameter_listener.mojom
diff --git a/mojo/services/http_server/public/cpp/BUILD.gn b/mojo/services/http_server/cpp/BUILD.gn
similarity index 88%
rename from mojo/services/http_server/public/cpp/BUILD.gn
rename to mojo/services/http_server/cpp/BUILD.gn
index 4fca6c7..1f05bbd 100644
--- a/mojo/services/http_server/public/cpp/BUILD.gn
+++ b/mojo/services/http_server/cpp/BUILD.gn
@@ -7,7 +7,7 @@
mojo_sdk_source_set("cpp") {
restrict_external_deps = false
- public_configs = [ "../../../public/build/config:mojo_services" ]
+ public_configs = [ "../../public/build/config:mojo_services" ]
sources = [
"http_server_util.h",
"lib/http_server_util.cc",
diff --git a/mojo/services/http_server/public/cpp/http_server_util.h b/mojo/services/http_server/cpp/http_server_util.h
similarity index 64%
rename from mojo/services/http_server/public/cpp/http_server_util.h
rename to mojo/services/http_server/cpp/http_server_util.h
index e2041e8..252fc9a 100644
--- a/mojo/services/http_server/public/cpp/http_server_util.h
+++ b/mojo/services/http_server/cpp/http_server_util.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 SERVICES_HTTP_SERVER_PUBLIC_HTTP_SERVER_UTIL_H_
-#define SERVICES_HTTP_SERVER_PUBLIC_HTTP_SERVER_UTIL_H_
+#ifndef SERVICES_HTTP_SERVER_HTTP_SERVER_UTIL_H_
+#define SERVICES_HTTP_SERVER_HTTP_SERVER_UTIL_H_
-#include "http_server/public/interfaces/http_response.mojom.h"
+#include "http_server/interfaces/http_response.mojom.h"
namespace http_server {
@@ -14,4 +14,4 @@
const std::string& body);
} // namespace http_server
-#endif // SERVICES_HTTP_SERVER_PUBLIC_HTTP_SERVER_UTIL_H_
+#endif // SERVICES_HTTP_SERVER_HTTP_SERVER_UTIL_H_
diff --git a/mojo/services/http_server/public/cpp/lib/http_server_util.cc b/mojo/services/http_server/cpp/lib/http_server_util.cc
similarity index 95%
rename from mojo/services/http_server/public/cpp/lib/http_server_util.cc
rename to mojo/services/http_server/cpp/lib/http_server_util.cc
index 4307bea..2e28dd8 100644
--- a/mojo/services/http_server/public/cpp/lib/http_server_util.cc
+++ b/mojo/services/http_server/cpp/lib/http_server_util.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 "http_server/public/cpp/http_server_util.h"
+#include "http_server/cpp/http_server_util.h"
#include "mojo/public/cpp/environment/logging.h"
#include "mojo/public/cpp/system/data_pipe.h"
diff --git a/mojo/services/http_server/public/interfaces/BUILD.gn b/mojo/services/http_server/interfaces/BUILD.gn
similarity index 85%
rename from mojo/services/http_server/public/interfaces/BUILD.gn
rename to mojo/services/http_server/interfaces/BUILD.gn
index 79aa6a6..3619ccc 100644
--- a/mojo/services/http_server/public/interfaces/BUILD.gn
+++ b/mojo/services/http_server/interfaces/BUILD.gn
@@ -13,12 +13,12 @@
"http_server_factory.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
if (defined(mojo_network_service_root)) {
import_dirs += [ mojo_network_service_root ]
} else {
- mojo_network_service_root = "../../.."
+ mojo_network_service_root = "../.."
}
deps = [
diff --git a/mojo/services/http_server/public/interfaces/http_request.mojom b/mojo/services/http_server/interfaces/http_request.mojom
similarity index 100%
rename from mojo/services/http_server/public/interfaces/http_request.mojom
rename to mojo/services/http_server/interfaces/http_request.mojom
diff --git a/mojo/services/http_server/public/interfaces/http_response.mojom b/mojo/services/http_server/interfaces/http_response.mojom
similarity index 100%
rename from mojo/services/http_server/public/interfaces/http_response.mojom
rename to mojo/services/http_server/interfaces/http_response.mojom
diff --git a/mojo/services/http_server/public/interfaces/http_server.mojom b/mojo/services/http_server/interfaces/http_server.mojom
similarity index 87%
rename from mojo/services/http_server/public/interfaces/http_server.mojom
rename to mojo/services/http_server/interfaces/http_server.mojom
index 0a8d6a6..26e988c 100644
--- a/mojo/services/http_server/public/interfaces/http_server.mojom
+++ b/mojo/services/http_server/interfaces/http_server.mojom
@@ -5,8 +5,8 @@
[DartPackage="mojo_services"]
module http_server;
-import "http_server/public/interfaces/http_request.mojom";
-import "http_server/public/interfaces/http_response.mojom";
+import "http_server/interfaces/http_request.mojom";
+import "http_server/interfaces/http_response.mojom";
interface HttpServer {
// Sets a handler for URLs matching a regex pattern. Handlers are considered
diff --git a/mojo/services/http_server/public/interfaces/http_server_factory.mojom b/mojo/services/http_server/interfaces/http_server_factory.mojom
similarity index 94%
rename from mojo/services/http_server/public/interfaces/http_server_factory.mojom
rename to mojo/services/http_server/interfaces/http_server_factory.mojom
index 7bec351..c0dbae1 100644
--- a/mojo/services/http_server/public/interfaces/http_server_factory.mojom
+++ b/mojo/services/http_server/interfaces/http_server_factory.mojom
@@ -5,7 +5,7 @@
[DartPackage="mojo_services"]
module http_server;
-import "http_server/public/interfaces/http_server.mojom";
+import "http_server/interfaces/http_server.mojom";
import "network/public/interfaces/net_address.mojom";
interface HttpServerFactory {
diff --git a/mojo/services/icu_data/public/interfaces/BUILD.gn b/mojo/services/icu_data/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/icu_data/public/interfaces/BUILD.gn
rename to mojo/services/icu_data/interfaces/BUILD.gn
diff --git a/mojo/services/icu_data/public/interfaces/icu_data.mojom b/mojo/services/icu_data/interfaces/icu_data.mojom
similarity index 100%
rename from mojo/services/icu_data/public/interfaces/icu_data.mojom
rename to mojo/services/icu_data/interfaces/icu_data.mojom
diff --git a/mojo/services/input_events/public/interfaces/BUILD.gn b/mojo/services/input_events/interfaces/BUILD.gn
similarity index 80%
rename from mojo/services/input_events/public/interfaces/BUILD.gn
rename to mojo/services/input_events/interfaces/BUILD.gn
index 5ef09eb..9371206 100644
--- a/mojo/services/input_events/public/interfaces/BUILD.gn
+++ b/mojo/services/input_events/interfaces/BUILD.gn
@@ -12,9 +12,9 @@
"input_key_codes.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
deps = [
- "../../../geometry/public/interfaces",
+ "../../geometry/interfaces",
]
}
diff --git a/mojo/services/input_events/public/interfaces/input_event_constants.mojom b/mojo/services/input_events/interfaces/input_event_constants.mojom
similarity index 100%
rename from mojo/services/input_events/public/interfaces/input_event_constants.mojom
rename to mojo/services/input_events/interfaces/input_event_constants.mojom
diff --git a/mojo/services/input_events/public/interfaces/input_events.mojom b/mojo/services/input_events/interfaces/input_events.mojom
similarity index 93%
rename from mojo/services/input_events/public/interfaces/input_events.mojom
rename to mojo/services/input_events/interfaces/input_events.mojom
index dd0f762..cca69e8 100644
--- a/mojo/services/input_events/public/interfaces/input_events.mojom
+++ b/mojo/services/input_events/interfaces/input_events.mojom
@@ -5,9 +5,9 @@
[DartPackage="mojo_services"]
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
-import "input_events/public/interfaces/input_event_constants.mojom";
-import "input_events/public/interfaces/input_key_codes.mojom";
+import "geometry/interfaces/geometry.mojom";
+import "input_events/interfaces/input_event_constants.mojom";
+import "input_events/interfaces/input_key_codes.mojom";
struct KeyData {
// The chromium event key code; these values are from the ui/ KeyCode enum,
diff --git a/mojo/services/input_events/public/interfaces/input_key_codes.mojom b/mojo/services/input_events/interfaces/input_key_codes.mojom
similarity index 100%
rename from mojo/services/input_events/public/interfaces/input_key_codes.mojom
rename to mojo/services/input_events/interfaces/input_key_codes.mojom
diff --git a/mojo/services/keyboard/public/interfaces/BUILD.gn b/mojo/services/keyboard/interfaces/BUILD.gn
similarity index 100%
rename from mojo/services/keyboard/public/interfaces/BUILD.gn
rename to mojo/services/keyboard/interfaces/BUILD.gn
diff --git a/mojo/services/keyboard/public/interfaces/keyboard.mojom b/mojo/services/keyboard/interfaces/keyboard.mojom
similarity index 100%
rename from mojo/services/keyboard/public/interfaces/keyboard.mojom
rename to mojo/services/keyboard/interfaces/keyboard.mojom
diff --git a/mojo/services/location/public/interfaces/BUILD.gn b/mojo/services/location/interfaces/BUILD.gn
similarity index 88%
rename from mojo/services/location/public/interfaces/BUILD.gn
rename to mojo/services/location/interfaces/BUILD.gn
index e0498d8..ba6cae3 100644
--- a/mojo/services/location/public/interfaces/BUILD.gn
+++ b/mojo/services/location/interfaces/BUILD.gn
@@ -12,7 +12,7 @@
"location_service.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/location/public/interfaces/geocoder.mojom b/mojo/services/location/interfaces/geocoder.mojom
similarity index 96%
rename from mojo/services/location/public/interfaces/geocoder.mojom
rename to mojo/services/location/interfaces/geocoder.mojom
index b8d18b5..e9b8118 100644
--- a/mojo/services/location/public/interfaces/geocoder.mojom
+++ b/mojo/services/location/interfaces/geocoder.mojom
@@ -9,7 +9,7 @@
[DartPackage="mojo_services"]
module mojo;
-import "location/public/interfaces/location.mojom";
+import "location/interfaces/location.mojom";
struct LocationType {
const string ROOFTOP = "ROOFTOP";
diff --git a/mojo/services/location/public/interfaces/location.mojom b/mojo/services/location/interfaces/location.mojom
similarity index 100%
rename from mojo/services/location/public/interfaces/location.mojom
rename to mojo/services/location/interfaces/location.mojom
diff --git a/mojo/services/location/public/interfaces/location_service.mojom b/mojo/services/location/interfaces/location_service.mojom
similarity index 96%
rename from mojo/services/location/public/interfaces/location_service.mojom
rename to mojo/services/location/interfaces/location_service.mojom
index 1e31ad7..ab7a6d8 100644
--- a/mojo/services/location/public/interfaces/location_service.mojom
+++ b/mojo/services/location/interfaces/location_service.mojom
@@ -5,7 +5,7 @@
[DartPackage="mojo_services"]
module mojo;
-import "location/public/interfaces/location.mojom";
+import "location/interfaces/location.mojom";
// LocationService provides updates on the device's location.
// NOTE: This is specifically targetted towards use on Android by
diff --git a/mojo/services/mojo_services.gni b/mojo/services/mojo_services.gni
index c3b6263..e5e29e0 100644
--- a/mojo/services/mojo_services.gni
+++ b/mojo/services/mojo_services.gni
@@ -17,15 +17,15 @@
"//mojo/services/content_handler/interfaces",
"//mojo/services/device_info/interfaces",
"//mojo/services/files/interfaces",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/gpu/public/interfaces",
- "//mojo/services/http_server/public/interfaces",
- "//mojo/services/icu_data/public/interfaces",
- "//mojo/services/input_events/public/interfaces",
- "//mojo/services/keyboard/public/interfaces",
- "//mojo/services/location/public/interfaces",
- "//mojo/services/native_support/public/interfaces",
- "//mojo/services/native_viewport/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/gpu/interfaces",
+ "//mojo/services/http_server/interfaces",
+ "//mojo/services/icu_data/interfaces",
+ "//mojo/services/input_events/interfaces",
+ "//mojo/services/keyboard/interfaces",
+ "//mojo/services/location/interfaces",
+ "//mojo/services/native_support/interfaces",
+ "//mojo/services/native_viewport/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/network/public/interfaces",
"//mojo/services/nfc/public/interfaces",
diff --git a/mojo/services/native_support/public/interfaces/BUILD.gn b/mojo/services/native_support/interfaces/BUILD.gn
similarity index 79%
rename from mojo/services/native_support/public/interfaces/BUILD.gn
rename to mojo/services/native_support/interfaces/BUILD.gn
index 64f98f2..a6a04a8 100644
--- a/mojo/services/native_support/public/interfaces/BUILD.gn
+++ b/mojo/services/native_support/interfaces/BUILD.gn
@@ -10,9 +10,9 @@
"process.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
public_deps = [
- "../../../files/interfaces",
+ "../../files/interfaces",
]
}
diff --git a/mojo/services/native_support/public/interfaces/process.mojom b/mojo/services/native_support/interfaces/process.mojom
similarity index 100%
rename from mojo/services/native_support/public/interfaces/process.mojom
rename to mojo/services/native_support/interfaces/process.mojom
diff --git a/mojo/services/native_viewport/public/cpp/BUILD.gn b/mojo/services/native_viewport/cpp/BUILD.gn
similarity index 83%
rename from mojo/services/native_viewport/public/cpp/BUILD.gn
rename to mojo/services/native_viewport/cpp/BUILD.gn
index 855de71..16baf19 100644
--- a/mojo/services/native_viewport/public/cpp/BUILD.gn
+++ b/mojo/services/native_viewport/cpp/BUILD.gn
@@ -6,7 +6,7 @@
import("$mojo_sdk_root/mojo/public/mojo_sdk.gni")
mojo_sdk_source_set("args") {
- public_configs = [ "../../../public/build/config:mojo_services" ]
+ public_configs = [ "../../public/build/config:mojo_services" ]
sources = [
"args.h",
"lib/args.cc",
diff --git a/mojo/services/native_viewport/public/cpp/args.h b/mojo/services/native_viewport/cpp/args.h
similarity index 71%
rename from mojo/services/native_viewport/public/cpp/args.h
rename to mojo/services/native_viewport/cpp/args.h
index 2bad98d..46cb119 100644
--- a/mojo/services/native_viewport/public/cpp/args.h
+++ b/mojo/services/native_viewport/cpp/args.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_NATIVE_VIEWPORT_PUBLIC_CPP_ARGS_H_
-#define MOJO_SERVICES_NATIVE_VIEWPORT_PUBLIC_CPP_ARGS_H_
+#ifndef MOJO_SERVICES_NATIVE_VIEWPORT_CPP_ARGS_H_
+#define MOJO_SERVICES_NATIVE_VIEWPORT_CPP_ARGS_H_
namespace mojo {
@@ -15,4 +15,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_NATIVE_VIEWPORT_PUBLIC_CPP_ARGS_H_
+#endif // MOJO_SERVICES_NATIVE_VIEWPORT_CPP_ARGS_H_
diff --git a/mojo/services/native_viewport/public/cpp/lib/args.cc b/mojo/services/native_viewport/cpp/lib/args.cc
similarity index 92%
rename from mojo/services/native_viewport/public/cpp/lib/args.cc
rename to mojo/services/native_viewport/cpp/lib/args.cc
index 25ee1ae..f5b231a 100644
--- a/mojo/services/native_viewport/public/cpp/lib/args.cc
+++ b/mojo/services/native_viewport/cpp/lib/args.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 "native_viewport/public/cpp/args.h"
+#include "native_viewport/cpp/args.h"
namespace mojo {
diff --git a/mojo/services/native_viewport/public/interfaces/BUILD.gn b/mojo/services/native_viewport/interfaces/BUILD.gn
similarity index 60%
rename from mojo/services/native_viewport/public/interfaces/BUILD.gn
rename to mojo/services/native_viewport/interfaces/BUILD.gn
index 86ff870..638a7ae 100644
--- a/mojo/services/native_viewport/public/interfaces/BUILD.gn
+++ b/mojo/services/native_viewport/interfaces/BUILD.gn
@@ -10,12 +10,12 @@
"native_viewport.mojom",
]
- import_dirs = [ get_path_info("../../../", "abspath") ]
+ import_dirs = [ get_path_info("../../", "abspath") ]
public_deps = [
- "../../../geometry/public/interfaces",
- "../../../gpu/public/interfaces",
- "../../../input_events/public/interfaces",
- "../../../surfaces/public/interfaces:surface_id",
+ "../../geometry/interfaces",
+ "../../gpu/interfaces",
+ "../../input_events/interfaces",
+ "../../surfaces/public/interfaces:surface_id",
]
}
diff --git a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom b/mojo/services/native_viewport/interfaces/native_viewport.mojom
similarity index 89%
rename from mojo/services/native_viewport/public/interfaces/native_viewport.mojom
rename to mojo/services/native_viewport/interfaces/native_viewport.mojom
index 40036c6..3465414 100644
--- a/mojo/services/native_viewport/public/interfaces/native_viewport.mojom
+++ b/mojo/services/native_viewport/interfaces/native_viewport.mojom
@@ -5,9 +5,9 @@
[DartPackage="mojo_services"]
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
-import "gpu/public/interfaces/context_provider.mojom";
-import "input_events/public/interfaces/input_events.mojom";
+import "geometry/interfaces/geometry.mojom";
+import "gpu/interfaces/context_provider.mojom";
+import "input_events/interfaces/input_events.mojom";
struct ViewportMetrics {
Size size;
diff --git a/mojo/services/ozone_drm_gpu/public/interfaces/BUILD.gn b/mojo/services/ozone_drm_gpu/public/interfaces/BUILD.gn
index f4ad43f..989a9c0 100644
--- a/mojo/services/ozone_drm_gpu/public/interfaces/BUILD.gn
+++ b/mojo/services/ozone_drm_gpu/public/interfaces/BUILD.gn
@@ -13,6 +13,6 @@
import_dirs = [ get_path_info("../../../", "abspath") ]
public_deps = [
- "../../../geometry/public/interfaces",
+ "../../../geometry/interfaces",
]
}
diff --git a/mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom b/mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom
index ccc6941..29fe173 100644
--- a/mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom
+++ b/mojo/services/ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
+import "geometry/interfaces/geometry.mojom";
enum DisplayType {
NONE = 0,
diff --git a/mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom b/mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom
index 261bedf..69e51cc 100644
--- a/mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom
+++ b/mojo/services/ozone_drm_host/public/interfaces/ozone_drm_host.mojom
@@ -4,7 +4,7 @@
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
+import "geometry/interfaces/geometry.mojom";
import "ozone_drm_gpu/public/interfaces/ozone_drm_gpu.mojom";
interface OzoneDrmHost {
diff --git a/mojo/services/surfaces/public/cpp/BUILD.gn b/mojo/services/surfaces/public/cpp/BUILD.gn
index 9cf48b3..345ee0c 100644
--- a/mojo/services/surfaces/public/cpp/BUILD.gn
+++ b/mojo/services/surfaces/public/cpp/BUILD.gn
@@ -14,7 +14,7 @@
]
deps = [
- "../../../geometry/public/interfaces",
+ "../../../geometry/interfaces",
"../../../surfaces/public/interfaces",
]
}
diff --git a/mojo/services/surfaces/public/cpp/surfaces_utils.cc b/mojo/services/surfaces/public/cpp/surfaces_utils.cc
index ce6dd47..70fa249 100644
--- a/mojo/services/surfaces/public/cpp/surfaces_utils.cc
+++ b/mojo/services/surfaces/public/cpp/surfaces_utils.cc
@@ -4,7 +4,7 @@
#include "surfaces/public/cpp/surfaces_utils.h"
-#include "geometry/public/interfaces/geometry.mojom.h"
+#include "geometry/interfaces/geometry.mojom.h"
namespace mojo {
diff --git a/mojo/services/surfaces/public/interfaces/BUILD.gn b/mojo/services/surfaces/public/interfaces/BUILD.gn
index 7902a7a..8ada0ff 100644
--- a/mojo/services/surfaces/public/interfaces/BUILD.gn
+++ b/mojo/services/surfaces/public/interfaces/BUILD.gn
@@ -16,9 +16,9 @@
deps = [
":surface_id",
- "../../../geometry/public/interfaces",
- "../../../gpu/public/interfaces",
- "../../../native_viewport/public/interfaces",
+ "../../../geometry/interfaces",
+ "../../../gpu/interfaces",
+ "../../../native_viewport/interfaces",
]
}
diff --git a/mojo/services/surfaces/public/interfaces/display.mojom b/mojo/services/surfaces/public/interfaces/display.mojom
index fb51d4e..663c229 100644
--- a/mojo/services/surfaces/public/interfaces/display.mojom
+++ b/mojo/services/surfaces/public/interfaces/display.mojom
@@ -5,8 +5,8 @@
[DartPackage="mojo_services"]
module mojo;
-import "gpu/public/interfaces/context_provider.mojom";
-import "gpu/public/interfaces/viewport_parameter_listener.mojom";
+import "gpu/interfaces/context_provider.mojom";
+import "gpu/interfaces/viewport_parameter_listener.mojom";
import "surfaces/public/interfaces/surfaces.mojom";
interface Display {
diff --git a/mojo/services/surfaces/public/interfaces/quads.mojom b/mojo/services/surfaces/public/interfaces/quads.mojom
index 6b77b1d..0a0c83f 100644
--- a/mojo/services/surfaces/public/interfaces/quads.mojom
+++ b/mojo/services/surfaces/public/interfaces/quads.mojom
@@ -5,7 +5,7 @@
[DartPackage="mojo_services"]
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
+import "geometry/interfaces/geometry.mojom";
import "surfaces/public/interfaces/surface_id.mojom";
struct Color {
diff --git a/mojo/services/surfaces/public/interfaces/surfaces.mojom b/mojo/services/surfaces/public/interfaces/surfaces.mojom
index 596042f..c5509f6 100644
--- a/mojo/services/surfaces/public/interfaces/surfaces.mojom
+++ b/mojo/services/surfaces/public/interfaces/surfaces.mojom
@@ -5,7 +5,7 @@
[DartPackage="mojo_services"]
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
+import "geometry/interfaces/geometry.mojom";
import "surfaces/public/interfaces/quads.mojom";
import "surfaces/public/interfaces/surface_id.mojom";
diff --git a/mojo/services/view_manager/public/cpp/BUILD.gn b/mojo/services/view_manager/public/cpp/BUILD.gn
index a278cce..8f2620a 100644
--- a/mojo/services/view_manager/public/cpp/BUILD.gn
+++ b/mojo/services/view_manager/public/cpp/BUILD.gn
@@ -35,8 +35,8 @@
deps = [
"../interfaces",
- "../../../geometry/public/interfaces",
- "../../../input_events/public/interfaces",
+ "../../../geometry/interfaces",
+ "../../../input_events/interfaces",
"../../../surfaces/public/interfaces:surface_id",
"../../../window_manager/public/interfaces",
"//base",
diff --git a/mojo/services/view_manager/public/cpp/tests/BUILD.gn b/mojo/services/view_manager/public/cpp/tests/BUILD.gn
index f0d8071..3d29cbb 100644
--- a/mojo/services/view_manager/public/cpp/tests/BUILD.gn
+++ b/mojo/services/view_manager/public/cpp/tests/BUILD.gn
@@ -14,8 +14,11 @@
]
deps = [
+ "../../../../geometry/cpp",
+ "../../../../geometry/interfaces",
"//base",
"//base/test:test_support",
+
# TODO(vtl): These non-public deps are illegal here. This should be
# converted to an apptest.
"//mojo/application",
@@ -23,8 +26,6 @@
"//mojo/environment:chromium",
"//mojo/public/cpp/application",
"//mojo/public/cpp/system",
- "//mojo/services/geometry/public/cpp",
- "//mojo/services/geometry/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//testing/gtest",
]
diff --git a/mojo/services/view_manager/public/cpp/view.h b/mojo/services/view_manager/public/cpp/view.h
index e988894..dbd5196 100644
--- a/mojo/services/view_manager/public/cpp/view.h
+++ b/mojo/services/view_manager/public/cpp/view.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/observer_list.h"
-#include "geometry/public/interfaces/geometry.mojom.h"
+#include "geometry/interfaces/geometry.mojom.h"
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
diff --git a/mojo/services/view_manager/public/cpp/view_observer.h b/mojo/services/view_manager/public/cpp/view_observer.h
index 341a4f0..1bc19fa 100644
--- a/mojo/services/view_manager/public/cpp/view_observer.h
+++ b/mojo/services/view_manager/public/cpp/view_observer.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "input_events/public/interfaces/input_events.mojom.h"
+#include "input_events/interfaces/input_events.mojom.h"
#include "view_manager/public/cpp/view.h"
namespace mojo {
diff --git a/mojo/services/view_manager/public/interfaces/BUILD.gn b/mojo/services/view_manager/public/interfaces/BUILD.gn
index 177066b..ea75021 100644
--- a/mojo/services/view_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/view_manager/public/interfaces/BUILD.gn
@@ -17,9 +17,9 @@
mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
deps = [
- "../../../geometry/public/interfaces",
- "../../../input_events/public/interfaces",
- "../../../native_viewport/public/interfaces",
+ "../../../geometry/interfaces",
+ "../../../input_events/interfaces",
+ "../../../native_viewport/interfaces",
"../../../surfaces/public/interfaces:surface_id",
]
}
diff --git a/mojo/services/view_manager/public/interfaces/animations.mojom b/mojo/services/view_manager/public/interfaces/animations.mojom
index 4a9ef31..56b1b01 100644
--- a/mojo/services/view_manager/public/interfaces/animations.mojom
+++ b/mojo/services/view_manager/public/interfaces/animations.mojom
@@ -5,7 +5,7 @@
[DartPackage="mojo_services"]
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
+import "geometry/interfaces/geometry.mojom";
enum AnimationTweenType {
LINEAR,
diff --git a/mojo/services/view_manager/public/interfaces/view_manager.mojom b/mojo/services/view_manager/public/interfaces/view_manager.mojom
index 0ce960d..18acdbd 100644
--- a/mojo/services/view_manager/public/interfaces/view_manager.mojom
+++ b/mojo/services/view_manager/public/interfaces/view_manager.mojom
@@ -5,10 +5,10 @@
[DartPackage="mojo_services"]
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
-import "input_events/public/interfaces/input_events.mojom";
+import "geometry/interfaces/geometry.mojom";
+import "input_events/interfaces/input_events.mojom";
import "mojo/public/interfaces/application/service_provider.mojom";
-import "native_viewport/public/interfaces/native_viewport.mojom";
+import "native_viewport/interfaces/native_viewport.mojom";
import "surfaces/public/interfaces/surface_id.mojom";
import "view_manager/public/interfaces/view_manager_constants.mojom";
diff --git a/mojo/services/window_manager/public/interfaces/BUILD.gn b/mojo/services/window_manager/public/interfaces/BUILD.gn
index b97f069..74dca42 100644
--- a/mojo/services/window_manager/public/interfaces/BUILD.gn
+++ b/mojo/services/window_manager/public/interfaces/BUILD.gn
@@ -16,7 +16,7 @@
mojo_sdk_deps = [ "mojo/public/interfaces/application" ]
deps = [
- "../../../geometry/public/interfaces",
- "../../../input_events/public/interfaces",
+ "../../../geometry/interfaces",
+ "../../../input_events/interfaces",
]
}
diff --git a/mojo/services/window_manager/public/interfaces/window_manager.mojom b/mojo/services/window_manager/public/interfaces/window_manager.mojom
index a7fcfbb..1b9d0b7 100644
--- a/mojo/services/window_manager/public/interfaces/window_manager.mojom
+++ b/mojo/services/window_manager/public/interfaces/window_manager.mojom
@@ -5,7 +5,7 @@
[DartPackage="mojo_services"]
module mojo;
-import "input_events/public/interfaces/input_events.mojom";
+import "input_events/interfaces/input_events.mojom";
import "mojo/public/interfaces/application/service_provider.mojom";
interface WindowManager {
diff --git a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom b/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
index edccd6c..b018735 100644
--- a/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
+++ b/mojo/services/window_manager/public/interfaces/window_manager_internal.mojom
@@ -5,8 +5,8 @@
[DartPackage="mojo_services"]
module mojo;
-import "geometry/public/interfaces/geometry.mojom";
-import "input_events/public/interfaces/input_events.mojom";
+import "geometry/interfaces/geometry.mojom";
+import "input_events/interfaces/input_events.mojom";
// WindowManagerInternal is an interface provided by the WindowManager
// exclusively to the ViewManager.
diff --git a/services/debugger/BUILD.gn b/services/debugger/BUILD.gn
index 0e78eb5..7be1e75 100644
--- a/services/debugger/BUILD.gn
+++ b/services/debugger/BUILD.gn
@@ -21,8 +21,8 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
- "//mojo/services/http_server/public/cpp",
- "//mojo/services/http_server/public/interfaces",
+ "//mojo/services/http_server/cpp",
+ "//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
"//mojo/services/tracing/public/interfaces",
"//mojo/services/window_manager/public/interfaces",
diff --git a/services/debugger/debugger.cc b/services/debugger/debugger.cc
index 6c6761c..486c474 100644
--- a/services/debugger/debugger.cc
+++ b/services/debugger/debugger.cc
@@ -14,9 +14,9 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/http_server/public/cpp/http_server_util.h"
-#include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
+#include "mojo/services/http_server/cpp/http_server_util.h"
+#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/window_manager/public/interfaces/window_manager.mojom.h"
diff --git a/services/fake_surfaces/BUILD.gn b/services/fake_surfaces/BUILD.gn
index dfe4bfd..6d3cc7a 100644
--- a/services/fake_surfaces/BUILD.gn
+++ b/services/fake_surfaces/BUILD.gn
@@ -17,7 +17,7 @@
"//mojo/common:tracing_impl",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/gpu/interfaces",
"//mojo/services/surfaces/public/interfaces",
]
}
diff --git a/services/gles2/BUILD.gn b/services/gles2/BUILD.gn
index e8244d1..be71659 100644
--- a/services/gles2/BUILD.gn
+++ b/services/gles2/BUILD.gn
@@ -31,8 +31,8 @@
"//gpu/command_buffer/service",
"//mojo/converters/geometry",
"//mojo/public/cpp/bindings",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/gpu/interfaces",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/gl",
@@ -52,6 +52,6 @@
"//gpu/command_buffer/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/gpu/interfaces",
]
}
diff --git a/services/gles2/command_buffer_driver.h b/services/gles2/command_buffer_driver.h
index 7775d7b..40a75e0 100644
--- a/services/gles2/command_buffer_driver.h
+++ b/services/gles2/command_buffer_driver.h
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/single_thread_task_runner.h"
#include "base/timer/timer.h"
-#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
#include "ui/gl/gl_surface.h"
diff --git a/services/gles2/command_buffer_impl.h b/services/gles2/command_buffer_impl.h
index a9c7298..a781e9f 100644
--- a/services/gles2/command_buffer_impl.h
+++ b/services/gles2/command_buffer_impl.h
@@ -9,8 +9,8 @@
#include "base/memory/weak_ptr.h"
#include "base/single_thread_task_runner.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
-#include "mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom.h"
+#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/interfaces/viewport_parameter_listener.mojom.h"
namespace gpu {
class SyncPointManager;
diff --git a/services/gles2/command_buffer_type_conversions.cc b/services/gles2/command_buffer_type_conversions.cc
index 831560c..d08ec4d 100644
--- a/services/gles2/command_buffer_type_conversions.cc
+++ b/services/gles2/command_buffer_type_conversions.cc
@@ -4,7 +4,7 @@
#include "services/gles2/command_buffer_type_conversions.h"
-#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
namespace mojo {
diff --git a/services/gles2/command_buffer_type_conversions.h b/services/gles2/command_buffer_type_conversions.h
index ab996e2..146ae3d 100644
--- a/services/gles2/command_buffer_type_conversions.h
+++ b/services/gles2/command_buffer_type_conversions.h
@@ -8,7 +8,7 @@
#include "gpu/command_buffer/common/capabilities.h"
#include "gpu/command_buffer/common/command_buffer.h"
#include "mojo/public/cpp/bindings/type_converter.h"
-#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
namespace mojo {
diff --git a/services/gles2/gpu_impl.h b/services/gles2/gpu_impl.h
index a5f2ae1..6ce78e3 100644
--- a/services/gles2/gpu_impl.h
+++ b/services/gles2/gpu_impl.h
@@ -10,9 +10,9 @@
#include "base/threading/thread.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
+#include "mojo/services/gpu/interfaces/command_buffer.mojom.h"
+#include "mojo/services/gpu/interfaces/gpu.mojom.h"
#include "services/gles2/gpu_state.h"
namespace gfx {
diff --git a/services/http_server/BUILD.gn b/services/http_server/BUILD.gn
index 7bc38bb..2c18747 100644
--- a/services/http_server/BUILD.gn
+++ b/services/http_server/BUILD.gn
@@ -27,8 +27,8 @@
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
"//mojo/public/cpp/utility",
- "//mojo/services/http_server/public/interfaces",
- "//mojo/services/http_server/public/cpp",
+ "//mojo/services/http_server/cpp",
+ "//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
"//third_party/re2",
]
@@ -58,8 +58,8 @@
"//mojo/public/cpp/bindings:callback",
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
- "//mojo/services/http_server/public/interfaces",
- "//mojo/services/http_server/public/cpp",
+ "//mojo/services/http_server/cpp",
+ "//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
]
diff --git a/services/http_server/connection.h b/services/http_server/connection.h
index 63f153e..03565c7 100644
--- a/services/http_server/connection.h
+++ b/services/http_server/connection.h
@@ -9,8 +9,8 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/public/cpp/environment/async_waiter.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/http_server/public/interfaces/http_request.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_response.mojom.h"
+#include "mojo/services/http_server/interfaces/http_request.mojom.h"
+#include "mojo/services/http_server/interfaces/http_response.mojom.h"
#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "services/http_server/http_request_parser.h"
diff --git a/services/http_server/http_request_parser.h b/services/http_server/http_request_parser.h
index bdfafa4..afc23c0 100644
--- a/services/http_server/http_request_parser.h
+++ b/services/http_server/http_request_parser.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/strings/string_piece.h"
-#include "mojo/services/http_server/public/interfaces/http_request.mojom.h"
+#include "mojo/services/http_server/interfaces/http_request.mojom.h"
namespace http_server {
diff --git a/services/http_server/http_server_app.cc b/services/http_server/http_server_app.cc
index 1ca6d07..8ff7b12 100644
--- a/services/http_server/http_server_app.cc
+++ b/services/http_server/http_server_app.cc
@@ -8,7 +8,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_runner.h"
#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
+#include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
#include "services/http_server/http_server_factory_impl.h"
#include "services/http_server/http_server_impl.h"
diff --git a/services/http_server/http_server_apptest.cc b/services/http_server/http_server_apptest.cc
index 4acf375..debe87f 100644
--- a/services/http_server/http_server_apptest.cc
+++ b/services/http_server/http_server_apptest.cc
@@ -9,9 +9,9 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/http_server/public/cpp/http_server_util.h"
-#include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
+#include "mojo/services/http_server/cpp/http_server_util.h"
+#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/network/public/interfaces/network_service.mojom.h"
#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
diff --git a/services/http_server/http_server_factory_impl.cc b/services/http_server/http_server_factory_impl.cc
index d84197a..60da714 100644
--- a/services/http_server/http_server_factory_impl.cc
+++ b/services/http_server/http_server_factory_impl.cc
@@ -5,7 +5,7 @@
#include "services/http_server/http_server_factory_impl.h"
#include "base/stl_util.h"
-#include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
+#include "mojo/services/http_server/interfaces/http_server.mojom.h"
#include "services/http_server/http_server_impl.h"
namespace http_server {
diff --git a/services/http_server/http_server_factory_impl.h b/services/http_server/http_server_factory_impl.h
index 0923b04..3e8c1e9 100644
--- a/services/http_server/http_server_factory_impl.h
+++ b/services/http_server/http_server_factory_impl.h
@@ -12,7 +12,7 @@
#include "mojo/common/binding_set.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
+#include "mojo/services/http_server/interfaces/http_server_factory.mojom.h"
#include "mojo/services/network/public/interfaces/net_address.mojom.h"
namespace mojo {
diff --git a/services/http_server/http_server_impl.cc b/services/http_server/http_server_impl.cc
index 8c1120a..fa7f5b3 100644
--- a/services/http_server/http_server_impl.cc
+++ b/services/http_server/http_server_impl.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/services/http_server/public/cpp/http_server_util.h"
+#include "mojo/services/http_server/cpp/http_server_util.h"
#include "services/http_server/connection.h"
#include "services/http_server/http_server_factory_impl.h"
diff --git a/services/http_server/http_server_impl.h b/services/http_server/http_server_impl.h
index 7aaa182..d43c893 100644
--- a/services/http_server/http_server_impl.h
+++ b/services/http_server/http_server_impl.h
@@ -8,9 +8,9 @@
#include "mojo/common/binding_set.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/http_server/public/interfaces/http_request.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_response.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
+#include "mojo/services/http_server/interfaces/http_request.mojom.h"
+#include "mojo/services/http_server/interfaces/http_response.mojom.h"
+#include "mojo/services/http_server/interfaces/http_server.mojom.h"
#include "mojo/services/network/public/interfaces/net_address.mojom.h"
#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "third_party/re2/re2/re2.h"
diff --git a/services/icu_data/BUILD.gn b/services/icu_data/BUILD.gn
index b06070d..bac2851 100644
--- a/services/icu_data/BUILD.gn
+++ b/services/icu_data/BUILD.gn
@@ -26,7 +26,7 @@
"//mojo/application",
"//mojo/common",
"//mojo/environment:chromium",
- "//mojo/services/icu_data/public/interfaces",
+ "//mojo/services/icu_data/interfaces",
":embed_icu_data",
]
}
diff --git a/services/icu_data/icu_data_impl.cc b/services/icu_data/icu_data_impl.cc
index 2690863..a3862a6 100644
--- a/services/icu_data/icu_data_impl.cc
+++ b/services/icu_data/icu_data_impl.cc
@@ -9,7 +9,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/public/cpp/bindings/interface_ptr.h"
-#include "mojo/services/icu_data/public/interfaces/icu_data.mojom.h"
+#include "mojo/services/icu_data/interfaces/icu_data.mojom.h"
#include "services/icu_data/kICUData.h"
namespace icu_data {
diff --git a/services/keyboard/BUILD.gn b/services/keyboard/BUILD.gn
index b79633f..a6b73fb 100644
--- a/services/keyboard/BUILD.gn
+++ b/services/keyboard/BUILD.gn
@@ -15,6 +15,6 @@
deps = [
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//mojo/services/keyboard/public/interfaces:interfaces_java",
+ "//mojo/services/keyboard/interfaces:interfaces_java",
]
}
diff --git a/services/keyboard_native/BUILD.gn b/services/keyboard_native/BUILD.gn
index c668c3a..096d2d0 100644
--- a/services/keyboard_native/BUILD.gn
+++ b/services/keyboard_native/BUILD.gn
@@ -43,9 +43,9 @@
"//mojo/public/cpp/bindings:callback",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
- "//mojo/services/geometry/public/cpp",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/keyboard/public/interfaces",
+ "//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",
diff --git a/services/keyboard_native/key_layout.h b/services/keyboard_native/key_layout.h
index ccc33ed..6f2e52a 100644
--- a/services/keyboard_native/key_layout.h
+++ b/services/keyboard_native/key_layout.h
@@ -10,7 +10,7 @@
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
#include "ui/gfx/geometry/rect_f.h"
class SkCanvas;
diff --git a/services/keyboard_native/keyboard_service_impl.h b/services/keyboard_native/keyboard_service_impl.h
index 53e4d53..0d9213f 100644
--- a/services/keyboard_native/keyboard_service_impl.h
+++ b/services/keyboard_native/keyboard_service_impl.h
@@ -8,7 +8,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/keyboard/public/interfaces/keyboard.mojom.h"
+#include "mojo/services/keyboard/interfaces/keyboard.mojom.h"
#include "services/keyboard_native/view_observer_delegate.h"
namespace keyboard {
diff --git a/services/kiosk_wm/BUILD.gn b/services/kiosk_wm/BUILD.gn
index 5782021..1b25d86 100644
--- a/services/kiosk_wm/BUILD.gn
+++ b/services/kiosk_wm/BUILD.gn
@@ -27,7 +27,7 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/application",
- "//mojo/services/input_events/public/interfaces",
+ "//mojo/services/input_events/interfaces",
"//mojo/services/navigation/public/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/window_manager/public/interfaces:interfaces",
diff --git a/services/kiosk_wm/kiosk_wm_controller.h b/services/kiosk_wm/kiosk_wm_controller.h
index 8f993be..3ec883f 100644
--- a/services/kiosk_wm/kiosk_wm_controller.h
+++ b/services/kiosk_wm/kiosk_wm_controller.h
@@ -9,7 +9,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/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "mojo/services/navigation/public/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"
diff --git a/services/location/BUILD.gn b/services/location/BUILD.gn
index 7d6ff27..f500570 100644
--- a/services/location/BUILD.gn
+++ b/services/location/BUILD.gn
@@ -16,7 +16,7 @@
"//mojo/public/java:bindings",
"//mojo/public/java:system",
"//mojo/public/java:application",
- "//mojo/services/location/public/interfaces:interfaces_java",
+ "//mojo/services/location/interfaces:interfaces_java",
"//third_party/android_tools:google_play_services_default_java",
]
}
diff --git a/services/location/geocoder_service.js b/services/location/geocoder_service.js
index 1373081..f690a77 100644
--- a/services/location/geocoder_service.js
+++ b/services/location/geocoder_service.js
@@ -1,11 +1,14 @@
#!mojo mojo:js_content_handler
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
define("main", [
"console",
"mojo/public/js/core",
"mojo/public/js/unicode",
- "mojo/services/location/public/interfaces/geocoder.mojom",
- "mojo/services/location/public/interfaces/location.mojom",
+ "mojo/services/location/interfaces/geocoder.mojom",
+ "mojo/services/location/interfaces/location.mojom",
"mojo/services/public/js/application",
"mojo/services/network/public/interfaces/network_service.mojom",
"mojo/services/network/public/interfaces/url_loader.mojom",
diff --git a/services/native_support/BUILD.gn b/services/native_support/BUILD.gn
index f7f0d0b..276a086 100644
--- a/services/native_support/BUILD.gn
+++ b/services/native_support/BUILD.gn
@@ -27,7 +27,7 @@
"//mojo/public/cpp/bindings:callback",
"//mojo/public/cpp/system",
"//mojo/services/files/interfaces",
- "//mojo/services/native_support/public/interfaces",
+ "//mojo/services/native_support/interfaces",
]
}
@@ -51,7 +51,7 @@
"//mojo/public/cpp/system",
"//mojo/services/files/cpp:files_impl",
"//mojo/services/files/interfaces",
- "//mojo/services/native_support/public/interfaces",
+ "//mojo/services/native_support/interfaces",
]
data_deps = [ ":native_support($default_toolchain)" ]
diff --git a/services/native_support/main.cc b/services/native_support/main.cc
index dc576a2..33aff04 100644
--- a/services/native_support/main.cc
+++ b/services/native_support/main.cc
@@ -11,7 +11,7 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/native_support/public/interfaces/process.mojom.h"
+#include "mojo/services/native_support/interfaces/process.mojom.h"
#include "services/native_support/process_impl.h"
namespace native_support {
diff --git a/services/native_support/process_controller_impl.h b/services/native_support/process_controller_impl.h
index fbd844b..c6c7ae0 100644
--- a/services/native_support/process_controller_impl.h
+++ b/services/native_support/process_controller_impl.h
@@ -16,7 +16,7 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/services/files/interfaces/file.mojom.h"
#include "mojo/services/files/interfaces/types.mojom.h"
-#include "mojo/services/native_support/public/interfaces/process.mojom.h"
+#include "mojo/services/native_support/interfaces/process.mojom.h"
namespace native_support {
diff --git a/services/native_support/process_impl.h b/services/native_support/process_impl.h
index dca0b70..34b743f 100644
--- a/services/native_support/process_impl.h
+++ b/services/native_support/process_impl.h
@@ -13,7 +13,7 @@
#include "base/task_runner.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/native_support/public/interfaces/process.mojom.h"
+#include "mojo/services/native_support/interfaces/process.mojom.h"
namespace mojo {
class ApplicationConnection;
diff --git a/services/native_support/process_test_base.h b/services/native_support/process_test_base.h
index 0d4cc2a..5950556 100644
--- a/services/native_support/process_test_base.h
+++ b/services/native_support/process_test_base.h
@@ -7,7 +7,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/native_support/public/interfaces/process.mojom.h"
+#include "mojo/services/native_support/interfaces/process.mojom.h"
namespace native_support {
diff --git a/services/native_viewport/BUILD.gn b/services/native_viewport/BUILD.gn
index 301b1af..c12448a 100644
--- a/services/native_viewport/BUILD.gn
+++ b/services/native_viewport/BUILD.gn
@@ -25,7 +25,7 @@
deps = [
"//base:base_java",
"//services/keyboard",
- "//mojo/services/keyboard/public/interfaces:interfaces_java",
+ "//mojo/services/keyboard/interfaces:interfaces_java",
"//mojo/public/java:bindings",
"//mojo/public/java:system",
]
@@ -58,8 +58,8 @@
"//mojo/application",
"//mojo/common:tracing_impl",
"//mojo/public/cpp/bindings:bindings",
- "//mojo/services/native_viewport/public/interfaces",
- "//mojo/services/native_viewport/public/cpp:args",
+ "//mojo/services/native_viewport/interfaces",
+ "//mojo/services/native_viewport/cpp:args",
"//services/gles2",
"//ui/events",
"//ui/events/platform",
@@ -107,8 +107,8 @@
"//mojo/converters/native_viewport",
"//mojo/environment:chromium",
"//services/gles2",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/native_viewport/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/native_viewport/interfaces",
"//ui/events",
"//ui/events/platform",
"//ui/gfx",
diff --git a/services/native_viewport/app_delegate.h b/services/native_viewport/app_delegate.h
index 9433dc0..49026c9 100644
--- a/services/native_viewport/app_delegate.h
+++ b/services/native_viewport/app_delegate.h
@@ -17,7 +17,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/interface_factory_impl.h"
-#include "mojo/services/native_viewport/public/cpp/args.h"
+#include "mojo/services/native_viewport/cpp/args.h"
#include "services/gles2/gpu_impl.h"
#include "services/native_viewport/native_viewport_impl.h"
#include "ui/events/event_switches.h"
diff --git a/services/native_viewport/native_viewport_impl.h b/services/native_viewport/native_viewport_impl.h
index bd9da3c..3391e88 100644
--- a/services/native_viewport/native_viewport_impl.h
+++ b/services/native_viewport/native_viewport_impl.h
@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/gpu/interfaces/gpu.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
#include "services/native_viewport/onscreen_context_provider.h"
#include "services/native_viewport/platform_viewport.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/services/native_viewport/onscreen_context_provider.h b/services/native_viewport/onscreen_context_provider.h
index c818913..cb23d9a 100644
--- a/services/native_viewport/onscreen_context_provider.h
+++ b/services/native_viewport/onscreen_context_provider.h
@@ -6,8 +6,8 @@
#define SERVICES_NATIVE_VIEWPORT_ONSCREEN_CONTEXT_PROVIDER_H_
#include "base/memory/ref_counted.h"
-#include "mojo/services/gpu/public/interfaces/context_provider.mojom.h"
-#include "mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom.h"
+#include "mojo/services/gpu/interfaces/context_provider.mojom.h"
+#include "mojo/services/gpu/interfaces/viewport_parameter_listener.mojom.h"
#include "services/gles2/command_buffer_impl.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gl/gl_surface.h"
diff --git a/services/native_viewport/platform_viewport.h b/services/native_viewport/platform_viewport.h
index 04cc7ed..5192654 100644
--- a/services/native_viewport/platform_viewport.h
+++ b/services/native_viewport/platform_viewport.h
@@ -6,8 +6,8 @@
#define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_H_
#include "base/memory/scoped_ptr.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
diff --git a/services/python/mojo_url_redirector/BUILD.gn b/services/python/mojo_url_redirector/BUILD.gn
index 73afcc9..83274a4 100644
--- a/services/python/mojo_url_redirector/BUILD.gn
+++ b/services/python/mojo_url_redirector/BUILD.gn
@@ -15,7 +15,7 @@
"//mojo/public/python:packaged_application",
"//mojo/public/python:packaged_bindings",
"//mojo/python:packaged_utils",
- "//mojo/services/http_server/public/interfaces:interfaces_python",
+ "//mojo/services/http_server/interfaces:interfaces_python",
"//mojo/services/network/public/interfaces:interfaces_python",
]
datadeps = [
@@ -38,8 +38,8 @@
"//mojo/application",
"//mojo/application:test_support",
"//mojo/data_pipe_utils",
- "//mojo/services/http_server/public/cpp",
- "//mojo/services/http_server/public/interfaces",
+ "//mojo/services/http_server/cpp",
+ "//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
]
diff --git a/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc b/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
index 8917641..f329b92 100644
--- a/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
+++ b/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
@@ -10,9 +10,9 @@
#include "mojo/data_pipe_utils/data_pipe_utils.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/http_server/public/cpp/http_server_util.h"
-#include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
+#include "mojo/services/http_server/cpp/http_server_util.h"
+#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/network/public/interfaces/network_service.mojom.h"
#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
diff --git a/services/surfaces/BUILD.gn b/services/surfaces/BUILD.gn
index 695a7ca..c4e268a 100644
--- a/services/surfaces/BUILD.gn
+++ b/services/surfaces/BUILD.gn
@@ -40,8 +40,8 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/gpu/public/interfaces",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/gpu/interfaces",
"//mojo/services/surfaces/public/interfaces",
"//ui/gfx/geometry",
]
diff --git a/services/surfaces/surfaces_impl.h b/services/surfaces/surfaces_impl.h
index c60befa..43decd3 100644
--- a/services/surfaces/surfaces_impl.h
+++ b/services/surfaces/surfaces_impl.h
@@ -10,8 +10,8 @@
#include "cc/surfaces/surface_factory_client.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/gpu/public/interfaces/command_buffer.mojom.h"
-#include "mojo/services/gpu/public/interfaces/viewport_parameter_listener.mojom.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"
namespace cc {
diff --git a/services/view_manager/BUILD.gn b/services/view_manager/BUILD.gn
index de5b5ab..d678107 100644
--- a/services/view_manager/BUILD.gn
+++ b/services/view_manager/BUILD.gn
@@ -84,9 +84,9 @@
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/bindings:callback",
"//mojo/public/interfaces/application",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/input_events/public/interfaces",
- "//mojo/services/native_viewport/public/interfaces",
+ "//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/view_manager/public/interfaces",
@@ -109,7 +109,7 @@
"//base",
"//mojo/converters/array_string",
"//mojo/public/cpp/bindings:bindings",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/cpp:common",
"//mojo/services/view_manager/public/interfaces",
@@ -140,9 +140,9 @@
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/input_events/public/interfaces",
- "//mojo/services/native_viewport/public/cpp:args",
+ "//mojo/services/geometry/interfaces",
+ "//mojo/services/input_events/interfaces",
+ "//mojo/services/native_viewport/cpp:args",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/interfaces",
"//mojo/services/window_manager/public/interfaces",
@@ -169,7 +169,7 @@
"//base/test:test_config",
"//mojo/application",
"//mojo/application:test_support",
- "//mojo/services/geometry/public/cpp:cpp",
+ "//mojo/services/geometry/cpp",
"//mojo/services/view_manager/public/cpp",
]
}
@@ -188,7 +188,7 @@
"//mojo/application:test_support",
"//mojo/common",
"//mojo/public/cpp/bindings",
- "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/geometry/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/view_manager/public/interfaces",
"//mojo/services/window_manager/public/interfaces",
diff --git a/services/view_manager/display_manager.cc b/services/view_manager/display_manager.cc
index a1cd6e2..6fd1b33 100644
--- a/services/view_manager/display_manager.cc
+++ b/services/view_manager/display_manager.cc
@@ -9,7 +9,7 @@
#include "mojo/converters/surfaces/surfaces_type_converters.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.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"
diff --git a/services/view_manager/display_manager.h b/services/view_manager/display_manager.h
index c8ecf8c..ad71d1f 100644
--- a/services/view_manager/display_manager.h
+++ b/services/view_manager/display_manager.h
@@ -12,7 +12,7 @@
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/callback.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
#include "mojo/services/surfaces/public/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/gesture_manager.cc b/services/view_manager/gesture_manager.cc
index 2d1ddf1..13ac68b 100644
--- a/services/view_manager/gesture_manager.cc
+++ b/services/view_manager/gesture_manager.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "mojo/services/view_manager/public/cpp/keys.h"
#include "services/view_manager/gesture_manager_delegate.h"
#include "services/view_manager/server_view.h"
diff --git a/services/view_manager/gesture_manager_delegate.h b/services/view_manager/gesture_manager_delegate.h
index 90473e5..f5f4a2f 100644
--- a/services/view_manager/gesture_manager_delegate.h
+++ b/services/view_manager/gesture_manager_delegate.h
@@ -7,7 +7,7 @@
#include <set>
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "mojo/services/view_manager/public/cpp/types.h"
namespace view_manager {
diff --git a/services/view_manager/gesture_manager_unittest.cc b/services/view_manager/gesture_manager_unittest.cc
index 667069b..ac51285 100644
--- a/services/view_manager/gesture_manager_unittest.cc
+++ b/services/view_manager/gesture_manager_unittest.cc
@@ -6,7 +6,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
-#include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
#include "mojo/services/view_manager/public/cpp/keys.h"
#include "services/view_manager/gesture_manager_delegate.h"
#include "services/view_manager/server_view.h"
diff --git a/services/view_manager/test_change_tracker.h b/services/view_manager/test_change_tracker.h
index f5b82b5..f487c28 100644
--- a/services/view_manager/test_change_tracker.h
+++ b/services/view_manager/test_change_tracker.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "mojo/public/cpp/bindings/array.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
#include "mojo/services/view_manager/public/cpp/types.h"
#include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
diff --git a/services/view_manager/view_manager_client_apptest.cc b/services/view_manager/view_manager_client_apptest.cc
index 0a190fd..417ea07 100644
--- a/services/view_manager/view_manager_client_apptest.cc
+++ b/services/view_manager/view_manager_client_apptest.cc
@@ -16,7 +16,7 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/application/service_provider_impl.h"
-#include "mojo/services/geometry/public/cpp/geometry_util.h"
+#include "mojo/services/geometry/cpp/geometry_util.h"
#include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
#include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
#include "mojo/services/view_manager/public/cpp/view_manager_context.h"
diff --git a/services/window_manager/BUILD.gn b/services/window_manager/BUILD.gn
index a509d71..55636ea 100644
--- a/services/window_manager/BUILD.gn
+++ b/services/window_manager/BUILD.gn
@@ -65,7 +65,7 @@
"//mojo/converters/input_events",
"//mojo/public/cpp/bindings:bindings",
"//mojo/public/interfaces/application",
- "//mojo/services/native_viewport/public/interfaces",
+ "//mojo/services/native_viewport/interfaces",
"//mojo/services/view_manager/public/cpp",
"//mojo/services/window_manager/public/interfaces",
]
diff --git a/services/window_manager/native_viewport_event_dispatcher_impl.h b/services/window_manager/native_viewport_event_dispatcher_impl.h
index d31e2f7..6491749 100644
--- a/services/window_manager/native_viewport_event_dispatcher_impl.h
+++ b/services/window_manager/native_viewport_event_dispatcher_impl.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
#include "ui/events/event_source.h"
namespace window_manager {
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index 24f9dd8..3b0929f 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -235,8 +235,8 @@
":run_android_application_function",
"//mojo/application:content_handler",
"//mojo/services/content_handler/interfaces",
- "//mojo/services/gpu/public/interfaces",
- "//mojo/services/native_viewport/public/interfaces",
+ "//mojo/services/gpu/interfaces",
+ "//mojo/services/native_viewport/interfaces",
"//services/gles2",
"//services/native_viewport:lib",
]
@@ -354,7 +354,7 @@
"//mojo/public/java:application",
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//mojo/services/keyboard/public/interfaces:interfaces_java",
+ "//mojo/services/keyboard/interfaces:interfaces_java",
"//services/authentication",
"//services/location",
"//services/intent_receiver:bindings_java",
@@ -637,8 +637,8 @@
"//mojo/public/cpp/bindings:callback",
"//mojo/public/cpp/environment",
"//mojo/public/cpp/system:system",
- "//mojo/services/http_server/public/cpp",
- "//mojo/services/http_server/public/interfaces",
+ "//mojo/services/http_server/cpp",
+ "//mojo/services/http_server/interfaces",
"//mojo/services/network/public/interfaces",
"//shell/test:bindings",
":embed_pingable",
diff --git a/shell/android/native_viewport_application_loader.h b/shell/android/native_viewport_application_loader.h
index 4eeb4c6..8e62420 100644
--- a/shell/android/native_viewport_application_loader.h
+++ b/shell/android/native_viewport_application_loader.h
@@ -7,8 +7,8 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/gpu/interfaces/gpu.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
#include "services/gles2/gpu_impl.h"
#include "shell/application_manager/application_loader.h"
diff --git a/shell/shell_apptest.cc b/shell/shell_apptest.cc
index e1ffb3c..033564d 100644
--- a/shell/shell_apptest.cc
+++ b/shell/shell_apptest.cc
@@ -14,9 +14,9 @@
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/system/macros.h"
-#include "mojo/services/http_server/public/cpp/http_server_util.h"
-#include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
-#include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
+#include "mojo/services/http_server/cpp/http_server_util.h"
+#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 "shell/kPingable.h"
#include "shell/test/pingable.mojom.h"
