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

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

Issue 218883003: Mojo: Move mojo/public/gles2/gles2_cpp.h to mojo/public/cpp/gles2/gles2.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/aura_demo/aura_demo.cc ('k') | mojo/examples/launcher/launcher.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stdio.h> 5 #include <stdio.h>
6 #include <string> 6 #include <string>
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "mojo/examples/compositor_app/compositor_host.h" 10 #include "mojo/examples/compositor_app/compositor_host.h"
11 #include "mojo/public/bindings/allocation_scope.h" 11 #include "mojo/public/bindings/allocation_scope.h"
12 #include "mojo/public/bindings/remote_ptr.h" 12 #include "mojo/public/bindings/remote_ptr.h"
13 #include "mojo/public/cpp/gles2/gles2.h"
13 #include "mojo/public/cpp/system/core.h" 14 #include "mojo/public/cpp/system/core.h"
14 #include "mojo/public/gles2/gles2_cpp.h"
15 #include "mojo/public/shell/application.h" 15 #include "mojo/public/shell/application.h"
16 #include "mojo/public/shell/shell.mojom.h" 16 #include "mojo/public/shell/shell.mojom.h"
17 #include "mojo/services/native_viewport/geometry_conversions.h" 17 #include "mojo/services/native_viewport/geometry_conversions.h"
18 #include "mojo/services/native_viewport/native_viewport.mojom.h" 18 #include "mojo/services/native_viewport/native_viewport.mojom.h"
19 #include "ui/gfx/rect.h" 19 #include "ui/gfx/rect.h"
20 20
21 #if defined(WIN32) 21 #if defined(WIN32)
22 #if !defined(CDECL) 22 #if !defined(CDECL)
23 #define CDECL __cdecl 23 #define CDECL __cdecl
24 #endif 24 #endif
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain( 79 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain(
80 MojoHandle shell_handle) { 80 MojoHandle shell_handle) {
81 base::MessageLoop loop; 81 base::MessageLoop loop;
82 mojo::GLES2Initializer gles2; 82 mojo::GLES2Initializer gles2;
83 83
84 mojo::examples::SampleApp app(shell_handle); 84 mojo::examples::SampleApp app(shell_handle);
85 loop.Run(); 85 loop.Run();
86 return MOJO_RESULT_OK; 86 return MOJO_RESULT_OK;
87 } 87 }
OLDNEW
« no previous file with comments | « mojo/examples/aura_demo/aura_demo.cc ('k') | mojo/examples/launcher/launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698