OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <stdio.h> | 5 #include <stdio.h> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "mojo/examples/compositor_app/compositor_host.h" | 10 #include "mojo/examples/compositor_app/compositor_host.h" |
11 #include "mojo/public/bindings/allocation_scope.h" | 11 #include "mojo/public/bindings/allocation_scope.h" |
12 #include "mojo/public/bindings/remote_ptr.h" | 12 #include "mojo/public/bindings/remote_ptr.h" |
| 13 #include "mojo/public/c/system/core.h" |
| 14 #include "mojo/public/c/system/macros.h" |
13 #include "mojo/public/gles2/gles2_cpp.h" | 15 #include "mojo/public/gles2/gles2_cpp.h" |
14 #include "mojo/public/shell/application.h" | 16 #include "mojo/public/shell/application.h" |
15 #include "mojo/public/shell/shell.mojom.h" | 17 #include "mojo/public/shell/shell.mojom.h" |
16 #include "mojo/public/system/core.h" | |
17 #include "mojo/public/system/macros.h" | |
18 #include "mojo/services/native_viewport/geometry_conversions.h" | 18 #include "mojo/services/native_viewport/geometry_conversions.h" |
19 #include "mojo/services/native_viewport/native_viewport.mojom.h" | 19 #include "mojo/services/native_viewport/native_viewport.mojom.h" |
20 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
21 | 21 |
22 #if defined(WIN32) | 22 #if defined(WIN32) |
23 #if !defined(CDECL) | 23 #if !defined(CDECL) |
24 #define CDECL __cdecl | 24 #define CDECL __cdecl |
25 #endif | 25 #endif |
26 #define SAMPLE_APP_EXPORT __declspec(dllexport) | 26 #define SAMPLE_APP_EXPORT __declspec(dllexport) |
27 #else | 27 #else |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 79 |
80 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain( | 80 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain( |
81 MojoHandle shell_handle) { | 81 MojoHandle shell_handle) { |
82 base::MessageLoop loop; | 82 base::MessageLoop loop; |
83 mojo::GLES2Initializer gles2; | 83 mojo::GLES2Initializer gles2; |
84 | 84 |
85 mojo::examples::SampleApp app(shell_handle); | 85 mojo::examples::SampleApp app(shell_handle); |
86 loop.Run(); | 86 loop.Run(); |
87 return MOJO_RESULT_OK; | 87 return MOJO_RESULT_OK; |
88 } | 88 } |
OLD | NEW |