Move surfaces service implementation to //services
R=sky@chromium.org, ben@chromium.org
Review URL: https://codereview.chromium.org/771043002
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 3e5c629..ff3206d 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -17,7 +17,6 @@
"//mojo/services/public/interfaces/navigation",
"//mojo/services/public/interfaces/network",
"//mojo/services/public/interfaces/surfaces",
- "//mojo/services/surfaces",
"//mojo/services/test_service:bindings",
]
diff --git a/mojo/services/surfaces/DEPS b/mojo/services/surfaces/DEPS
deleted file mode 100644
index deb1892..0000000
--- a/mojo/services/surfaces/DEPS
+++ /dev/null
@@ -1,10 +0,0 @@
-include_rules = [
- "+cc",
- "-cc/blink",
- "+mojo/application",
- "+mojo/cc",
- "+mojo/converters/geometry",
- "+mojo/converters/surfaces",
- "+mojo/services/gles2",
- "+mojo/services/public",
-]
diff --git a/services/BUILD.gn b/services/BUILD.gn
index f02fbb6..86a29bc 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -10,6 +10,7 @@
"//services/http_server",
"//services/http_server/public",
"//services/js",
+ "//services/surfaces",
"//services/tracing",
]
diff --git a/mojo/services/surfaces/BUILD.gn b/services/surfaces/BUILD.gn
similarity index 100%
rename from mojo/services/surfaces/BUILD.gn
rename to services/surfaces/BUILD.gn
diff --git a/mojo/services/surfaces/surfaces_impl.cc b/services/surfaces/surfaces_impl.cc
similarity index 98%
rename from mojo/services/surfaces/surfaces_impl.cc
rename to services/surfaces/surfaces_impl.cc
index 0f31f2d..9cbe6dd 100644
--- a/mojo/services/surfaces/surfaces_impl.cc
+++ b/services/surfaces/surfaces_impl.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 "mojo/services/surfaces/surfaces_impl.h"
+#include "services/surfaces/surfaces_impl.h"
#include "base/debug/trace_event.h"
#include "cc/output/compositor_frame.h"
diff --git a/mojo/services/surfaces/surfaces_impl.h b/services/surfaces/surfaces_impl.h
similarity index 95%
rename from mojo/services/surfaces/surfaces_impl.h
rename to services/surfaces/surfaces_impl.h
index c8e4965..90f4a01 100644
--- a/mojo/services/surfaces/surfaces_impl.h
+++ b/services/surfaces/surfaces_impl.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_SURFACES_SURFACES_IMPL_H_
-#define MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
+#ifndef SERVICES_SURFACES_SURFACES_IMPL_H_
+#define SERVICES_SURFACES_SURFACES_IMPL_H_
#include "cc/surfaces/display_client.h"
#include "cc/surfaces/surface_factory.h"
@@ -89,4 +89,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
+#endif // SERVICES_SURFACES_SURFACES_IMPL_H_
diff --git a/mojo/services/surfaces/surfaces_service_application.cc b/services/surfaces/surfaces_service_application.cc
similarity index 93%
rename from mojo/services/surfaces/surfaces_service_application.cc
rename to services/surfaces/surfaces_service_application.cc
index 2939075..619b66a 100644
--- a/mojo/services/surfaces/surfaces_service_application.cc
+++ b/services/surfaces/surfaces_service_application.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/services/surfaces/surfaces_service_application.h"
+#include "services/surfaces/surfaces_service_application.h"
#include "cc/surfaces/display.h"
#include "mojo/application/application_runner_chromium.h"
#include "mojo/common/tracing_impl.h"
#include "mojo/public/c/system/main.h"
-#include "mojo/services/surfaces/surfaces_service_impl.h"
+#include "services/surfaces/surfaces_service_impl.h"
namespace mojo {
diff --git a/mojo/services/surfaces/surfaces_service_application.h b/services/surfaces/surfaces_service_application.h
similarity index 87%
rename from mojo/services/surfaces/surfaces_service_application.h
rename to services/surfaces/surfaces_service_application.h
index 5012730..7034e07 100644
--- a/mojo/services/surfaces/surfaces_service_application.h
+++ b/services/surfaces/surfaces_service_application.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_SURFACES_SURFACES_SERVICE_APPLICATION_H_
-#define MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
+#ifndef SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
+#define SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
#include "base/macros.h"
#include "base/timer/timer.h"
@@ -11,7 +11,7 @@
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory.h"
#include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
-#include "mojo/services/surfaces/surfaces_impl.h"
+#include "services/surfaces/surfaces_impl.h"
namespace mojo {
class ApplicationConnection;
@@ -51,4 +51,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
+#endif // SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
diff --git a/mojo/services/surfaces/surfaces_service_impl.cc b/services/surfaces/surfaces_service_impl.cc
similarity index 93%
rename from mojo/services/surfaces/surfaces_service_impl.cc
rename to services/surfaces/surfaces_service_impl.cc
index e0b3ef9..92b4562 100644
--- a/mojo/services/surfaces/surfaces_service_impl.cc
+++ b/services/surfaces/surfaces_service_impl.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 "mojo/services/surfaces/surfaces_service_impl.h"
+#include "services/surfaces/surfaces_service_impl.h"
namespace mojo {
diff --git a/mojo/services/surfaces/surfaces_service_impl.h b/services/surfaces/surfaces_service_impl.h
similarity index 84%
rename from mojo/services/surfaces/surfaces_service_impl.h
rename to services/surfaces/surfaces_service_impl.h
index be8af25..efed5f5 100644
--- a/mojo/services/surfaces/surfaces_service_impl.h
+++ b/services/surfaces/surfaces_service_impl.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_SURFACES_SURFACES_SERVICE_IMPL_H_
-#define MOJO_SERVICES_SURFACES_SURFACES_SERVICE_IMPL_H_
+#ifndef SERVICES_SURFACES_SURFACES_SERVICE_IMPL_H_
+#define SERVICES_SURFACES_SURFACES_SERVICE_IMPL_H_
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
-#include "mojo/services/surfaces/surfaces_impl.h"
+#include "services/surfaces/surfaces_impl.h"
namespace cc {
class SurfaceManager;
@@ -43,4 +43,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_SURFACES_SURFACES_SERVICE_IMPL_H_
+#endif // SERVICES_SURFACES_SURFACES_SERVICE_IMPL_H_
