content/renderer/pepper/pepper_plugin_delegate_impl.h - Issue 9699100: Add functionality to pppapi TCPSocket to support secure sockets in flash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/pepper_plugin_delegate_impl.h

Issue 9699100: Add functionality to pppapi TCPSocket to support secure sockets in flash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 8 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 side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/pepper_tcp_socket.cc ('K') | « content/browser/renderer_host/pepper_tcp_socket.cc ('k') | content/renderer/pepper/pepper_plugin_delegate_impl.cc » ('j') | ppapi/api/private/ppb_tcp_socket_private.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_plugin_delegate_impl.h

diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.h b/content/renderer/pepper/pepper_plugin_delegate_impl.h

index 4597cb48e86c45a197fd11d2b4c93eee0a46c7de..36c82d22dc2186232ff51497dc7bdbb4077b1797 100644

--- a/content/renderer/pepper/pepper_plugin_delegate_impl.h

+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.h

@@ -270,9 +270,12 @@ class PepperPluginDelegateImpl

webkit::ppapi::PPB_TCPSocket_Private_Impl* socket,

uint32 socket_id,

const PP_NetAddress_Private& addr) OVERRIDE;

- virtual void TCPSocketSSLHandshake(uint32 socket_id,

- const std::string& server_name,

- uint16_t server_port) OVERRIDE;

+ virtual void TCPSocketSSLHandshake(

+ uint32 socket_id,

+ const std::string& server_name,

+ uint16_t server_port,

+ const std::vector<std::vector<char> >& trusted_certs,

+ const std::vector<std::vector<char> >& untrusted_certs) OVERRIDE;

virtual void TCPSocketRead(uint32 socket_id, int32_t bytes_to_read) OVERRIDE;

virtual void TCPSocketWrite(uint32 socket_id,

const std::string& buffer) OVERRIDE;

@@ -373,9 +376,11 @@ class PepperPluginDelegateImpl

bool succeeded,

const PP_NetAddress_Private& local_addr,

const PP_NetAddress_Private& remote_addr);

- void OnTCPSocketSSLHandshakeACK(uint32 plugin_dispatcher_id,

- uint32 socket_id,

- bool succeeded);

+ void OnTCPSocketSSLHandshakeACK(

+ uint32 plugin_dispatcher_id,

+ uint32 socket_id,

+ bool succeeded,

+ const ppapi::PPB_X509Certificate_Fields& certificate_fields);

void OnTCPSocketReadACK(uint32 plugin_dispatcher_id,

uint32 socket_id,

bool succeeded,