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

Unified Diff: Source/web/WebSocketImpl.h

Issue 334873002: [WebSocket] Make subprotocol and extensions live in WebSocket (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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
« no previous file with comments | « Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp ('k') | Source/web/WebSocketImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebSocketImpl.h
diff --git a/Source/web/WebSocketImpl.h b/Source/web/WebSocketImpl.h
index 3165e02700d693282cd0754c8c70538f6d64b5d2..73180bfd2effd8cfbae214351cdadc3236f76ba4 100644
--- a/Source/web/WebSocketImpl.h
+++ b/Source/web/WebSocketImpl.h
@@ -34,6 +34,7 @@
#include "modules/websockets/WebSocketChannelClient.h"
#include "platform/heap/Handle.h"
#include "public/platform/WebCommon.h"
+#include "public/platform/WebString.h"
#include "public/web/WebSocket.h"
#include "public/web/WebSocketClient.h"
#include "wtf/OwnPtr.h"
@@ -44,7 +45,6 @@ namespace WebCore { class WebSocketChannel; }
namespace blink {
class WebDocument;
-class WebString;
class WebURL;
class WebSocketImpl FINAL : public WebSocket, public WebCore::WebSocketChannelClient {
@@ -67,7 +67,7 @@ public:
virtual void disconnect() OVERRIDE;
// WebSocketChannelClient
- virtual void didConnect() OVERRIDE;
+ virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;
virtual void didReceiveMessage(const String& message) OVERRIDE;
virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData) OVERRIDE;
virtual void didReceiveMessageError() OVERRIDE;
@@ -79,6 +79,8 @@ private:
RefPtrWillBePersistent<WebCore::WebSocketChannel> m_private;
WebSocketClient* m_client;
BinaryType m_binaryType;
+ WebString m_subprotocol;
+ WebString m_extensions;
};
} // namespace blink
« no previous file with comments | « Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp ('k') | Source/web/WebSocketImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698