summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-05 08:12:38 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-05 08:12:38 +0000
commitd2e03f81b6a0c0c413fe3515d81f0988385a9b04 (patch)
tree4308d2a853cf3f8000976ce9849ddb99acefa12c /webkit
parent61cf2db39cf24b3ca8cef64c21a971b239ef8b1e (diff)
downloadchromium_src-d2e03f81b6a0c0c413fe3515d81f0988385a9b04.zip
chromium_src-d2e03f81b6a0c0c413fe3515d81f0988385a9b04.tar.gz
chromium_src-d2e03f81b6a0c0c413fe3515d81f0988385a9b04.tar.bz2
Add NetworkList/NetworkMonitor hooks and C++ wrappers.
BUG=114808 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=124797 Review URL: http://codereview.chromium.org/9545010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc2
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.cc8
-rw-r--r--webkit/plugins/ppapi/resource_creation_impl.h4
3 files changed, 14 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index ba0f3c5..864a229 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -75,6 +75,8 @@
#include "ppapi/c/private/ppb_flash_tcp_socket.h"
#include "ppapi/c/private/ppb_gpu_blacklist_private.h"
#include "ppapi/c/private/ppb_instance_private.h"
+#include "ppapi/c/private/ppb_network_list_private.h"
+#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_tcp_server_socket_private.h"
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc
index 4ef430e..a9005c3 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.cc
+++ b/webkit/plugins/ppapi/resource_creation_impl.cc
@@ -244,6 +244,14 @@ PP_Resource ResourceCreationImpl::CreateMouseInputEvent(
instance, data))->GetReference();
}
+PP_Resource ResourceCreationImpl::CreateNetworkMonitor(
+ PP_Instance instance,
+ PPB_NetworkMonitor_Callback callback,
+ void* user_data) {
+ NOTIMPLEMENTED();
+ return 0;
+}
+
PP_Resource ResourceCreationImpl::CreateScrollbar(PP_Instance instance,
PP_Bool vertical) {
return PPB_Scrollbar_Impl::Create(instance, PP_ToBool(vertical));
diff --git a/webkit/plugins/ppapi/resource_creation_impl.h b/webkit/plugins/ppapi/resource_creation_impl.h
index f7c2a70..3da5037 100644
--- a/webkit/plugins/ppapi/resource_creation_impl.h
+++ b/webkit/plugins/ppapi/resource_creation_impl.h
@@ -88,6 +88,10 @@ class ResourceCreationImpl : public ::ppapi::FunctionGroupBase,
const PP_Point* mouse_position,
int32_t click_count,
const PP_Point* mouse_movement) OVERRIDE;
+ virtual PP_Resource CreateNetworkMonitor(
+ PP_Instance instance,
+ PPB_NetworkMonitor_Callback callback,
+ void* user_data) OVERRIDE;
virtual PP_Resource CreateResourceArray(PP_Instance instance,
const PP_Resource elements[],
uint32_t size) OVERRIDE;