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

Side by Side Diff: mojo/apps/js/main.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 | « no previous file | mojo/examples/aura_demo/aura_demo.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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "gin/public/isolate_holder.h" 6 #include "gin/public/isolate_holder.h"
7 #include "mojo/apps/js/mojo_runner_delegate.h" 7 #include "mojo/apps/js/mojo_runner_delegate.h"
8 #include "mojo/public/cpp/gles2/gles2.h"
8 #include "mojo/public/cpp/system/core.h" 9 #include "mojo/public/cpp/system/core.h"
9 #include "mojo/public/cpp/system/macros.h" 10 #include "mojo/public/cpp/system/macros.h"
10 #include "mojo/public/gles2/gles2_cpp.h"
11 11
12 #if defined(WIN32) 12 #if defined(WIN32)
13 #if !defined(CDECL) 13 #if !defined(CDECL)
14 #define CDECL __cdecl 14 #define CDECL __cdecl
15 #endif 15 #endif
16 #define MOJO_APPS_JS_EXPORT __declspec(dllexport) 16 #define MOJO_APPS_JS_EXPORT __declspec(dllexport)
17 #else 17 #else
18 #define CDECL 18 #define CDECL
19 #define MOJO_APPS_JS_EXPORT __attribute__((visibility("default"))) 19 #define MOJO_APPS_JS_EXPORT __attribute__((visibility("default")))
20 #endif 20 #endif
(...skipping 13 matching lines...) Expand all
34 } 34 }
35 35
36 } // namespace apps 36 } // namespace apps
37 } // namespace mojo 37 } // namespace mojo
38 38
39 extern "C" MOJO_APPS_JS_EXPORT MojoResult CDECL MojoMain(MojoHandle pipe) { 39 extern "C" MOJO_APPS_JS_EXPORT MojoResult CDECL MojoMain(MojoHandle pipe) {
40 mojo::GLES2Initializer gles2; 40 mojo::GLES2Initializer gles2;
41 mojo::apps::Start(pipe, "mojo/apps/js/main"); 41 mojo::apps::Start(pipe, "mojo/apps/js/main");
42 return MOJO_RESULT_OK; 42 return MOJO_RESULT_OK;
43 } 43 }
OLDNEW
« no previous file with comments | « no previous file | mojo/examples/aura_demo/aura_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698