Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: mojo/examples/pepper_container_app/pepper_container_app.cc

Issue 441853002: mojo: first take on removing mojo_main_{chromium,standalone}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: seperate Run call Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/system/core.h" 18 #include "mojo/public/cpp/system/core.h"
17 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom. h" 19 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom. h"
18 #include "ppapi/c/pp_rect.h" 20 #include "ppapi/c/pp_rect.h"
19 #include "ppapi/shared_impl/proxy_lock.h" 21 #include "ppapi/shared_impl/proxy_lock.h"
20 22
21 namespace mojo { 23 namespace mojo {
22 namespace examples { 24 namespace examples {
23 25
24 class PepperContainerApp: public ApplicationDelegate, 26 class PepperContainerApp: public ApplicationDelegate,
25 public NativeViewportClient, 27 public NativeViewportClient,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 MojoPpapiGlobals ppapi_globals_; 95 MojoPpapiGlobals ppapi_globals_;
94 96
95 NativeViewportPtr viewport_; 97 NativeViewportPtr viewport_;
96 scoped_refptr<PluginModule> plugin_module_; 98 scoped_refptr<PluginModule> plugin_module_;
97 scoped_ptr<PluginInstance> plugin_instance_; 99 scoped_ptr<PluginInstance> plugin_instance_;
98 100
99 DISALLOW_COPY_AND_ASSIGN(PepperContainerApp); 101 DISALLOW_COPY_AND_ASSIGN(PepperContainerApp);
100 }; 102 };
101 103
102 } // namespace examples 104 } // namespace examples
105 } // namespace mojo
103 106
104 // static 107 extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
105 ApplicationDelegate* ApplicationDelegate::Create() { 108 MojoHandle shell_handle) {
106 return new examples::PepperContainerApp(); 109 mojo::ApplicationRunnerChromium runner(
110 new mojo::examples::PepperContainerApp);
111 return runner.Run(shell_handle);
107 } 112 }
108 113
109 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698