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

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

Issue 8775063: Revert 112693 - committed before review was done - Landing 8688002: PPB_TCPSocket_Private/PPB_UDP... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/mock_plugin_delegate.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/mock_plugin_delegate.h:r3734-4217,4606-5108,5177-5263
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_MOCK_PLUGIN_DELEGATE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_MOCK_PLUGIN_DELEGATE_H_
6 #define WEBKIT_PLUGINS_PPAPI_MOCK_PLUGIN_DELEGATE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_MOCK_PLUGIN_DELEGATE_H_
7 7
8 #include "webkit/plugins/ppapi/plugin_delegate.h" 8 #include "webkit/plugins/ppapi/plugin_delegate.h"
9 9
10 struct PP_NetAddress_Private; 10 struct PP_NetAddress_Private;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 FilePath* platform_path); 97 FilePath* platform_path);
98 virtual scoped_refptr<base::MessageLoopProxy> 98 virtual scoped_refptr<base::MessageLoopProxy>
99 GetFileThreadMessageLoopProxy(); 99 GetFileThreadMessageLoopProxy();
100 virtual int32_t ConnectTcp( 100 virtual int32_t ConnectTcp(
101 webkit::ppapi::PPB_Flash_NetConnector_Impl* connector, 101 webkit::ppapi::PPB_Flash_NetConnector_Impl* connector,
102 const char* host, 102 const char* host,
103 uint16_t port); 103 uint16_t port);
104 virtual int32_t ConnectTcpAddress( 104 virtual int32_t ConnectTcpAddress(
105 webkit::ppapi::PPB_Flash_NetConnector_Impl* connector, 105 webkit::ppapi::PPB_Flash_NetConnector_Impl* connector,
106 const PP_NetAddress_Private* addr); 106 const PP_NetAddress_Private* addr);
107 virtual uint32 TCPSocketCreate();
108 virtual void TCPSocketConnect(PPB_TCPSocket_Private_Impl* socket,
109 uint32 socket_id,
110 const std::string& host,
111 uint16_t port);
112 virtual void TCPSocketConnectWithNetAddress(
113 PPB_TCPSocket_Private_Impl* socket,
114 uint32 socket_id,
115 const PP_NetAddress_Private& addr);
116 virtual void TCPSocketSSLHandshake(uint32 socket_id,
117 const std::string& server_name,
118 uint16_t server_port);
119 virtual void TCPSocketRead(uint32 socket_id, int32_t bytes_to_read);
120 virtual void TCPSocketWrite(uint32 socket_id, const std::string& buffer);
121 virtual void TCPSocketDisconnect(uint32 socket_id);
122 virtual uint32 UDPSocketCreate();
123 virtual void UDPSocketBind(PPB_UDPSocket_Private_Impl* socket,
124 uint32 socket_id,
125 const PP_NetAddress_Private& addr);
126 virtual void UDPSocketRecvFrom(uint32 socket_id, int32_t num_bytes);
127 virtual void UDPSocketSendTo(uint32 socket_id,
128 const std::string& buffer,
129 const PP_NetAddress_Private& addr);
130 virtual void UDPSocketClose(uint32 socket_id);
131 virtual int32_t ShowContextMenu( 107 virtual int32_t ShowContextMenu(
132 PluginInstance* instance, 108 PluginInstance* instance,
133 webkit::ppapi::PPB_Flash_Menu_Impl* menu, 109 webkit::ppapi::PPB_Flash_Menu_Impl* menu,
134 const gfx::Point& position); 110 const gfx::Point& position);
135 virtual FullscreenContainer* CreateFullscreenContainer( 111 virtual FullscreenContainer* CreateFullscreenContainer(
136 PluginInstance* instance); 112 PluginInstance* instance);
137 virtual gfx::Size GetScreenSize(); 113 virtual gfx::Size GetScreenSize();
138 virtual std::string GetDefaultEncoding(); 114 virtual std::string GetDefaultEncoding();
139 virtual void ZoomLimitsChanged(double minimum_factor, 115 virtual void ZoomLimitsChanged(double minimum_factor,
140 double maximum_factor); 116 double maximum_factor);
(...skipping 12 matching lines...) Expand all
153 virtual void DidChangeCursor(PluginInstance* instance, 129 virtual void DidChangeCursor(PluginInstance* instance,
154 const WebKit::WebCursorInfo& cursor); 130 const WebKit::WebCursorInfo& cursor);
155 virtual void DidReceiveMouseEvent(PluginInstance* instance); 131 virtual void DidReceiveMouseEvent(PluginInstance* instance);
156 virtual bool IsInFullscreenMode(); 132 virtual bool IsInFullscreenMode();
157 }; 133 };
158 134
159 } // namespace ppapi 135 } // namespace ppapi
160 } // namespace webkit 136 } // namespace webkit
161 137
162 #endif // WEBKIT_PLUGINS_PPAPI_MOCK_PLUGIN_DELEGATE_H_ 138 #endif // WEBKIT_PLUGINS_PPAPI_MOCK_PLUGIN_DELEGATE_H_
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/mock_plugin_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698