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/cpp/application/application_delegate.h" | 14 #include "mojo/public/cpp/application/application_delegate.h" |
| 15 #include "mojo/public/cpp/application/application_export.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/gles2/gles2.h" | 18 #include "mojo/public/cpp/gles2/gles2.h" |
17 #include "mojo/public/cpp/system/core.h" | 19 #include "mojo/public/cpp/system/core.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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 MojoPpapiGlobals ppapi_globals_; | 96 MojoPpapiGlobals ppapi_globals_; |
95 | 97 |
96 NativeViewportPtr viewport_; | 98 NativeViewportPtr viewport_; |
97 scoped_refptr<PluginModule> plugin_module_; | 99 scoped_refptr<PluginModule> plugin_module_; |
98 scoped_ptr<PluginInstance> plugin_instance_; | 100 scoped_ptr<PluginInstance> plugin_instance_; |
99 | 101 |
100 DISALLOW_COPY_AND_ASSIGN(PepperContainerApp); | 102 DISALLOW_COPY_AND_ASSIGN(PepperContainerApp); |
101 }; | 103 }; |
102 | 104 |
103 } // namespace examples | 105 } // namespace examples |
| 106 } // namespace mojo |
104 | 107 |
105 // static | 108 extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
106 ApplicationDelegate* ApplicationDelegate::Create() { | 109 MojoHandle shell_handle) { |
107 return new examples::PepperContainerApp(); | 110 mojo::ApplicationRunnerChromium app; |
| 111 app.take_delegate(make_scoped_delegate( |
| 112 new mojo::examples::PepperContainerApp)); |
| 113 return app.Run(shell_handle); |
108 } | 114 } |
109 | 115 |
110 } // namespace mojo | |
OLD | NEW |