| 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/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "mojo/examples/compositor_app/compositor_host.h" | 9 #include "mojo/examples/compositor_app/compositor_host.h" |
| 10 #include "mojo/public/bindings/allocation_scope.h" | 10 #include "mojo/public/bindings/allocation_scope.h" |
| 11 #include "mojo/public/bindings/remote_ptr.h" | 11 #include "mojo/public/bindings/remote_ptr.h" |
| 12 #include "mojo/public/gles2/gles2_cpp.h" | 12 #include "mojo/public/gles2/gles2_cpp.h" |
| 13 #include "mojo/public/shell/application.h" | 13 #include "mojo/public/shell/application.h" |
| 14 #include "mojo/public/shell/shell.mojom.h" |
| 14 #include "mojo/public/system/core.h" | 15 #include "mojo/public/system/core.h" |
| 15 #include "mojo/public/system/macros.h" | 16 #include "mojo/public/system/macros.h" |
| 16 #include "mojo/services/native_viewport/geometry_conversions.h" | 17 #include "mojo/services/native_viewport/geometry_conversions.h" |
| 17 #include "mojom/native_viewport.h" | 18 #include "mojo/services/native_viewport/native_viewport.mojom.h" |
| 18 #include "mojom/shell.h" | |
| 19 #include "ui/gfx/rect.h" | 19 #include "ui/gfx/rect.h" |
| 20 | 20 |
| 21 #if defined(WIN32) | 21 #if defined(WIN32) |
| 22 #if !defined(CDECL) | 22 #if !defined(CDECL) |
| 23 #define CDECL __cdecl | 23 #define CDECL __cdecl |
| 24 #endif | 24 #endif |
| 25 #define SAMPLE_APP_EXPORT __declspec(dllexport) | 25 #define SAMPLE_APP_EXPORT __declspec(dllexport) |
| 26 #else | 26 #else |
| 27 #define CDECL | 27 #define CDECL |
| 28 #define SAMPLE_APP_EXPORT __attribute__((visibility("default"))) | 28 #define SAMPLE_APP_EXPORT __attribute__((visibility("default"))) |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 | 78 |
| 79 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain( | 79 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain( |
| 80 MojoHandle shell_handle) { | 80 MojoHandle shell_handle) { |
| 81 base::MessageLoop loop; | 81 base::MessageLoop loop; |
| 82 mojo::GLES2Initializer gles2; | 82 mojo::GLES2Initializer gles2; |
| 83 | 83 |
| 84 mojo::examples::SampleApp app(shell_handle); | 84 mojo::examples::SampleApp app(shell_handle); |
| 85 loop.Run(); | 85 loop.Run(); |
| 86 return MOJO_RESULT_OK; | 86 return MOJO_RESULT_OK; |
| 87 } | 87 } |
| OLD | NEW |