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

Unified Diff: net/websockets/websocket_handshake_handler.h

Issue 10843050: WebSocket over SPDY: handshake support for both of SPDY/2 and SPDY/3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move spdy related tests to new files Created 8 years, 5 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
Index: net/websockets/websocket_handshake_handler.h
diff --git a/net/websockets/websocket_handshake_handler.h b/net/websockets/websocket_handshake_handler.h
index 2093adbae4cb5c04a7ba3719042393e1eac0beb9..fd02e89027f8058bd112ef0dae266080382ac93c 100644
--- a/net/websockets/websocket_handshake_handler.h
+++ b/net/websockets/websocket_handshake_handler.h
@@ -35,6 +35,7 @@
#include "net/base/net_export.h"
#include "net/http/http_request_info.h"
#include "net/http/http_response_info.h"
+#include "net/socket/next_proto.h"
#include "net/spdy/spdy_framer.h"
namespace net {
@@ -68,7 +69,8 @@ class NET_EXPORT_PRIVATE WebSocketHandshakeRequestHandler {
// Also, fills challenge data in |challenge|.
bool GetRequestHeaderBlock(const GURL& url,
SpdyHeaderBlock* headers,
- std::string* challenge);
+ std::string* challenge,
+ NextProto protocol_negotiated);
// Gets WebSocket handshake raw request message to open WebSocket
// connection.
std::string GetRawRequest();
@@ -117,7 +119,8 @@ class NET_EXPORT_PRIVATE WebSocketHandshakeResponseHandler {
const std::string& challenge);
// Parses WebSocket handshake response as SpdyHeaderBlock.
bool ParseResponseHeaderBlock(const SpdyHeaderBlock& headers,
- const std::string& challenge);
+ const std::string& challenge,
+ NextProto protocol_negotiated);
// Gets the headers value.
void GetHeaders(const char* const headers_to_get[],

Powered by Google App Engine
This is Rietveld 408576698