Move //mojo/examples to //examples
TBR=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/684543003
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
new file mode 100644
index 0000000..8bdb389
--- /dev/null
+++ b/examples/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright 2014 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("//build/config/ui.gni")
+
+group("examples") {
+ testonly = true
+
+ deps = [
+ "//examples/apptest",
+ "//examples/content_handler_demo",
+ "//examples/echo",
+ "//examples/http_server",
+ "//examples/png_viewer",
+ "//examples/sample_app",
+ "//examples/surfaces_app",
+ "//examples/wget",
+ ]
+
+ if (use_aura) {
+ deps += [
+ "//examples/aura_demo:aura_demo",
+ "//examples/browser",
+ "//examples/embedded_app",
+ "//examples/media_viewer",
+ "//examples/nesting_app",
+ "//examples/keyboard",
+ "//examples/window_manager",
+ "//examples/wm_flow",
+ ]
+ }
+}
diff --git a/examples/DEPS b/examples/DEPS
new file mode 100644
index 0000000..0669117
--- /dev/null
+++ b/examples/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+ "+mojo",
+]
diff --git a/mojo/examples/apptest/BUILD.gn b/examples/apptest/BUILD.gn
similarity index 100%
rename from mojo/examples/apptest/BUILD.gn
rename to examples/apptest/BUILD.gn
diff --git a/mojo/examples/apptest/example_apptest.cc b/examples/apptest/example_apptest.cc
similarity index 93%
rename from mojo/examples/apptest/example_apptest.cc
rename to examples/apptest/example_apptest.cc
index 4eb7ad5..b7a8e45 100644
--- a/mojo/examples/apptest/example_apptest.cc
+++ b/examples/apptest/example_apptest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/examples/apptest/example_client_application.h"
-#include "mojo/examples/apptest/example_client_impl.h"
-#include "mojo/examples/apptest/example_service.mojom.h"
+#include "examples/apptest/example_client_application.h"
+#include "examples/apptest/example_client_impl.h"
+#include "examples/apptest/example_service.mojom.h"
#include "mojo/public/cpp/application/application_impl.h"
#include "mojo/public/cpp/application/application_test_base.h"
#include "mojo/public/cpp/bindings/callback.h"
diff --git a/mojo/examples/apptest/example_client_application.cc b/examples/apptest/example_client_application.cc
similarity index 86%
rename from mojo/examples/apptest/example_client_application.cc
rename to examples/apptest/example_client_application.cc
index ca59eff..2c020a9 100644
--- a/mojo/examples/apptest/example_client_application.cc
+++ b/examples/apptest/example_client_application.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/examples/apptest/example_client_application.h"
+#include "examples/apptest/example_client_application.h"
namespace mojo {
diff --git a/mojo/examples/apptest/example_client_application.h b/examples/apptest/example_client_application.h
similarity index 100%
rename from mojo/examples/apptest/example_client_application.h
rename to examples/apptest/example_client_application.h
diff --git a/mojo/examples/apptest/example_client_impl.cc b/examples/apptest/example_client_impl.cc
similarity index 88%
rename from mojo/examples/apptest/example_client_impl.cc
rename to examples/apptest/example_client_impl.cc
index d794117..06b7505 100644
--- a/mojo/examples/apptest/example_client_impl.cc
+++ b/examples/apptest/example_client_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/examples/apptest/example_client_impl.h"
+#include "examples/apptest/example_client_impl.h"
#include "mojo/public/cpp/utility/run_loop.h"
namespace mojo {
diff --git a/mojo/examples/apptest/example_client_impl.h b/examples/apptest/example_client_impl.h
similarity index 93%
rename from mojo/examples/apptest/example_client_impl.h
rename to examples/apptest/example_client_impl.h
index ee835ca..00c974b 100644
--- a/mojo/examples/apptest/example_client_impl.h
+++ b/examples/apptest/example_client_impl.h
@@ -5,7 +5,7 @@
#ifndef MOJO_EXAMPLES_TEST_EXAMPLE_CLIENT_IMPL_H_
#define MOJO_EXAMPLES_TEST_EXAMPLE_CLIENT_IMPL_H_
-#include "mojo/examples/apptest/example_service.mojom.h"
+#include "examples/apptest/example_service.mojom.h"
#include "mojo/public/cpp/system/macros.h"
namespace mojo {
diff --git a/mojo/examples/apptest/example_service.mojom b/examples/apptest/example_service.mojom
similarity index 100%
rename from mojo/examples/apptest/example_service.mojom
rename to examples/apptest/example_service.mojom
diff --git a/mojo/examples/apptest/example_service_application.cc b/examples/apptest/example_service_application.cc
similarity index 92%
rename from mojo/examples/apptest/example_service_application.cc
rename to examples/apptest/example_service_application.cc
index a62a510..993bda3 100644
--- a/mojo/examples/apptest/example_service_application.cc
+++ b/examples/apptest/example_service_application.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/examples/apptest/example_service_application.h"
+#include "examples/apptest/example_service_application.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
diff --git a/mojo/examples/apptest/example_service_application.h b/examples/apptest/example_service_application.h
similarity index 94%
rename from mojo/examples/apptest/example_service_application.h
rename to examples/apptest/example_service_application.h
index 96843cc..301895f 100644
--- a/mojo/examples/apptest/example_service_application.h
+++ b/examples/apptest/example_service_application.h
@@ -5,7 +5,7 @@
#ifndef MOJO_EXAMPLES_TEST_EXAMPLE_SERVICE_APPLICATION_H_
#define MOJO_EXAMPLES_TEST_EXAMPLE_SERVICE_APPLICATION_H_
-#include "mojo/examples/apptest/example_service_impl.h"
+#include "examples/apptest/example_service_impl.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/interface_factory_impl.h"
#include "mojo/public/cpp/system/macros.h"
diff --git a/mojo/examples/apptest/example_service_impl.cc b/examples/apptest/example_service_impl.cc
similarity index 90%
rename from mojo/examples/apptest/example_service_impl.cc
rename to examples/apptest/example_service_impl.cc
index b8e53d5..6eae1ad 100644
--- a/mojo/examples/apptest/example_service_impl.cc
+++ b/examples/apptest/example_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/examples/apptest/example_service_impl.h"
+#include "examples/apptest/example_service_impl.h"
#include "mojo/public/cpp/utility/run_loop.h"
diff --git a/mojo/examples/apptest/example_service_impl.h b/examples/apptest/example_service_impl.h
similarity index 93%
rename from mojo/examples/apptest/example_service_impl.h
rename to examples/apptest/example_service_impl.h
index 18537fa..7c6138a 100644
--- a/mojo/examples/apptest/example_service_impl.h
+++ b/examples/apptest/example_service_impl.h
@@ -5,7 +5,7 @@
#ifndef MOJO_EXAMPLES_TEST_EXAMPLE_SERVICE_IMPL_H_
#define MOJO_EXAMPLES_TEST_EXAMPLE_SERVICE_IMPL_H_
-#include "mojo/examples/apptest/example_service.mojom.h"
+#include "examples/apptest/example_service.mojom.h"
#include "mojo/public/cpp/system/macros.h"
namespace mojo {
diff --git a/mojo/examples/aura_demo/BUILD.gn b/examples/aura_demo/BUILD.gn
similarity index 100%
rename from mojo/examples/aura_demo/BUILD.gn
rename to examples/aura_demo/BUILD.gn
diff --git a/mojo/examples/aura_demo/DEPS b/examples/aura_demo/DEPS
similarity index 100%
rename from mojo/examples/aura_demo/DEPS
rename to examples/aura_demo/DEPS
diff --git a/mojo/examples/aura_demo/aura_demo.cc b/examples/aura_demo/aura_demo.cc
similarity index 100%
rename from mojo/examples/aura_demo/aura_demo.cc
rename to examples/aura_demo/aura_demo.cc
diff --git a/mojo/examples/aura_demo/view_manager_init.cc b/examples/aura_demo/view_manager_init.cc
similarity index 100%
rename from mojo/examples/aura_demo/view_manager_init.cc
rename to examples/aura_demo/view_manager_init.cc
diff --git a/mojo/examples/bitmap_uploader/BUILD.gn b/examples/bitmap_uploader/BUILD.gn
similarity index 100%
rename from mojo/examples/bitmap_uploader/BUILD.gn
rename to examples/bitmap_uploader/BUILD.gn
diff --git a/mojo/examples/bitmap_uploader/DEPS b/examples/bitmap_uploader/DEPS
similarity index 100%
rename from mojo/examples/bitmap_uploader/DEPS
rename to examples/bitmap_uploader/DEPS
diff --git a/mojo/examples/bitmap_uploader/bitmap_uploader.cc b/examples/bitmap_uploader/bitmap_uploader.cc
similarity index 98%
rename from mojo/examples/bitmap_uploader/bitmap_uploader.cc
rename to examples/bitmap_uploader/bitmap_uploader.cc
index 6a878ec..57b6137 100644
--- a/mojo/examples/bitmap_uploader/bitmap_uploader.cc
+++ b/examples/bitmap_uploader/bitmap_uploader.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/examples/bitmap_uploader/bitmap_uploader.h"
+#include "examples/bitmap_uploader/bitmap_uploader.h"
#ifndef GL_GLEXT_PROTOTYPES
#define GL_GLEXT_PROTOTYPES
diff --git a/mojo/examples/bitmap_uploader/bitmap_uploader.h b/examples/bitmap_uploader/bitmap_uploader.h
similarity index 91%
rename from mojo/examples/bitmap_uploader/bitmap_uploader.h
rename to examples/bitmap_uploader/bitmap_uploader.h
index 56f37fe..ec713e2 100644
--- a/mojo/examples/bitmap_uploader/bitmap_uploader.h
+++ b/examples/bitmap_uploader/bitmap_uploader.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_EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
-#define MOJO_EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
+#ifndef EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
+#define EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
@@ -65,4 +65,4 @@
} // namespace mojo
-#endif // MOJO_EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
+#endif // EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
diff --git a/mojo/examples/browser/BUILD.gn b/examples/browser/BUILD.gn
similarity index 95%
rename from mojo/examples/browser/BUILD.gn
rename to examples/browser/BUILD.gn
index c8a235c..09a6693 100644
--- a/mojo/examples/browser/BUILD.gn
+++ b/examples/browser/BUILD.gn
@@ -14,12 +14,12 @@
deps = [
"//base",
"//cc",
+ "//examples/window_manager:bindings",
"//mojo/application",
"//mojo/aura",
"//mojo/common",
"//mojo/converters/geometry",
"//mojo/converters/input_events",
- "//mojo/examples/window_manager:bindings",
"//mojo/public/c/system:for_shared_library",
"//mojo/services/public/cpp/view_manager",
"//mojo/services/public/interfaces/geometry",
diff --git a/mojo/examples/browser/DEPS b/examples/browser/DEPS
similarity index 100%
rename from mojo/examples/browser/DEPS
rename to examples/browser/DEPS
diff --git a/mojo/examples/browser/browser.cc b/examples/browser/browser.cc
similarity index 99%
rename from mojo/examples/browser/browser.cc
rename to examples/browser/browser.cc
index 9f88e51..e823520 100644
--- a/mojo/examples/browser/browser.cc
+++ b/examples/browser/browser.cc
@@ -5,10 +5,10 @@
#include "base/macros.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "examples/window_manager/window_manager.mojom.h"
#include "mojo/application/application_runner_chromium.h"
#include "mojo/common/common_type_converters.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/examples/window_manager/window_manager.mojom.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/content_handler_demo/BUILD.gn b/examples/content_handler_demo/BUILD.gn
similarity index 100%
rename from mojo/examples/content_handler_demo/BUILD.gn
rename to examples/content_handler_demo/BUILD.gn
diff --git a/mojo/examples/content_handler_demo/content_handler_demo.cc b/examples/content_handler_demo/content_handler_demo.cc
similarity index 100%
rename from mojo/examples/content_handler_demo/content_handler_demo.cc
rename to examples/content_handler_demo/content_handler_demo.cc
diff --git a/mojo/examples/echo/BUILD.gn b/examples/echo/BUILD.gn
similarity index 100%
rename from mojo/examples/echo/BUILD.gn
rename to examples/echo/BUILD.gn
diff --git a/mojo/examples/echo/echo_client.cc b/examples/echo/echo_client.cc
similarity index 95%
rename from mojo/examples/echo/echo_client.cc
rename to examples/echo/echo_client.cc
index 1d44d08..e372846 100644
--- a/mojo/examples/echo/echo_client.cc
+++ b/examples/echo/echo_client.cc
@@ -4,7 +4,7 @@
#include <stdio.h>
-#include "mojo/examples/echo/echo_service.mojom.h"
+#include "examples/echo/echo_service.mojom.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
diff --git a/mojo/examples/echo/echo_service.cc b/examples/echo/echo_service.cc
similarity index 95%
rename from mojo/examples/echo/echo_service.cc
rename to examples/echo/echo_service.cc
index 5df36ad..c96f106 100644
--- a/mojo/examples/echo/echo_service.cc
+++ b/examples/echo/echo_service.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/examples/echo/echo_service.mojom.h"
+#include "examples/echo/echo_service.mojom.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/echo/echo_service.mojom b/examples/echo/echo_service.mojom
similarity index 100%
rename from mojo/examples/echo/echo_service.mojom
rename to examples/echo/echo_service.mojom
diff --git a/mojo/examples/embedded_app/BUILD.gn b/examples/embedded_app/BUILD.gn
similarity index 88%
rename from mojo/examples/embedded_app/BUILD.gn
rename to examples/embedded_app/BUILD.gn
index f8915ca..49c347f 100644
--- a/mojo/examples/embedded_app/BUILD.gn
+++ b/examples/embedded_app/BUILD.gn
@@ -9,9 +9,9 @@
deps = [
"//base",
+ "//examples/bitmap_uploader",
+ "//examples/window_manager:bindings",
"//mojo/application",
- "//mojo/examples/bitmap_uploader",
- "//mojo/examples/window_manager:bindings",
"//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
diff --git a/mojo/examples/embedded_app/DEPS b/examples/embedded_app/DEPS
similarity index 100%
rename from mojo/examples/embedded_app/DEPS
rename to examples/embedded_app/DEPS
diff --git a/mojo/examples/embedded_app/embedded_app.cc b/examples/embedded_app/embedded_app.cc
similarity index 98%
rename from mojo/examples/embedded_app/embedded_app.cc
rename to examples/embedded_app/embedded_app.cc
index 98c418e..211afe9 100644
--- a/mojo/examples/embedded_app/embedded_app.cc
+++ b/examples/embedded_app/embedded_app.cc
@@ -7,8 +7,8 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string_number_conversions.h"
+#include "examples/bitmap_uploader/bitmap_uploader.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/bitmap_uploader/bitmap_uploader.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/http_server/BUILD.gn b/examples/http_server/BUILD.gn
similarity index 100%
rename from mojo/examples/http_server/BUILD.gn
rename to examples/http_server/BUILD.gn
diff --git a/mojo/examples/http_server/http_server.cc b/examples/http_server/http_server.cc
similarity index 100%
rename from mojo/examples/http_server/http_server.cc
rename to examples/http_server/http_server.cc
diff --git a/mojo/examples/keyboard/BUILD.gn b/examples/keyboard/BUILD.gn
similarity index 100%
rename from mojo/examples/keyboard/BUILD.gn
rename to examples/keyboard/BUILD.gn
diff --git a/mojo/examples/keyboard/DEPS b/examples/keyboard/DEPS
similarity index 100%
rename from mojo/examples/keyboard/DEPS
rename to examples/keyboard/DEPS
diff --git a/mojo/examples/keyboard/keyboard.cc b/examples/keyboard/keyboard.cc
similarity index 96%
rename from mojo/examples/keyboard/keyboard.cc
rename to examples/keyboard/keyboard.cc
index d08b6ed..7e36db4 100644
--- a/mojo/examples/keyboard/keyboard.cc
+++ b/examples/keyboard/keyboard.cc
@@ -5,10 +5,10 @@
#include "base/macros.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "examples/keyboard/keyboard.mojom.h"
+#include "examples/keyboard/keyboard_delegate.h"
+#include "examples/keyboard/keyboard_view.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/keyboard/keyboard.mojom.h"
-#include "mojo/examples/keyboard/keyboard_delegate.h"
-#include "mojo/examples/keyboard/keyboard_view.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/keyboard/keyboard.mojom b/examples/keyboard/keyboard.mojom
similarity index 100%
rename from mojo/examples/keyboard/keyboard.mojom
rename to examples/keyboard/keyboard.mojom
diff --git a/mojo/examples/keyboard/keyboard_delegate.h b/examples/keyboard/keyboard_delegate.h
similarity index 74%
rename from mojo/examples/keyboard/keyboard_delegate.h
rename to examples/keyboard/keyboard_delegate.h
index bf35fc6..dce9f05 100644
--- a/mojo/examples/keyboard/keyboard_delegate.h
+++ b/examples/keyboard/keyboard_delegate.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_EXAMPLES_KEYBOARD_KEYBOARD_DELEGATE_H_
-#define MOJO_EXAMPLES_KEYBOARD_KEYBOARD_DELEGATE_H_
+#ifndef EXAMPLES_KEYBOARD_KEYBOARD_DELEGATE_H_
+#define EXAMPLES_KEYBOARD_KEYBOARD_DELEGATE_H_
#include "base/basictypes.h"
@@ -23,4 +23,4 @@
} // namespace examples
} // namespace mojo
-#endif // MOJO_EXAMPLES_KEYBOARD_KEYBOARD_DELEGATE_H_
+#endif // EXAMPLES_KEYBOARD_KEYBOARD_DELEGATE_H_
diff --git a/mojo/examples/keyboard/keyboard_view.cc b/examples/keyboard/keyboard_view.cc
similarity index 98%
rename from mojo/examples/keyboard/keyboard_view.cc
rename to examples/keyboard/keyboard_view.cc
index 3a0d71a..600c607 100644
--- a/mojo/examples/keyboard/keyboard_view.cc
+++ b/examples/keyboard/keyboard_view.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/examples/keyboard/keyboard_view.h"
+#include "examples/keyboard/keyboard_view.h"
#include <algorithm>
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
-#include "mojo/examples/keyboard/keyboard_delegate.h"
-#include "mojo/examples/keyboard/keys.h"
+#include "examples/keyboard/keyboard_delegate.h"
+#include "examples/keyboard/keys.h"
#include "ui/events/keycodes/keyboard_code_conversion.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/canvas.h"
diff --git a/mojo/examples/keyboard/keyboard_view.h b/examples/keyboard/keyboard_view.h
similarity index 94%
rename from mojo/examples/keyboard/keyboard_view.h
rename to examples/keyboard/keyboard_view.h
index 4086a2d..6c865f0 100644
--- a/mojo/examples/keyboard/keyboard_view.h
+++ b/examples/keyboard/keyboard_view.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_EXAMPLES_KEYBOARD_KEYBOARD_VIEW_H_
-#define MOJO_EXAMPLES_KEYBOARD_KEYBOARD_VIEW_H_
+#ifndef EXAMPLES_KEYBOARD_KEYBOARD_VIEW_H_
+#define EXAMPLES_KEYBOARD_KEYBOARD_VIEW_H_
#include <vector>
@@ -101,4 +101,4 @@
} // namespace examples
} // namespace mojo
-#endif // MOJO_EXAMPLES_KEYBOARD_KEYBOARD_VIEW_H_
+#endif // EXAMPLES_KEYBOARD_KEYBOARD_VIEW_H_
diff --git a/mojo/examples/keyboard/keys.cc b/examples/keyboard/keys.cc
similarity index 98%
rename from mojo/examples/keyboard/keys.cc
rename to examples/keyboard/keys.cc
index adf9094..cc924c1 100644
--- a/mojo/examples/keyboard/keys.cc
+++ b/examples/keyboard/keys.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/examples/keyboard/keys.h"
+#include "examples/keyboard/keys.h"
#include "base/macros.h"
#include "ui/events/event_constants.h"
diff --git a/mojo/examples/keyboard/keys.h b/examples/keyboard/keys.h
similarity index 91%
rename from mojo/examples/keyboard/keys.h
rename to examples/keyboard/keys.h
index c09f856..65988bc 100644
--- a/mojo/examples/keyboard/keys.h
+++ b/examples/keyboard/keys.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_EXAMPLES_KEYBOARD_KEYS_H_
-#define MOJO_EXAMPLES_KEYBOARD_KEYS_H_
+#ifndef EXAMPLES_KEYBOARD_KEYS_H_
+#define EXAMPLES_KEYBOARD_KEYS_H_
#include <vector>
@@ -59,4 +59,4 @@
} // namespace examples
} // namespace mojo
-#endif // MOJO_EXAMPLES_KEYBOARD_KEYS_H_
+#endif // EXAMPLES_KEYBOARD_KEYS_H_
diff --git a/mojo/examples/media_viewer/BUILD.gn b/examples/media_viewer/BUILD.gn
similarity index 100%
rename from mojo/examples/media_viewer/BUILD.gn
rename to examples/media_viewer/BUILD.gn
diff --git a/mojo/examples/media_viewer/DEPS b/examples/media_viewer/DEPS
similarity index 100%
rename from mojo/examples/media_viewer/DEPS
rename to examples/media_viewer/DEPS
diff --git a/mojo/examples/media_viewer/media_viewer.cc b/examples/media_viewer/media_viewer.cc
similarity index 99%
rename from mojo/examples/media_viewer/media_viewer.cc
rename to examples/media_viewer/media_viewer.cc
index c5dbd4d..2a3fc02 100644
--- a/mojo/examples/media_viewer/media_viewer.cc
+++ b/examples/media_viewer/media_viewer.cc
@@ -8,8 +8,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
+#include "examples/media_viewer/media_viewer.mojom.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/media_viewer/media_viewer.mojom.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/media_viewer/media_viewer.mojom b/examples/media_viewer/media_viewer.mojom
similarity index 100%
rename from mojo/examples/media_viewer/media_viewer.mojom
rename to examples/media_viewer/media_viewer.mojom
diff --git a/mojo/examples/nesting_app/BUILD.gn b/examples/nesting_app/BUILD.gn
similarity index 87%
rename from mojo/examples/nesting_app/BUILD.gn
rename to examples/nesting_app/BUILD.gn
index d7771dd..7a5cfeb 100644
--- a/mojo/examples/nesting_app/BUILD.gn
+++ b/examples/nesting_app/BUILD.gn
@@ -9,9 +9,9 @@
deps = [
"//base",
+ "//examples/bitmap_uploader",
+ "//examples/window_manager:bindings",
"//mojo/application",
- "//mojo/examples/bitmap_uploader",
- "//mojo/examples/window_manager:bindings",
"//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
diff --git a/mojo/examples/nesting_app/DEPS b/examples/nesting_app/DEPS
similarity index 100%
rename from mojo/examples/nesting_app/DEPS
rename to examples/nesting_app/DEPS
diff --git a/mojo/examples/nesting_app/nesting_app.cc b/examples/nesting_app/nesting_app.cc
similarity index 96%
rename from mojo/examples/nesting_app/nesting_app.cc
rename to examples/nesting_app/nesting_app.cc
index 7d281e4..814f5ab 100644
--- a/mojo/examples/nesting_app/nesting_app.cc
+++ b/examples/nesting_app/nesting_app.cc
@@ -6,9 +6,9 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/stringprintf.h"
+#include "examples/bitmap_uploader/bitmap_uploader.h"
+#include "examples/window_manager/window_manager.mojom.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/bitmap_uploader/bitmap_uploader.h"
-#include "mojo/examples/window_manager/window_manager.mojom.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/png_viewer/BUILD.gn b/examples/png_viewer/BUILD.gn
similarity index 87%
rename from mojo/examples/png_viewer/BUILD.gn
rename to examples/png_viewer/BUILD.gn
index 5234fb4..94092e9 100644
--- a/mojo/examples/png_viewer/BUILD.gn
+++ b/examples/png_viewer/BUILD.gn
@@ -8,9 +8,9 @@
]
deps = [
+ "//examples/bitmap_uploader",
+ "//examples/media_viewer:bindings",
"//mojo/application",
- "//mojo/examples/bitmap_uploader",
- "//mojo/examples/media_viewer:bindings",
"//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
diff --git a/mojo/examples/png_viewer/DEPS b/examples/png_viewer/DEPS
similarity index 100%
rename from mojo/examples/png_viewer/DEPS
rename to examples/png_viewer/DEPS
diff --git a/mojo/examples/png_viewer/png_viewer.cc b/examples/png_viewer/png_viewer.cc
similarity index 98%
rename from mojo/examples/png_viewer/png_viewer.cc
rename to examples/png_viewer/png_viewer.cc
index 42323a3..4e24e4f 100644
--- a/mojo/examples/png_viewer/png_viewer.cc
+++ b/examples/png_viewer/png_viewer.cc
@@ -8,9 +8,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string_tokenizer.h"
+#include "examples/bitmap_uploader/bitmap_uploader.h"
+#include "examples/media_viewer/media_viewer.mojom.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/bitmap_uploader/bitmap_uploader.h"
-#include "mojo/examples/media_viewer/media_viewer.mojom.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/sample_app/BUILD.gn b/examples/sample_app/BUILD.gn
similarity index 100%
rename from mojo/examples/sample_app/BUILD.gn
rename to examples/sample_app/BUILD.gn
diff --git a/mojo/examples/sample_app/DEPS b/examples/sample_app/DEPS
similarity index 100%
rename from mojo/examples/sample_app/DEPS
rename to examples/sample_app/DEPS
diff --git a/mojo/examples/sample_app/gles2_client_impl.cc b/examples/sample_app/gles2_client_impl.cc
similarity index 98%
rename from mojo/examples/sample_app/gles2_client_impl.cc
rename to examples/sample_app/gles2_client_impl.cc
index 6cdd87a..29950eb 100644
--- a/mojo/examples/sample_app/gles2_client_impl.cc
+++ b/examples/sample_app/gles2_client_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/examples/sample_app/gles2_client_impl.h"
+#include "examples/sample_app/gles2_client_impl.h"
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
diff --git a/mojo/examples/sample_app/gles2_client_impl.h b/examples/sample_app/gles2_client_impl.h
similarity index 82%
rename from mojo/examples/sample_app/gles2_client_impl.h
rename to examples/sample_app/gles2_client_impl.h
index 1a968a0..7f9c3ac 100644
--- a/mojo/examples/sample_app/gles2_client_impl.h
+++ b/examples/sample_app/gles2_client_impl.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_
-#define MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_
+#ifndef EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_
+#define EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_
-#include "mojo/examples/sample_app/spinning_cube.h"
+#include "examples/sample_app/spinning_cube.h"
#include "mojo/public/c/gles2/gles2.h"
#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
#include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.h"
@@ -41,4 +41,4 @@
} // namespace examples
-#endif // MOJO_EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_
+#endif // EXAMPLES_SAMPLE_APP_GLES2_CLIENT_IMPL_H_
diff --git a/mojo/examples/sample_app/sample_app.cc b/examples/sample_app/sample_app.cc
similarity index 97%
rename from mojo/examples/sample_app/sample_app.cc
rename to examples/sample_app/sample_app.cc
index faa3c44..26eac51 100644
--- a/mojo/examples/sample_app/sample_app.cc
+++ b/examples/sample_app/sample_app.cc
@@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/memory/weak_ptr.h"
-#include "mojo/examples/sample_app/gles2_client_impl.h"
+#include "examples/sample_app/gles2_client_impl.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/sample_app/spinning_cube.cc b/examples/sample_app/spinning_cube.cc
similarity index 99%
rename from mojo/examples/sample_app/spinning_cube.cc
rename to examples/sample_app/spinning_cube.cc
index e417984..d8889fe 100644
--- a/mojo/examples/sample_app/spinning_cube.cc
+++ b/examples/sample_app/spinning_cube.cc
@@ -14,13 +14,13 @@
// http://www.opengles-book.com
//
-#include "mojo/examples/sample_app/spinning_cube.h"
+#include "examples/sample_app/spinning_cube.h"
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
namespace examples {
diff --git a/mojo/examples/sample_app/spinning_cube.h b/examples/sample_app/spinning_cube.h
similarity index 86%
rename from mojo/examples/sample_app/spinning_cube.h
rename to examples/sample_app/spinning_cube.h
index f8d506d..757daf6 100644
--- a/mojo/examples/sample_app/spinning_cube.h
+++ b/examples/sample_app/spinning_cube.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_EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
-#define MOJO_EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
+#ifndef EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
+#define EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
#include <stdint.h>
@@ -46,4 +46,4 @@
} // namespace examples
-#endif // MOJO_EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
+#endif // EXAMPLES_SAMPLE_APP_SPINNING_CUBE_H_
diff --git a/mojo/examples/surfaces_app/BUILD.gn b/examples/surfaces_app/BUILD.gn
similarity index 98%
rename from mojo/examples/surfaces_app/BUILD.gn
rename to examples/surfaces_app/BUILD.gn
index d348fce..0f51366 100644
--- a/mojo/examples/surfaces_app/BUILD.gn
+++ b/examples/surfaces_app/BUILD.gn
@@ -85,13 +85,13 @@
"//base",
"//cc",
"//cc/surfaces",
+ "//examples/sample_app:spinning_cube",
"//gpu/command_buffer/common",
"//mojo/application",
"//mojo/common",
"//mojo/converters/geometry",
"//mojo/converters/surfaces",
"//mojo/environment:chromium",
- "//mojo/examples/sample_app:spinning_cube",
"//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/environment",
diff --git a/mojo/examples/surfaces_app/DEPS b/examples/surfaces_app/DEPS
similarity index 100%
rename from mojo/examples/surfaces_app/DEPS
rename to examples/surfaces_app/DEPS
diff --git a/mojo/examples/surfaces_app/child.mojom b/examples/surfaces_app/child.mojom
similarity index 100%
rename from mojo/examples/surfaces_app/child.mojom
rename to examples/surfaces_app/child.mojom
diff --git a/mojo/examples/surfaces_app/child_app.cc b/examples/surfaces_app/child_app.cc
similarity index 96%
rename from mojo/examples/surfaces_app/child_app.cc
rename to examples/surfaces_app/child_app.cc
index ecd371e..78c1968 100644
--- a/mojo/examples/surfaces_app/child_app.cc
+++ b/examples/surfaces_app/child_app.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/macros.h"
+#include "examples/surfaces_app/child_impl.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/surfaces_app/child_impl.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/surfaces_app/child_gl_app.cc b/examples/surfaces_app/child_gl_app.cc
similarity index 97%
rename from mojo/examples/surfaces_app/child_gl_app.cc
rename to examples/surfaces_app/child_gl_app.cc
index a18b208..015ffde 100644
--- a/mojo/examples/surfaces_app/child_gl_app.cc
+++ b/examples/surfaces_app/child_gl_app.cc
@@ -4,8 +4,8 @@
#include "base/macros.h"
#include "base/threading/platform_thread.h"
+#include "examples/surfaces_app/child_gl_impl.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/surfaces_app/child_gl_impl.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/surfaces_app/child_gl_impl.cc b/examples/surfaces_app/child_gl_impl.cc
similarity index 98%
rename from mojo/examples/surfaces_app/child_gl_impl.cc
rename to examples/surfaces_app/child_gl_impl.cc
index 175ab7f..4f91f3d 100644
--- a/mojo/examples/surfaces_app/child_gl_impl.cc
+++ b/examples/surfaces_app/child_gl_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/examples/surfaces_app/child_gl_impl.h"
+#include "examples/surfaces_app/child_gl_impl.h"
#ifndef GL_GLEXT_PROTOTYPES
#define GL_GLEXT_PROTOTYPES
@@ -14,13 +14,13 @@
#include "cc/output/delegated_frame_data.h"
#include "cc/quads/render_pass.h"
#include "cc/quads/texture_draw_quad.h"
+#include "examples/surfaces_app/surfaces_util.h"
#include "gpu/GLES2/gl2chromium.h"
#include "gpu/GLES2/gl2extchromium.h"
#include "gpu/command_buffer/common/mailbox.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/examples/surfaces_app/surfaces_util.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/environment/environment.h"
#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
diff --git a/mojo/examples/surfaces_app/child_gl_impl.h b/examples/surfaces_app/child_gl_impl.h
similarity index 88%
rename from mojo/examples/surfaces_app/child_gl_impl.h
rename to examples/surfaces_app/child_gl_impl.h
index 4c73e00..48060b8 100644
--- a/mojo/examples/surfaces_app/child_gl_impl.h
+++ b/examples/surfaces_app/child_gl_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_EXAMPLES_SURFACES_APP_CHILD_GL_IMPL_H_
-#define MOJO_EXAMPLES_SURFACES_APP_CHILD_GL_IMPL_H_
+#ifndef EXAMPLES_SURFACES_APP_CHILD_GL_IMPL_H_
+#define EXAMPLES_SURFACES_APP_CHILD_GL_IMPL_H_
#include "base/containers/hash_tables.h"
#include "base/macros.h"
@@ -12,8 +12,8 @@
#include "base/time/time.h"
#include "cc/surfaces/surface_id.h"
#include "cc/surfaces/surface_id_allocator.h"
-#include "mojo/examples/sample_app/spinning_cube.h"
-#include "mojo/examples/surfaces_app/child.mojom.h"
+#include "examples/sample_app/spinning_cube.h"
+#include "examples/surfaces_app/child.mojom.h"
#include "mojo/public/c/gles2/gles2.h"
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
@@ -73,4 +73,4 @@
} // namespace examples
} // namespace mojo
-#endif // MOJO_EXAMPLES_SURFACES_APP_CHILD_GL_IMPL_H_
+#endif // EXAMPLES_SURFACES_APP_CHILD_GL_IMPL_H_
diff --git a/mojo/examples/surfaces_app/child_impl.cc b/examples/surfaces_app/child_impl.cc
similarity index 96%
rename from mojo/examples/surfaces_app/child_impl.cc
rename to examples/surfaces_app/child_impl.cc
index 5ce6238..980d6c2 100644
--- a/mojo/examples/surfaces_app/child_impl.cc
+++ b/examples/surfaces_app/child_impl.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/examples/surfaces_app/child_impl.h"
+#include "examples/surfaces_app/child_impl.h"
#include "base/bind.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/delegated_frame_data.h"
#include "cc/quads/render_pass.h"
#include "cc/quads/solid_color_draw_quad.h"
+#include "examples/surfaces_app/surfaces_util.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/examples/surfaces_app/surfaces_util.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
#include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
diff --git a/mojo/examples/surfaces_app/child_impl.h b/examples/surfaces_app/child_impl.h
similarity index 90%
rename from mojo/examples/surfaces_app/child_impl.h
rename to examples/surfaces_app/child_impl.h
index 1cb887e..1a74139 100644
--- a/mojo/examples/surfaces_app/child_impl.h
+++ b/examples/surfaces_app/child_impl.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
-#define MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
+#ifndef EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
+#define EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "cc/surfaces/surface_id.h"
#include "cc/surfaces/surface_id_allocator.h"
-#include "mojo/examples/surfaces_app/child.mojom.h"
+#include "examples/surfaces_app/child.mojom.h"
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
#include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
@@ -72,4 +72,4 @@
} // namespace examples
} // namespace mojo
-#endif // MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
+#endif // EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
diff --git a/mojo/examples/surfaces_app/embedder.cc b/examples/surfaces_app/embedder.cc
similarity index 96%
rename from mojo/examples/surfaces_app/embedder.cc
rename to examples/surfaces_app/embedder.cc
index 8363ce9..9c07f79 100644
--- a/mojo/examples/surfaces_app/embedder.cc
+++ b/examples/surfaces_app/embedder.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/examples/surfaces_app/embedder.h"
+#include "examples/surfaces_app/embedder.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/delegated_frame_data.h"
#include "cc/quads/render_pass.h"
#include "cc/quads/solid_color_draw_quad.h"
#include "cc/quads/surface_draw_quad.h"
+#include "examples/surfaces_app/surfaces_util.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/examples/surfaces_app/surfaces_util.h"
#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
diff --git a/mojo/examples/surfaces_app/embedder.h b/examples/surfaces_app/embedder.h
similarity index 87%
rename from mojo/examples/surfaces_app/embedder.h
rename to examples/surfaces_app/embedder.h
index 3be6a42..b39a30c 100644
--- a/mojo/examples/surfaces_app/embedder.h
+++ b/examples/surfaces_app/embedder.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_EXAMPLES_SURFACES_APP_EMBEDDER_H_
-#define MOJO_EXAMPLES_SURFACES_APP_EMBEDDER_H_
+#ifndef EXAMPLES_SURFACES_APP_EMBEDDER_H_
+#define EXAMPLES_SURFACES_APP_EMBEDDER_H_
#include "base/memory/scoped_ptr.h"
#include "cc/surfaces/surface_id.h"
@@ -43,4 +43,4 @@
} // namespace examples
} // namespace mojo
-#endif // MOJO_EXAMPLES_SURFACES_APP_EMBEDDER_H_
+#endif // EXAMPLES_SURFACES_APP_EMBEDDER_H_
diff --git a/mojo/examples/surfaces_app/surfaces_app.cc b/examples/surfaces_app/surfaces_app.cc
similarity index 97%
rename from mojo/examples/surfaces_app/surfaces_app.cc
rename to examples/surfaces_app/surfaces_app.cc
index 307c20c..1dd8bc2 100644
--- a/mojo/examples/surfaces_app/surfaces_app.cc
+++ b/examples/surfaces_app/surfaces_app.cc
@@ -7,11 +7,11 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "cc/surfaces/surface_id_allocator.h"
+#include "examples/surfaces_app/child.mojom.h"
+#include "examples/surfaces_app/embedder.h"
#include "mojo/application/application_runner_chromium.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/surfaces/surfaces_type_converters.h"
-#include "mojo/examples/surfaces_app/child.mojom.h"
-#include "mojo/examples/surfaces_app/embedder.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/surfaces_app/surfaces_util.cc b/examples/surfaces_app/surfaces_util.cc
similarity index 95%
rename from mojo/examples/surfaces_app/surfaces_util.cc
rename to examples/surfaces_app/surfaces_util.cc
index 50bfbff..e19f17e 100644
--- a/mojo/examples/surfaces_app/surfaces_util.cc
+++ b/examples/surfaces_app/surfaces_util.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/examples/surfaces_app/surfaces_util.h"
+#include "examples/surfaces_app/surfaces_util.h"
#include "cc/quads/render_pass.h"
#include "cc/quads/shared_quad_state.h"
diff --git a/mojo/examples/surfaces_app/surfaces_util.h b/examples/surfaces_app/surfaces_util.h
similarity index 77%
rename from mojo/examples/surfaces_app/surfaces_util.h
rename to examples/surfaces_app/surfaces_util.h
index 3109258..81e985b 100644
--- a/mojo/examples/surfaces_app/surfaces_util.h
+++ b/examples/surfaces_app/surfaces_util.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_EXAMPLES_SURFACES_APP_SURFACES_UTIL_H_
-#define MOJO_EXAMPLES_SURFACES_APP_SURFACES_UTIL_H_
+#ifndef EXAMPLES_SURFACES_APP_SURFACES_UTIL_H_
+#define EXAMPLES_SURFACES_APP_SURFACES_UTIL_H_
namespace cc {
class RenderPass;
@@ -24,4 +24,4 @@
} // namespace mojo
} // namespace examples
-#endif // MOJO_EXAMPLES_SURFACES_APP_SURFACES_UTIL_H_
+#endif // EXAMPLES_SURFACES_APP_SURFACES_UTIL_H_
diff --git a/mojo/examples/wget/BUILD.gn b/examples/wget/BUILD.gn
similarity index 100%
rename from mojo/examples/wget/BUILD.gn
rename to examples/wget/BUILD.gn
diff --git a/mojo/examples/wget/wget.cc b/examples/wget/wget.cc
similarity index 100%
rename from mojo/examples/wget/wget.cc
rename to examples/wget/wget.cc
diff --git a/mojo/examples/window_manager/BUILD.gn b/examples/window_manager/BUILD.gn
similarity index 96%
rename from mojo/examples/window_manager/BUILD.gn
rename to examples/window_manager/BUILD.gn
index 7893986..9146764 100644
--- a/mojo/examples/window_manager/BUILD.gn
+++ b/examples/window_manager/BUILD.gn
@@ -19,11 +19,11 @@
deps = [
":bindings",
"//base",
+ "//examples/keyboard:bindings",
"//mojo/application",
"//mojo/aura",
"//mojo/converters/geometry",
"//mojo/converters/input_events",
- "//mojo/examples/keyboard:bindings",
"//mojo/public/c/system:for_shared_library",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
diff --git a/mojo/examples/window_manager/DEPS b/examples/window_manager/DEPS
similarity index 100%
rename from mojo/examples/window_manager/DEPS
rename to examples/window_manager/DEPS
diff --git a/mojo/examples/window_manager/debug_panel.cc b/examples/window_manager/debug_panel.cc
similarity index 98%
rename from mojo/examples/window_manager/debug_panel.cc
rename to examples/window_manager/debug_panel.cc
index 643155b..0c75682 100644
--- a/mojo/examples/window_manager/debug_panel.cc
+++ b/examples/window_manager/debug_panel.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/examples/window_manager/debug_panel.h"
+#include "examples/window_manager/debug_panel.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/mojo/examples/window_manager/debug_panel.h b/examples/window_manager/debug_panel.h
similarity index 91%
rename from mojo/examples/window_manager/debug_panel.h
rename to examples/window_manager/debug_panel.h
index eec3067..c2ef16a 100644
--- a/mojo/examples/window_manager/debug_panel.h
+++ b/examples/window_manager/debug_panel.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_EXAMPLES_WINDOW_MANAGER_DEBUG_PANEL_H_
-#define MOJO_EXAMPLES_WINDOW_MANAGER_DEBUG_PANEL_H_
+#ifndef EXAMPLES_WINDOW_MANAGER_DEBUG_PANEL_H_
+#define EXAMPLES_WINDOW_MANAGER_DEBUG_PANEL_H_
#include <string>
@@ -73,4 +73,4 @@
} // examples
} // mojo
-#endif // MOJO_EXAMPLES_WINDOW_MANAGER_DEBUG_PANEL_H_
+#endif // EXAMPLES_WINDOW_MANAGER_DEBUG_PANEL_H_
diff --git a/mojo/examples/window_manager/window_manager.cc b/examples/window_manager/window_manager.cc
similarity index 98%
rename from mojo/examples/window_manager/window_manager.cc
rename to examples/window_manager/window_manager.cc
index c36c829..45c99b4 100644
--- a/mojo/examples/window_manager/window_manager.cc
+++ b/examples/window_manager/window_manager.cc
@@ -4,12 +4,12 @@
#include "base/bind.h"
#include "base/macros.h"
+#include "examples/keyboard/keyboard.mojom.h"
+#include "examples/window_manager/debug_panel.h"
+#include "examples/window_manager/window_manager.mojom.h"
#include "mojo/application/application_runner_chromium.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/input_events/input_events_type_converters.h"
-#include "mojo/examples/keyboard/keyboard.mojom.h"
-#include "mojo/examples/window_manager/debug_panel.h"
-#include "mojo/examples/window_manager/window_manager.mojom.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/window_manager/window_manager.mojom b/examples/window_manager/window_manager.mojom
similarity index 100%
rename from mojo/examples/window_manager/window_manager.mojom
rename to examples/window_manager/window_manager.mojom
diff --git a/mojo/examples/wm_flow/BUILD.gn b/examples/wm_flow/BUILD.gn
similarity index 95%
rename from mojo/examples/wm_flow/BUILD.gn
rename to examples/wm_flow/BUILD.gn
index 929b154..437dc8c 100644
--- a/mojo/examples/wm_flow/BUILD.gn
+++ b/examples/wm_flow/BUILD.gn
@@ -50,8 +50,8 @@
":embedder_bindings",
":embeddee_bindings",
"//base",
+ "//examples/bitmap_uploader",
"//mojo/application",
- "//mojo/examples/bitmap_uploader",
"//mojo/public/c/system:for_shared_library",
"//mojo/public/interfaces/application:application",
"//mojo/services/public/cpp/view_manager",
@@ -70,8 +70,8 @@
":embeddee_bindings",
":embedder_bindings",
"//base",
+ "//examples/bitmap_uploader",
"//mojo/application",
- "//mojo/examples/bitmap_uploader",
"//mojo/public/c/system:for_shared_library",
"//mojo/services/public/cpp/view_manager",
"//mojo/services/window_manager:lib",
diff --git a/mojo/examples/wm_flow/app/DEPS b/examples/wm_flow/app/DEPS
similarity index 100%
rename from mojo/examples/wm_flow/app/DEPS
rename to examples/wm_flow/app/DEPS
diff --git a/mojo/examples/wm_flow/app/app.cc b/examples/wm_flow/app/app.cc
similarity index 96%
rename from mojo/examples/wm_flow/app/app.cc
rename to examples/wm_flow/app/app.cc
index f9e996c..4fe2204 100644
--- a/mojo/examples/wm_flow/app/app.cc
+++ b/examples/wm_flow/app/app.cc
@@ -7,10 +7,10 @@
#include "base/bind.h"
#include "base/macros.h"
#include "base/stl_util.h"
+#include "examples/bitmap_uploader/bitmap_uploader.h"
+#include "examples/wm_flow/app/embedder.mojom.h"
+#include "examples/wm_flow/embedded/embeddee.mojom.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/bitmap_uploader/bitmap_uploader.h"
-#include "mojo/examples/wm_flow/app/embedder.mojom.h"
-#include "mojo/examples/wm_flow/embedded/embeddee.mojom.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
diff --git a/mojo/examples/wm_flow/app/embedder.mojom b/examples/wm_flow/app/embedder.mojom
similarity index 100%
rename from mojo/examples/wm_flow/app/embedder.mojom
rename to examples/wm_flow/app/embedder.mojom
diff --git a/mojo/examples/wm_flow/embedded/embedded.cc b/examples/wm_flow/embedded/embedded.cc
similarity index 94%
rename from mojo/examples/wm_flow/embedded/embedded.cc
rename to examples/wm_flow/embedded/embedded.cc
index d328501..642391a 100644
--- a/mojo/examples/wm_flow/embedded/embedded.cc
+++ b/examples/wm_flow/embedded/embedded.cc
@@ -4,10 +4,10 @@
#include "base/bind.h"
#include "base/macros.h"
+#include "examples/bitmap_uploader/bitmap_uploader.h"
+#include "examples/wm_flow/app/embedder.mojom.h"
+#include "examples/wm_flow/embedded/embeddee.mojom.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/bitmap_uploader/bitmap_uploader.h"
-#include "mojo/examples/wm_flow/app/embedder.mojom.h"
-#include "mojo/examples/wm_flow/embedded/embeddee.mojom.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
diff --git a/mojo/examples/wm_flow/embedded/embeddee.mojom b/examples/wm_flow/embedded/embeddee.mojom
similarity index 100%
rename from mojo/examples/wm_flow/embedded/embeddee.mojom
rename to examples/wm_flow/embedded/embeddee.mojom
diff --git a/mojo/examples/wm_flow/wm/DEPS b/examples/wm_flow/wm/DEPS
similarity index 100%
rename from mojo/examples/wm_flow/wm/DEPS
rename to examples/wm_flow/wm/DEPS
diff --git a/mojo/examples/wm_flow/wm/frame_controller.cc b/examples/wm_flow/wm/frame_controller.cc
similarity index 98%
rename from mojo/examples/wm_flow/wm/frame_controller.cc
rename to examples/wm_flow/wm/frame_controller.cc
index 35ea7b4..e50a87c 100644
--- a/mojo/examples/wm_flow/wm/frame_controller.cc
+++ b/examples/wm_flow/wm/frame_controller.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/examples/wm_flow/wm/frame_controller.h"
+#include "examples/wm_flow/wm/frame_controller.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/mojo/examples/wm_flow/wm/frame_controller.h b/examples/wm_flow/wm/frame_controller.h
similarity index 90%
rename from mojo/examples/wm_flow/wm/frame_controller.h
rename to examples/wm_flow/wm/frame_controller.h
index 0add0a1..ae532a5 100644
--- a/mojo/examples/wm_flow/wm/frame_controller.h
+++ b/examples/wm_flow/wm/frame_controller.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_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
-#define MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
+#ifndef EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
+#define EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
#include "base/memory/scoped_ptr.h"
#include "mojo/services/public/cpp/view_manager/view_observer.h"
@@ -65,4 +65,4 @@
DISALLOW_COPY_AND_ASSIGN(FrameController);
};
-#endif // MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
+#endif // EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
diff --git a/mojo/examples/wm_flow/wm/wm.cc b/examples/wm_flow/wm/wm.cc
similarity index 98%
rename from mojo/examples/wm_flow/wm/wm.cc
rename to examples/wm_flow/wm/wm.cc
index ba20e35..608ea7c 100644
--- a/mojo/examples/wm_flow/wm/wm.cc
+++ b/examples/wm_flow/wm/wm.cc
@@ -4,8 +4,8 @@
#include <vector>
+#include "examples/wm_flow/wm/frame_controller.h"
#include "mojo/application/application_runner_chromium.h"
-#include "mojo/examples/wm_flow/wm/frame_controller.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index d2bc33c..b0fe145 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/config/ui.gni")
import("//mojo/public/mojo.gni")
+# TODO(beng): this meta target should probably move to the root dir's BUILD.gn.
group("mojo") {
# Meta-target, don't link into production code.
testonly = true
@@ -13,10 +14,10 @@
}
deps = [
":tests",
+ "//examples",
"//mojo/apps/js:js_content_handler",
"//mojo/apps/js:js_standalone",
"//mojo/common",
- "//mojo/examples",
"//mojo/public",
"//mojo/services",
"//mojo/tools/package_manager",
diff --git a/mojo/examples/BUILD.gn b/mojo/examples/BUILD.gn
deleted file mode 100644
index 37a7eb3..0000000
--- a/mojo/examples/BUILD.gn
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2014 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("//build/config/ui.gni")
-
-group("examples") {
- testonly = true
-
- deps = [
- "//mojo/examples/apptest",
- "//mojo/examples/content_handler_demo",
- "//mojo/examples/echo",
- "//mojo/examples/http_server",
- "//mojo/examples/png_viewer",
- "//mojo/examples/sample_app",
- "//mojo/examples/surfaces_app",
- "//mojo/examples/wget",
- ]
-
- if (use_aura) {
- deps += [
- "//mojo/examples/aura_demo:aura_demo",
- "//mojo/examples/browser",
- "//mojo/examples/embedded_app",
- "//mojo/examples/media_viewer",
- "//mojo/examples/nesting_app",
- "//mojo/examples/keyboard",
- "//mojo/examples/window_manager",
- "//mojo/examples/wm_flow",
- ]
- }
-}
