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/macros.h" | 5 #include "base/macros.h" |
6 #include "base/memory/ref_counted.h" | 6 #include "base/memory/ref_counted.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "mojo/examples/pepper_container_app/mojo_ppapi_globals.h" | 10 #include "mojo/examples/pepper_container_app/mojo_ppapi_globals.h" |
11 #include "mojo/examples/pepper_container_app/plugin_instance.h" | 11 #include "mojo/examples/pepper_container_app/plugin_instance.h" |
12 #include "mojo/examples/pepper_container_app/plugin_module.h" | 12 #include "mojo/examples/pepper_container_app/plugin_module.h" |
13 #include "mojo/examples/pepper_container_app/type_converters.h" | 13 #include "mojo/examples/pepper_container_app/type_converters.h" |
| 14 #include "mojo/public/c/system/main.h" |
14 #include "mojo/public/cpp/application/application_delegate.h" | 15 #include "mojo/public/cpp/application/application_delegate.h" |
15 #include "mojo/public/cpp/application/application_impl.h" | 16 #include "mojo/public/cpp/application/application_impl.h" |
| 17 #include "mojo/public/cpp/application/application_runner_chromium.h" |
16 #include "mojo/public/cpp/system/core.h" | 18 #include "mojo/public/cpp/system/core.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 "ppapi/c/pp_rect.h" | 21 #include "ppapi/c/pp_rect.h" |
20 #include "ppapi/shared_impl/proxy_lock.h" | 22 #include "ppapi/shared_impl/proxy_lock.h" |
21 | 23 |
22 namespace mojo { | 24 namespace mojo { |
23 namespace examples { | 25 namespace examples { |
24 | 26 |
25 class PepperContainerApp: public ApplicationDelegate, | 27 class PepperContainerApp: public ApplicationDelegate, |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 uint64_t native_viewport_id_; | 105 uint64_t native_viewport_id_; |
104 NativeViewportPtr viewport_; | 106 NativeViewportPtr viewport_; |
105 GpuPtr gpu_service_; | 107 GpuPtr gpu_service_; |
106 scoped_refptr<PluginModule> plugin_module_; | 108 scoped_refptr<PluginModule> plugin_module_; |
107 scoped_ptr<PluginInstance> plugin_instance_; | 109 scoped_ptr<PluginInstance> plugin_instance_; |
108 | 110 |
109 DISALLOW_COPY_AND_ASSIGN(PepperContainerApp); | 111 DISALLOW_COPY_AND_ASSIGN(PepperContainerApp); |
110 }; | 112 }; |
111 | 113 |
112 } // namespace examples | 114 } // namespace examples |
| 115 } // namespace mojo |
113 | 116 |
114 // static | 117 MojoResult MojoMain(MojoHandle shell_handle) { |
115 ApplicationDelegate* ApplicationDelegate::Create() { | 118 mojo::ApplicationRunnerChromium runner( |
116 return new examples::PepperContainerApp(); | 119 new mojo::examples::PepperContainerApp); |
| 120 return runner.Run(shell_handle); |
117 } | 121 } |
118 | 122 |
119 } // namespace mojo | |
OLD | NEW |