| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "cc/surfaces/surface_id_allocator.h" | 8 #include "cc/surfaces/surface_id_allocator.h" |
| 9 #include "mojo/examples/surfaces_app/child.mojom.h" | 9 #include "mojo/examples/surfaces_app/child.mojom.h" |
| 10 #include "mojo/examples/surfaces_app/embedder.h" | 10 #include "mojo/examples/surfaces_app/embedder.h" |
| 11 #include "mojo/public/c/system/main.h" |
| 11 #include "mojo/public/cpp/application/application_connection.h" | 12 #include "mojo/public/cpp/application/application_connection.h" |
| 12 #include "mojo/public/cpp/application/application_delegate.h" | 13 #include "mojo/public/cpp/application/application_delegate.h" |
| 14 #include "mojo/public/cpp/application/application_runner_chromium.h" |
| 13 #include "mojo/public/cpp/system/core.h" | 15 #include "mojo/public/cpp/system/core.h" |
| 14 #include "mojo/services/gles2/command_buffer.mojom.h" | 16 #include "mojo/services/gles2/command_buffer.mojom.h" |
| 15 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" | 17 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
| 16 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" | 18 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h" |
| 17 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" | 19 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" |
| 18 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" | 20 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" |
| 19 #include "ui/gfx/rect.h" | 21 #include "ui/gfx/rect.h" |
| 20 | 22 |
| 21 namespace mojo { | 23 namespace mojo { |
| 22 namespace examples { | 24 namespace examples { |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 gfx::Size size_; | 148 gfx::Size size_; |
| 147 gfx::Size child_size_; | 149 gfx::Size child_size_; |
| 148 | 150 |
| 149 NativeViewportPtr viewport_; | 151 NativeViewportPtr viewport_; |
| 150 GpuPtr gpu_service_; | 152 GpuPtr gpu_service_; |
| 151 | 153 |
| 152 DISALLOW_COPY_AND_ASSIGN(SurfacesApp); | 154 DISALLOW_COPY_AND_ASSIGN(SurfacesApp); |
| 153 }; | 155 }; |
| 154 | 156 |
| 155 } // namespace examples | 157 } // namespace examples |
| 158 } // namespace mojo |
| 156 | 159 |
| 157 // static | 160 MojoResult MojoMain(MojoHandle shell_handle) { |
| 158 ApplicationDelegate* ApplicationDelegate::Create() { | 161 mojo::ApplicationRunnerChromium runner(new mojo::examples::SurfacesApp); |
| 159 return new examples::SurfacesApp(); | 162 return runner.Run(shell_handle); |
| 160 } | 163 } |
| 161 | |
| 162 } // namespace mojo | |
| OLD | NEW |