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 "mojo/examples/compositor_app/compositor_host.h" | 9 #include "mojo/examples/compositor_app/compositor_host.h" |
| 10 #include "mojo/public/c/system/main.h" |
10 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
11 #include "mojo/public/cpp/application/application_impl.h" | 12 #include "mojo/public/cpp/application/application_impl.h" |
| 13 #include "mojo/public/cpp/application/application_runner_chromium.h" |
12 #include "mojo/public/cpp/system/core.h" | 14 #include "mojo/public/cpp/system/core.h" |
13 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" | 15 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
14 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" | 16 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" |
15 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" | 17 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" |
16 #include "ui/gfx/rect.h" | 18 #include "ui/gfx/rect.h" |
17 | 19 |
18 namespace mojo { | 20 namespace mojo { |
19 namespace examples { | 21 namespace examples { |
20 | 22 |
21 class SampleApp : public ApplicationDelegate, public NativeViewportClient { | 23 class SampleApp : public ApplicationDelegate, public NativeViewportClient { |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 } | 55 } |
54 | 56 |
55 private: | 57 private: |
56 NativeViewportPtr viewport_; | 58 NativeViewportPtr viewport_; |
57 GpuPtr gpu_service_; | 59 GpuPtr gpu_service_; |
58 scoped_ptr<CompositorHost> host_; | 60 scoped_ptr<CompositorHost> host_; |
59 DISALLOW_COPY_AND_ASSIGN(SampleApp); | 61 DISALLOW_COPY_AND_ASSIGN(SampleApp); |
60 }; | 62 }; |
61 | 63 |
62 } // namespace examples | 64 } // namespace examples |
| 65 } // namespace mojo |
63 | 66 |
64 // static | 67 MojoResult MojoMain(MojoHandle shell_handle) { |
65 ApplicationDelegate* ApplicationDelegate::Create() { | 68 mojo::ApplicationRunnerChromium runner(new mojo::examples::SampleApp); |
66 return new examples::SampleApp(); | 69 return runner.Run(shell_handle); |
67 } | 70 } |
68 | |
69 } // namespace mojo | |
OLD | NEW |