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

Unified Diff: public/platform/WebSocketHandle.h

Issue 1232563003: Remove 'blink::WebSerializedOrigin' (1/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix. Created 5 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: public/platform/WebSocketHandle.h
diff --git a/public/platform/WebSocketHandle.h b/public/platform/WebSocketHandle.h
index 9e5772a6041410573fff707c060bd1fab759bbea..9bdf9280007599ce478e49f1c3c6795d2ed8bdc6 100644
--- a/public/platform/WebSocketHandle.h
+++ b/public/platform/WebSocketHandle.h
@@ -32,11 +32,12 @@
#define WebSocketHandle_h
#include "public/platform/WebCommon.h"
+#include "public/platform/WebSerializedOrigin.h"
#include "public/platform/WebVector.h"
namespace blink {
-class WebSerializedOrigin;
+class WebSecurityOrigin;
class WebSocketHandleClient;
class WebString;
class WebURL;
@@ -57,7 +58,12 @@ public:
virtual ~WebSocketHandle() { }
- virtual void connect(const WebURL& /* url */, const WebVector<WebString>& protocols, const WebSerializedOrigin& /* origin */, WebSocketHandleClient*) = 0;
+ // TODO(mkwst): Drop the WebSerializedOrigin version once Chromium is updated: https://crbug.com/508896
+ virtual void connect(const WebURL& url, const WebVector<WebString>& protocols, const WebSecurityOrigin& origin, WebSocketHandleClient* client)
+ {
+ connect(url, protocols, WebSerializedOrigin(origin), client);
+ }
+ virtual void connect(const WebURL&, const WebVector<WebString>& protocols, const WebSerializedOrigin&, WebSocketHandleClient*) {}
virtual void send(bool fin, MessageType, const char* data, size_t /* size */) = 0;
virtual void flowControl(int64_t quota) = 0;
virtual void close(unsigned short code, const WebString& reason) = 0;
« no previous file with comments | « public/platform/WebSerializedOrigin.h ('k') | public/platform/modules/notifications/WebNotificationManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698