Move clipboard service implementation to //services
R=erg@chromium.org
Review URL: https://codereview.chromium.org/766213003
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 74a3242..3c18f66c 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -79,11 +79,11 @@
"//mojo/public/cpp/environment/tests:mojo_public_environment_unittests",
"//mojo/public/cpp/system/tests:mojo_public_system_unittests",
"//mojo/public/cpp/utility/tests:mojo_public_utility_unittests",
- "//mojo/services/clipboard:clipboard_unittests",
"//mojo/services/network:apptests",
"//mojo/shell:external_application_unittests",
"//mojo/shell:mojo_shell_tests",
"//mojo/tools:message_generator",
+ "//services/clipboard:clipboard_unittests",
"//services/js:js_services_unittests",
"//services/js:js_apptests",
]
diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn
index 5944517..34d4b48 100644
--- a/mojo/services/BUILD.gn
+++ b/mojo/services/BUILD.gn
@@ -6,7 +6,6 @@
group("services") {
deps = [
- "//mojo/services/clipboard",
"//mojo/services/gles2:lib",
"//mojo/services/network",
"//mojo/services/public/interfaces/accessibility",
diff --git a/mojo/services/clipboard/DEPS b/mojo/services/clipboard/DEPS
deleted file mode 100644
index 79cfc5d..0000000
--- a/mojo/services/clipboard/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
- "+mojo/application",
- "+mojo/services",
-]
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 549a5af..87f5e1e 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -6,6 +6,7 @@
group("services") {
deps = [
+ "//services/clipboard",
"//services/http_server",
"//services/http_server/public",
"//services/js",
diff --git a/mojo/services/clipboard/BUILD.gn b/services/clipboard/BUILD.gn
similarity index 100%
rename from mojo/services/clipboard/BUILD.gn
rename to services/clipboard/BUILD.gn
diff --git a/mojo/services/clipboard/clipboard_standalone_impl.cc b/services/clipboard/clipboard_standalone_impl.cc
similarity index 97%
rename from mojo/services/clipboard/clipboard_standalone_impl.cc
rename to services/clipboard/clipboard_standalone_impl.cc
index 404eded..00a2467 100644
--- a/mojo/services/clipboard/clipboard_standalone_impl.cc
+++ b/services/clipboard/clipboard_standalone_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/clipboard/clipboard_standalone_impl.h"
+#include "services/clipboard/clipboard_standalone_impl.h"
#include <string.h>
diff --git a/mojo/services/clipboard/clipboard_standalone_impl.h b/services/clipboard/clipboard_standalone_impl.h
similarity index 90%
rename from mojo/services/clipboard/clipboard_standalone_impl.h
rename to services/clipboard/clipboard_standalone_impl.h
index 1a62e7d..8cffae6 100644
--- a/mojo/services/clipboard/clipboard_standalone_impl.h
+++ b/services/clipboard/clipboard_standalone_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_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
-#define MOJO_SERVICES_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
+#ifndef SERVICES_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
+#define SERVICES_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
#include <base/memory/scoped_ptr.h>
#include <string>
@@ -56,4 +56,4 @@
} // namespace mojo
-#endif // MOJO_SERVICES_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
+#endif // SERVICES_CLIPBOARD_CLIPBOARD_STANDALONE_IMPL_H_
diff --git a/mojo/services/clipboard/clipboard_standalone_unittest.cc b/services/clipboard/clipboard_standalone_unittest.cc
similarity index 100%
rename from mojo/services/clipboard/clipboard_standalone_unittest.cc
rename to services/clipboard/clipboard_standalone_unittest.cc
diff --git a/mojo/services/clipboard/main.cc b/services/clipboard/main.cc
similarity index 95%
rename from mojo/services/clipboard/main.cc
rename to services/clipboard/main.cc
index a7a2664..3072f83 100644
--- a/mojo/services/clipboard/main.cc
+++ b/services/clipboard/main.cc
@@ -14,7 +14,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/clipboard/clipboard_standalone_impl.h"
+#include "services/clipboard/clipboard_standalone_impl.h"
class Delegate : public mojo::ApplicationDelegate,
public mojo::InterfaceFactory<mojo::Clipboard> {
