diff options
Diffstat (limited to 'mojo/examples')
| -rw-r--r-- | mojo/examples/aura_demo/aura_demo.cc | 4 | ||||
| -rw-r--r-- | mojo/examples/aura_demo/window_tree_host_mojo.h | 2 | ||||
| -rw-r--r-- | mojo/examples/compositor_app/compositor_app.cc | 4 | ||||
| -rw-r--r-- | mojo/examples/launcher/launcher.cc | 6 | ||||
| -rw-r--r-- | mojo/examples/sample_app/gles2_client_impl.h | 2 | ||||
| -rw-r--r-- | mojo/examples/sample_app/sample_app.cc | 4 | ||||
| -rw-r--r-- | mojo/examples/view_manager/view_manager.cc | 8 |
7 files changed, 15 insertions, 15 deletions
diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc index 463b757..7e2ec77 100644 --- a/mojo/examples/aura_demo/aura_demo.cc +++ b/mojo/examples/aura_demo/aura_demo.cc @@ -13,10 +13,10 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/gles2/gles2_cpp.h" #include "mojo/public/shell/application.h" +#include "mojo/public/shell/shell.mojom.h" #include "mojo/public/system/core.h" #include "mojo/public/system/macros.h" -#include "mojom/native_viewport.h" -#include "mojom/shell.h" +#include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.h b/mojo/examples/aura_demo/window_tree_host_mojo.h index 11eaadd..62cf89e 100644 --- a/mojo/examples/aura_demo/window_tree_host_mojo.h +++ b/mojo/examples/aura_demo/window_tree_host_mojo.h @@ -7,7 +7,7 @@ #include "base/bind.h" #include "mojo/public/bindings/remote_ptr.h" -#include "mojom/native_viewport.h" +#include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/aura/window_tree_host.h" #include "ui/events/event_source.h" #include "ui/gfx/rect.h" diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc index 05ffa71..468ffa5 100644 --- a/mojo/examples/compositor_app/compositor_app.cc +++ b/mojo/examples/compositor_app/compositor_app.cc @@ -11,11 +11,11 @@ #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/gles2/gles2_cpp.h" #include "mojo/public/shell/application.h" +#include "mojo/public/shell/shell.mojom.h" #include "mojo/public/system/core.h" #include "mojo/public/system/macros.h" #include "mojo/services/native_viewport/geometry_conversions.h" -#include "mojom/native_viewport.h" -#include "mojom/shell.h" +#include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/gfx/rect.h" #if defined(WIN32) diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc index 43addf4..5e19f84 100644 --- a/mojo/examples/launcher/launcher.cc +++ b/mojo/examples/launcher/launcher.cc @@ -13,15 +13,15 @@ #include "base/path_service.h" #include "mojo/examples/aura_demo/demo_screen.h" #include "mojo/examples/aura_demo/window_tree_host_mojo.h" +#include "mojo/examples/launcher/launcher.mojom.h" #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/gles2/gles2_cpp.h" #include "mojo/public/shell/application.h" +#include "mojo/public/shell/shell.mojom.h" #include "mojo/public/system/core.h" #include "mojo/public/system/macros.h" -#include "mojom/launcher.h" -#include "mojom/native_viewport.h" -#include "mojom/shell.h" +#include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/default_activation_client.h" #include "ui/aura/client/default_capture_client.h" diff --git a/mojo/examples/sample_app/gles2_client_impl.h b/mojo/examples/sample_app/gles2_client_impl.h index 9833e2a..759140f 100644 --- a/mojo/examples/sample_app/gles2_client_impl.h +++ b/mojo/examples/sample_app/gles2_client_impl.h @@ -8,7 +8,7 @@ #include "mojo/examples/sample_app/spinning_cube.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/gles2/gles2.h" -#include "mojom/native_viewport.h" +#include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/gfx/point_f.h" #include "ui/gfx/size.h" diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc index 07e74c4..6c078e1 100644 --- a/mojo/examples/sample_app/sample_app.cc +++ b/mojo/examples/sample_app/sample_app.cc @@ -11,11 +11,11 @@ #include "mojo/public/environment/environment.h" #include "mojo/public/gles2/gles2_cpp.h" #include "mojo/public/shell/application.h" +#include "mojo/public/shell/shell.mojom.h" #include "mojo/public/system/core.h" #include "mojo/public/system/macros.h" #include "mojo/public/utility/run_loop.h" -#include "mojom/native_viewport.h" -#include "mojom/shell.h" +#include "mojo/services/native_viewport/native_viewport.mojom.h" #if defined(WIN32) #if !defined(CDECL) diff --git a/mojo/examples/view_manager/view_manager.cc b/mojo/examples/view_manager/view_manager.cc index 4c38dc3..69e5936 100644 --- a/mojo/examples/view_manager/view_manager.cc +++ b/mojo/examples/view_manager/view_manager.cc @@ -7,16 +7,16 @@ #include "base/logging.h" #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" +#include "mojo/examples/launcher/launcher.mojom.h" +#include "mojo/examples/view_manager/view_manager.mojom.h" #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/shell/application.h" +#include "mojo/public/shell/shell.mojom.h" #include "mojo/public/system/core.h" #include "mojo/public/system/macros.h" #include "mojo/services/native_viewport/geometry_conversions.h" -#include "mojom/launcher.h" -#include "mojom/native_viewport.h" -#include "mojom/shell.h" -#include "mojom/view_manager.h" +#include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/rect.h" |