Index: webkit/plugins/ppapi/resource_creation_impl.h |
=================================================================== |
--- webkit/plugins/ppapi/resource_creation_impl.h (revision 124808) |
+++ webkit/plugins/ppapi/resource_creation_impl.h (working copy) |
@@ -88,10 +88,6 @@ |
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; |
Property changes on: webkit/plugins/ppapi/resource_creation_impl.h |
___________________________________________________________________ |
Deleted: svn:mergeinfo |
Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/resource_creation_impl.h:r3734-4217,4606-5108,5177-5263 |