summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-19 23:03:16 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-19 23:03:16 +0000
commit95cc0fedf1730672686d6eafd938274ccf2b48ee (patch)
tree640815a2399c2277b2aa7e186fc885ccec92a9de /webkit
parent40b9aa6ac971264a5162260696bf28d08f1fdcb1 (diff)
downloadchromium_src-95cc0fedf1730672686d6eafd938274ccf2b48ee.zip
chromium_src-95cc0fedf1730672686d6eafd938274ccf2b48ee.tar.gz
chromium_src-95cc0fedf1730672686d6eafd938274ccf2b48ee.tar.bz2
Add a private PPB_Talk_Private interface.
It exposes one function that sends a message to the browser and issues a reply. The browser doesn't implement this yet. BUG=117564 TEST= Review URL: https://chromiumcodereview.appspot.com/9700028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc1
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.cc5
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 58fc9d0..e485905 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -79,6 +79,7 @@
#include "ppapi/c/private/ppb_network_monitor_private.h"
#include "ppapi/c/private/ppb_pdf.h"
#include "ppapi/c/private/ppb_proxy_private.h"
+#include "ppapi/c/private/ppb_talk_private.h"
#include "ppapi/c/private/ppb_tcp_socket_private.h"
#include "ppapi/c/private/ppb_udp_socket_private.h"
#include "ppapi/c/private/ppb_uma_private.h"
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc
index 2002de0..e1b540c 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.cc
+++ b/webkit/plugins/ppapi/resource_creation_impl.cc
@@ -262,6 +262,11 @@ PP_Resource ResourceCreationImpl::CreateScrollbar(PP_Instance instance,
return PPB_Scrollbar_Impl::Create(instance, PP_ToBool(vertical));
}
+PP_Resource ResourceCreationImpl::CreateTalk(PP_Instance /* instance */) {
+ // Not implemented in-process.
+ return 0;
+}
+
PP_Resource ResourceCreationImpl::CreateResourceArray(
PP_Instance instance,
const PP_Resource elements[],
diff --git a/webkit/plugins/ppapi/resource_creation_impl.h b/webkit/plugins/ppapi/resource_creation_impl.h
index 81be5b0..b918cda 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.h
+++ b/webkit/plugins/ppapi/resource_creation_impl.h
@@ -98,6 +98,7 @@ class ResourceCreationImpl : public ::ppapi::FunctionGroupBase,
uint32_t size) OVERRIDE;
virtual PP_Resource CreateScrollbar(PP_Instance instance,
PP_Bool vertical) OVERRIDE;
+ virtual PP_Resource CreateTalk(PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateTCPServerSocketPrivate(
PP_Instance instance) OVERRIDE;
virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instance) OVERRIDE;