Move //mojo/services/X/public/... to //mojo/services/X/... (part 1).
X = asset_bundle,
authenticating_url_loader_interceptor,
authentication,
camera,
clipboard,
contacts,
content_handler,
device_info,
files
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1388413005 .
diff --git a/apps/moterm/BUILD.gn b/apps/moterm/BUILD.gn
index c987d04..c28f108 100644
--- a/apps/moterm/BUILD.gn
+++ b/apps/moterm/BUILD.gn
@@ -23,7 +23,7 @@
"//mojo/public/cpp/application",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/bindings:callback",
- "//mojo/services/files/public/interfaces",
+ "//mojo/services/files/interfaces",
"//mojo/services/surfaces/public/interfaces:surface_id",
"//mojo/services/terminal/public/interfaces",
"//mojo/services/view_manager/public/cpp",
@@ -57,7 +57,7 @@
public_deps = [
"//base",
"//mojo/public/cpp/bindings",
- "//mojo/services/files/public/interfaces",
+ "//mojo/services/files/interfaces",
]
}
diff --git a/apps/moterm/README.md b/apps/moterm/README.md
index d37a8d4..451f0dd 100644
--- a/apps/moterm/README.md
+++ b/apps/moterm/README.md
@@ -23,5 +23,5 @@
## See also
* [//examples/moterm_example_app](../../examples/moterm_example_app)
-* [//mojo/services/files/public/interfaces](../../mojo/services/files/public/interfaces)
+* [//mojo/services/files/interfaces](../../mojo/services/files/interfaces)
* [//mojo/services/terminal/public/interfaces](../../mojo/services/terminal/public/interfaces)
diff --git a/apps/moterm/moterm_driver.cc b/apps/moterm/moterm_driver.cc
index a6af1da..d81c7b8 100644
--- a/apps/moterm/moterm_driver.cc
+++ b/apps/moterm/moterm_driver.cc
@@ -8,8 +8,8 @@
#include <limits>
#include "base/logging.h"
-#include "mojo/services/files/public/interfaces/ioctl.mojom.h"
-#include "mojo/services/files/public/interfaces/ioctl_terminal.mojom.h"
+#include "mojo/services/files/interfaces/ioctl.mojom.h"
+#include "mojo/services/files/interfaces/ioctl_terminal.mojom.h"
// Character constants:
const uint8_t kEOT = 4;
diff --git a/apps/moterm/moterm_driver.h b/apps/moterm/moterm_driver.h
index 57a2ab2..93a3445 100644
--- a/apps/moterm/moterm_driver.h
+++ b/apps/moterm/moterm_driver.h
@@ -20,8 +20,8 @@
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.mojom.h"
// TODO(vtl): Maybe we should Mojo-fy the driver and run it as a separate app?
class MotermDriver : public mojo::files::File {
diff --git a/apps/moterm/moterm_driver_unittest.cc b/apps/moterm/moterm_driver_unittest.cc
index 0e6b7a1..692e75f 100644
--- a/apps/moterm/moterm_driver_unittest.cc
+++ b/apps/moterm/moterm_driver_unittest.cc
@@ -14,8 +14,8 @@
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/bindings/callback.h"
#include "mojo/public/cpp/bindings/type_converter.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.h"
+#include "mojo/services/files/interfaces/file.mojom.h"
+#include "mojo/services/files/interfaces/types.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 35acabc..82f30d6 100644
--- a/apps/moterm/moterm_view.cc
+++ b/apps/moterm/moterm_view.cc
@@ -17,8 +17,8 @@
#include "apps/moterm/key_util.h"
#include "base/logging.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/services/files/public/interfaces/file.mojom.h"
-#include "mojo/services/files/public/interfaces/types.mojom.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/terminal/public/interfaces/terminal_client.mojom.h"
