mojo/examples/pepper_container_app/pepper_container_app.cc - Issue 218613010: Mojo: Move mojo/public/bindings/*.h to mojo/public/cpp/bindings/*.h.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 218613010: Mojo: Move mojo/public/bindings/*.h to mojo/public/cpp/bindings/*.h. (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/pepper_container_app/type_converters.h » ('j') | no next file with comments »

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/bindings/allocation_scope.h"	14 #include "mojo/public/cpp/bindings/allocation_scope.h"

15 #include "mojo/public/bindings/remote_ptr.h"	15 #include "mojo/public/cpp/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/shell/application.h"

19 #include "mojo/public/cpp/system/core.h"	19 #include "mojo/public/cpp/system/core.h"

20 #include "mojo/public/interfaces/shell/shell.mojom.h"	20 #include "mojo/public/interfaces/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)

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
123 extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain(	123 extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain(

124 MojoHandle shell_handle) {	124 MojoHandle shell_handle) {

125 mojo::Environment env;	125 mojo::Environment env;

126 mojo::GLES2Initializer gles2;	126 mojo::GLES2Initializer gles2;

127 base::MessageLoop run_loop;	127 base::MessageLoop run_loop;

128 mojo::examples::PepperContainerApp app(shell_handle);	128 mojo::examples::PepperContainerApp app(shell_handle);

129	129

130 run_loop.Run();	130 run_loop.Run();

131 return MOJO_RESULT_OK;	131 return MOJO_RESULT_OK;

132 }	132 }

OLD	NEW