Move moterm_example_app to //examples.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1314133006 .
diff --git a/apps/BUILD.gn b/apps/BUILD.gn
index d830ac5..4a5ac77 100644
--- a/apps/BUILD.gn
+++ b/apps/BUILD.gn
@@ -11,6 +11,5 @@
"//apps/moterm",
"//apps/moterm:apptests",
"//apps/moterm:gl_helper_test_app",
- "//apps/moterm:moterm_example_app",
]
}
diff --git a/apps/moterm/BUILD.gn b/apps/moterm/BUILD.gn
index 31f8582..c987d04 100644
--- a/apps/moterm/BUILD.gn
+++ b/apps/moterm/BUILD.gn
@@ -32,25 +32,6 @@
]
}
-mojo_native_application("moterm_example_app") {
- sources = [
- "moterm_example_app.cc",
- ]
-
- deps = [
- "//base",
- "//examples/window_manager:bindings",
- "//mojo/application",
- "//mojo/public/cpp/bindings",
- "//mojo/public/cpp/utility",
- "//mojo/public/interfaces/application",
- "//mojo/services/files/public/interfaces",
- "//mojo/services/geometry/public/interfaces",
- "//mojo/services/view_manager/public/cpp",
- "//mojo/services/terminal/public/interfaces",
- ]
-}
-
mojo_native_application("gl_helper_test_app") {
sources = [
"gl_helper_test_app.cc",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index bfc2933..c066d87 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -20,6 +20,7 @@
"//examples/http_handler",
"//examples/indirect_service",
"//examples/keyboard_client",
+ "//examples/moterm_example_app",
"//examples/nesting_app",
"//examples/nfc_sender",
"//examples/notification_generator",
diff --git a/examples/moterm_example_app/BUILD.gn b/examples/moterm_example_app/BUILD.gn
new file mode 100644
index 0000000..65ed16d
--- /dev/null
+++ b/examples/moterm_example_app/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright 2015 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.
+
+import("//mojo/public/mojo_application.gni")
+
+mojo_native_application("moterm_example_app") {
+ sources = [
+ "moterm_example_app.cc",
+ ]
+
+ deps = [
+ "//base",
+ "//examples/window_manager:bindings",
+ "//mojo/application",
+ "//mojo/public/cpp/bindings",
+ "//mojo/public/cpp/utility",
+ "//mojo/public/interfaces/application",
+ "//mojo/services/files/public/interfaces",
+ "//mojo/services/geometry/public/interfaces",
+ "//mojo/services/view_manager/public/cpp",
+ "//mojo/services/terminal/public/interfaces",
+ ]
+}
diff --git a/apps/moterm/moterm_example_app.cc b/examples/moterm_example_app/moterm_example_app.cc
similarity index 98%
rename from apps/moterm/moterm_example_app.cc
rename to examples/moterm_example_app/moterm_example_app.cc
index dc52aa2..de5350c 100644
--- a/apps/moterm/moterm_example_app.cc
+++ b/examples/moterm_example_app/moterm_example_app.cc
@@ -14,7 +14,6 @@
#include "base/memory/weak_ptr.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
-#include "examples/window_manager/window_manager.mojom.h"
#include "mojo/application/application_runner_chromium.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
@@ -191,8 +190,7 @@
new MotermExampleAppView(application_impl_->shell(), root);
}
- void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override {
- }
+ void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override {}
mojo::ApplicationImpl* application_impl_;
scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
