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

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

Issue 299263002: Revert 272472 "Mojo: nuke EnvironmentData" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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
« no previous file with comments | « trunk/src/mojo/environment/environment.cc ('k') | trunk/src/mojo/mojo.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/bindings/allocation_scope.h" 14 #include "mojo/public/cpp/bindings/allocation_scope.h"
15 #include "mojo/public/cpp/environment/environment.h"
15 #include "mojo/public/cpp/gles2/gles2.h" 16 #include "mojo/public/cpp/gles2/gles2.h"
16 #include "mojo/public/cpp/shell/application.h" 17 #include "mojo/public/cpp/shell/application.h"
17 #include "mojo/public/cpp/system/core.h" 18 #include "mojo/public/cpp/system/core.h"
18 #include "mojo/public/interfaces/shell/shell.mojom.h" 19 #include "mojo/public/interfaces/shell/shell.mojom.h"
19 #include "mojo/services/native_viewport/native_viewport.mojom.h" 20 #include "mojo/services/native_viewport/native_viewport.mojom.h"
20 #include "ppapi/c/pp_rect.h" 21 #include "ppapi/c/pp_rect.h"
21 #include "ppapi/shared_impl/proxy_lock.h" 22 #include "ppapi/shared_impl/proxy_lock.h"
22 23
23 #if defined(OS_WIN) 24 #if defined(OS_WIN)
24 #if !defined(CDECL) 25 #if !defined(CDECL)
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 scoped_ptr<PluginInstance> plugin_instance_; 114 scoped_ptr<PluginInstance> plugin_instance_;
114 115
115 DISALLOW_COPY_AND_ASSIGN(PepperContainerApp); 116 DISALLOW_COPY_AND_ASSIGN(PepperContainerApp);
116 }; 117 };
117 118
118 } // namespace examples 119 } // namespace examples
119 } // namespace mojo 120 } // namespace mojo
120 121
121 extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain( 122 extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain(
122 MojoHandle shell_handle) { 123 MojoHandle shell_handle) {
124 mojo::Environment env;
123 mojo::GLES2Initializer gles2; 125 mojo::GLES2Initializer gles2;
124 base::MessageLoop run_loop; 126 base::MessageLoop run_loop;
125 mojo::examples::PepperContainerApp app(shell_handle); 127 mojo::examples::PepperContainerApp app(shell_handle);
126 128
127 run_loop.Run(); 129 run_loop.Run();
128 return MOJO_RESULT_OK; 130 return MOJO_RESULT_OK;
129 } 131 }
OLDNEW
« no previous file with comments | « trunk/src/mojo/environment/environment.cc ('k') | trunk/src/mojo/mojo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698