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

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

Issue 219583003: Mojo: Move mojo/public/shell to mojo/public/{cpp,interfaces}/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « mojo/examples/launcher/launcher.cc ('k') | mojo/examples/sample_app/sample_app.cc » ('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/bindings/allocation_scope.h" 14 #include "mojo/public/bindings/allocation_scope.h"
15 #include "mojo/public/bindings/remote_ptr.h" 15 #include "mojo/public/bindings/remote_ptr.h"
16 #include "mojo/public/cpp/environment/environment.h" 16 #include "mojo/public/cpp/environment/environment.h"
17 #include "mojo/public/cpp/gles2/gles2.h" 17 #include "mojo/public/cpp/gles2/gles2.h"
18 #include "mojo/public/cpp/shell/application.h"
18 #include "mojo/public/cpp/system/core.h" 19 #include "mojo/public/cpp/system/core.h"
19 #include "mojo/public/shell/application.h" 20 #include "mojo/public/interfaces/shell/shell.mojom.h"
20 #include "mojo/public/shell/shell.mojom.h"
21 #include "mojo/services/native_viewport/native_viewport.mojom.h" 21 #include "mojo/services/native_viewport/native_viewport.mojom.h"
22 #include "ppapi/c/pp_rect.h" 22 #include "ppapi/c/pp_rect.h"
23 #include "ppapi/shared_impl/proxy_lock.h" 23 #include "ppapi/shared_impl/proxy_lock.h"
24 24
25 #if defined(OS_WIN) 25 #if defined(OS_WIN)
26 #if !defined(CDECL) 26 #if !defined(CDECL)
27 #define CDECL __cdecl 27 #define CDECL __cdecl
28 #endif 28 #endif
29 #define PEPPER_CONTAINER_APP_EXPORT __declspec(dllexport) 29 #define PEPPER_CONTAINER_APP_EXPORT __declspec(dllexport)
30 #else 30 #else
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain( 125 extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain(
126 MojoHandle shell_handle) { 126 MojoHandle shell_handle) {
127 mojo::Environment env; 127 mojo::Environment env;
128 mojo::GLES2Initializer gles2; 128 mojo::GLES2Initializer gles2;
129 base::MessageLoop run_loop; 129 base::MessageLoop run_loop;
130 mojo::examples::PepperContainerApp app(shell_handle); 130 mojo::examples::PepperContainerApp app(shell_handle);
131 131
132 run_loop.Run(); 132 run_loop.Run();
133 return MOJO_RESULT_OK; 133 return MOJO_RESULT_OK;
134 } 134 }
OLDNEW
« no previous file with comments | « mojo/examples/launcher/launcher.cc ('k') | mojo/examples/sample_app/sample_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698