summaryrefslogtreecommitdiffstats
path: root/mojo/runner/native_application_support.cc
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-05-01 11:05:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-01 18:06:44 +0000
commit8f7386b022c30b46325f8c67ba4d04d33606103b (patch)
treece0a3e023034fbebc7661857b33b2a15b715236b /mojo/runner/native_application_support.cc
parent565d7e3762e2f7c667d87a2766cae3435d846e00 (diff)
downloadchromium_src-8f7386b022c30b46325f8c67ba4d04d33606103b.zip
chromium_src-8f7386b022c30b46325f8c67ba4d04d33606103b.tar.gz
chromium_src-8f7386b022c30b46325f8c67ba4d04d33606103b.tar.bz2
Adds thunks for getting platform handles
BUG=none TEST=none R=viettrungluu@chromium.org Review URL: https://codereview.chromium.org/1113393002 Cr-Commit-Position: refs/heads/master@{#327937}
Diffstat (limited to 'mojo/runner/native_application_support.cc')
-rw-r--r--mojo/runner/native_application_support.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/mojo/runner/native_application_support.cc b/mojo/runner/native_application_support.cc
index c4270da..b01faa5 100644
--- a/mojo/runner/native_application_support.cc
+++ b/mojo/runner/native_application_support.cc
@@ -8,6 +8,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
+#include "mojo/platform_handle/platform_handle_private_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"
@@ -126,6 +127,10 @@ bool RunNativeApplication(base::NativeLibrary app_library,
}
#endif
+ // Apps need not include platform handle thunks.
+ SetThunks(&MojoMakePlatformHandlePrivateThunks,
+ "MojoSetPlatformHandlePrivateThunks", app_library);
+
typedef MojoResult (*MojoMainFunction)(MojoHandle);
MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>(
base::GetFunctionPointerFromNativeLibrary(app_library, "MojoMain"));