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"
