6 files changed, 77 insertions, 0 deletions
diff --git a/ppapi/c/private/ppb_nacl_util_private.h b/ppapi/c/private/ppb_nacl_util_private.h
new file mode 100644
index 0000000..3a8354e
--- /dev/null
+++ b/ppapi/c/private/ppb_nacl_util_private.h
@@ -0,0 +1,17 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef PPAPI_C_PRIVATE_PPB_NACL_UTIL_PRIVATE_H_
+#define PPAPI_C_PRIVATE_PPB_NACL_UTIL_PRIVATE_H_
+
+#include "ppapi/c/pp_resource.h"
+#include "ppapi/c/pp_stdint.h"
+
+#define PPB_NACLUTIL_PRIVATE_INTERFACE "PPB_NaClUtil(Private);0.1"
+
+struct PPB_NaClUtil_Private {
+  int32_t (*LaunchSelLdr)(PP_Resource file_io);
+};
+
+#endif  // PPAPI_C_PRIVATE_PPB_NACL_UTIL_PRIVATE_H_
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index c41b4d9..7981a5b 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -100,6 +100,9 @@
         'c/dev/ppp_widget_dev.h',
         'c/dev/ppp_zoom_dev.h',
 
+        # Private interfaces.
+        'c/private/ppb_nacl_util_private.h',
+
         # Deprecated interfaces.
         'c/dev/deprecated_bool.h',
         'c/dev/ppb_var_deprecated.h',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 3e3ddce..8cafce2 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -220,6 +220,8 @@
         '../plugins/ppapi/ppb_graphics_3d_impl.h',
         '../plugins/ppapi/ppb_image_data_impl.cc',
         '../plugins/ppapi/ppb_image_data_impl.h',
+        '../plugins/ppapi/ppb_nacl_util_private_impl.cc',
+        '../plugins/ppapi/ppb_nacl_util_private_impl.h',
         '../plugins/ppapi/ppb_open_gl_es_impl.cc',
         '../plugins/ppapi/ppb_pdf.h',
         '../plugins/ppapi/ppb_pdf_impl.cc',
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 96eadfb..5129e71 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -46,6 +46,7 @@
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/private/ppb_nacl_util_private.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "webkit/plugins/ppapi/common.h"
@@ -65,6 +66,7 @@
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
+#include "webkit/plugins/ppapi/ppb_nacl_util_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_pdf.h"
 #include "webkit/plugins/ppapi/ppb_pdf_impl.h"
 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
@@ -224,6 +226,8 @@ const void* GetInterface(const char* name) {
     return PPB_FileChooser_Impl::GetInterface();
   if (strcmp(name, PPB_FILEIO_DEV_INTERFACE) == 0)
     return PPB_FileIO_Impl::GetInterface();
+  if (strcmp(name, PPB_NACLUTIL_PRIVATE_INTERFACE) == 0)
+    return PPB_NaClUtil_Private_Impl::GetInterface();
   if (strcmp(name, PPB_FILEIOTRUSTED_DEV_INTERFACE) == 0)
     return PPB_FileIO_Impl::GetTrustedInterface();
   if (strcmp(name, PPB_FILEREF_DEV_INTERFACE) == 0)
diff --git a/webkit/plugins/ppapi/ppb_nacl_util_private_impl.cc b/webkit/plugins/ppapi/ppb_nacl_util_private_impl.cc
new file mode 100644
index 0000000..72dc76a
--- /dev/null
+++ b/webkit/plugins/ppapi/ppb_nacl_util_private_impl.cc
@@ -0,0 +1,30 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "webkit/plugins/ppapi/ppb_nacl_util_private_impl.h"
+
+#include "ppapi/c/private/ppb_nacl_util_private.h"
+
+namespace webkit {
+namespace ppapi {
+
+namespace {
+
+int32_t LaunchSelLdr(PP_Resource file_io) {
+  return 0;
+}
+
+}  // namespace
+
+const PPB_NaClUtil_Private ppb_nacl_util = {
+  &LaunchSelLdr,
+};
+
+// static
+const PPB_NaClUtil_Private* PPB_NaClUtil_Private_Impl::GetInterface() {
+  return &ppb_nacl_util;
+}
+
+}  // namespace ppapi
+}  // namespace webkit
diff --git a/webkit/plugins/ppapi/ppb_nacl_util_private_impl.h b/webkit/plugins/ppapi/ppb_nacl_util_private_impl.h
new file mode 100644
index 0000000..179b78d
--- /dev/null
+++ b/webkit/plugins/ppapi/ppb_nacl_util_private_impl.h
@@ -0,0 +1,21 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_PLUGINS_PPAPI_PPB_NACL_UTIL_PRIVATE_IMPL_H_
+#define WEBKIT_PLUGINS_PPAPI_PPB_NACL_UTIL_PRIVATE_IMPL_H_
+
+struct PPB_NaClUtil_Private;
+
+namespace webkit {
+namespace ppapi {
+
+class PPB_NaClUtil_Private_Impl {
+ public:
+  static const PPB_NaClUtil_Private* GetInterface();
+};
+
+}  // namespace ppapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_PPAPI_PPB_NACL_UTIL_PRIVATE_IMPL_H_