Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Side by Side Diff: webkit/plugins/ppapi/resource_creation_impl.h

Issue 9585033: Revert 124797 - Add NetworkList/NetworkMonitor hooks and C++ wrappers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/resource_creation_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/resource_creation_impl.h:r3734-4217,4606-5108,5177-5263
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_PLUGINS_PPAPI_RESOURCE_CREATION_IMPL_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_RESOURCE_CREATION_IMPL_H_
6 #define WEBKIT_PLUGINS_PPAPI_RESOURCE_CREATION_IMPL_H_ 6 #define WEBKIT_PLUGINS_PPAPI_RESOURCE_CREATION_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ppapi/shared_impl/function_group_base.h" 10 #include "ppapi/shared_impl/function_group_base.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 PP_Var character_text) OVERRIDE; 81 PP_Var character_text) OVERRIDE;
82 virtual PP_Resource CreateMouseInputEvent( 82 virtual PP_Resource CreateMouseInputEvent(
83 PP_Instance instance, 83 PP_Instance instance,
84 PP_InputEvent_Type type, 84 PP_InputEvent_Type type,
85 PP_TimeTicks time_stamp, 85 PP_TimeTicks time_stamp,
86 uint32_t modifiers, 86 uint32_t modifiers,
87 PP_InputEvent_MouseButton mouse_button, 87 PP_InputEvent_MouseButton mouse_button,
88 const PP_Point* mouse_position, 88 const PP_Point* mouse_position,
89 int32_t click_count, 89 int32_t click_count,
90 const PP_Point* mouse_movement) OVERRIDE; 90 const PP_Point* mouse_movement) OVERRIDE;
91 virtual PP_Resource CreateNetworkMonitor(
92 PP_Instance instance,
93 PPB_NetworkMonitor_Callback callback,
94 void* user_data) OVERRIDE;
95 virtual PP_Resource CreateResourceArray(PP_Instance instance, 91 virtual PP_Resource CreateResourceArray(PP_Instance instance,
96 const PP_Resource elements[], 92 const PP_Resource elements[],
97 uint32_t size) OVERRIDE; 93 uint32_t size) OVERRIDE;
98 virtual PP_Resource CreateScrollbar(PP_Instance instance, 94 virtual PP_Resource CreateScrollbar(PP_Instance instance,
99 PP_Bool vertical) OVERRIDE; 95 PP_Bool vertical) OVERRIDE;
100 virtual PP_Resource CreateTCPServerSocketPrivate( 96 virtual PP_Resource CreateTCPServerSocketPrivate(
101 PP_Instance instance) OVERRIDE; 97 PP_Instance instance) OVERRIDE;
102 virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instance) OVERRIDE; 98 virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instance) OVERRIDE;
103 99
104 virtual PP_Resource CreateTransport(PP_Instance instance, 100 virtual PP_Resource CreateTransport(PP_Instance instance,
(...skipping 21 matching lines...) Expand all
126 PP_Bool scroll_by_page) OVERRIDE; 122 PP_Bool scroll_by_page) OVERRIDE;
127 123
128 private: 124 private:
129 DISALLOW_COPY_AND_ASSIGN(ResourceCreationImpl); 125 DISALLOW_COPY_AND_ASSIGN(ResourceCreationImpl);
130 }; 126 };
131 127
132 } // namespace ppapi 128 } // namespace ppapi
133 } // namespace webkit 129 } // namespace webkit
134 130
135 #endif // WEBKIT_PLUGINS_PPAPI_RESOURCE_CREATION_IMPL_H_ 131 #endif // WEBKIT_PLUGINS_PPAPI_RESOURCE_CREATION_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/resource_creation_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698