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

Unified Diff: shell/native_application_support.cc

Issue 1052723003: NaCl: create a separate namespace for Mojo handles. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« nacl_bindings_generator/mojo_syscall.cc.tmpl ('K') | « services/nacl/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/native_application_support.cc
diff --git a/shell/native_application_support.cc b/shell/native_application_support.cc
index 2cce52d84cb5b3c0b15e04d8bc9004eaa42f47bd..9a4eac99958014ab5baee1733c27f3d24dc07218 100644
--- a/shell/native_application_support.cc
+++ b/shell/native_application_support.cc
@@ -7,6 +7,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
+#include "mojo/public/platform/native/core_system_thunks.h"
#include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h"
#include "mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h"
#include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h"
@@ -66,6 +67,9 @@ bool RunNativeApplication(base::NativeLibrary app_library,
return false;
}
+ // TODO(ncbray): make this interface private, somehow?
+ SetThunks(&MojoMakeCoreSystemThunks, "MojoSetCoreSystemThunks", app_library);
+
if (SetThunks(&MojoMakeGLES2ControlThunks, "MojoSetGLES2ControlThunks",
app_library)) {
// If we have the control thunks, we should also have the GLES2
« nacl_bindings_generator/mojo_syscall.cc.tmpl ('K') | « services/nacl/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698