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

Unified Diff: content/common/websocket_messages.h

Issue 170843007: Introduce url::Origin to represent Web Origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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: content/common/websocket_messages.h
diff --git a/content/common/websocket_messages.h b/content/common/websocket_messages.h
index b158f485195ea40057f5205739074c39a8b2d04c..8562a60aab0f5845e90922e9d39496b6bac092f2 100644
--- a/content/common/websocket_messages.h
+++ b/content/common/websocket_messages.h
@@ -18,6 +18,7 @@
#include "base/basictypes.h"
#include "content/common/content_export.h"
+#include "content/common/serialized_origin.h"
#include "content/common/websocket.h"
#include "ipc/ipc_message_macros.h"
#include "url/gurl.h"
@@ -43,6 +44,10 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebSocketHandshakeResponse)
IPC_STRUCT_TRAITS_MEMBER(response_time)
IPC_STRUCT_TRAITS_END()
+IPC_STRUCT_TRAITS_BEGIN(content::SerializedOrigin)
+IPC_STRUCT_TRAITS_MEMBER(string)
Adam Rice 2014/02/24 06:48:26 Indentation.
yhirano 2014/03/03 15:41:54 deleted
+IPC_STRUCT_TRAITS_END()
+
// WebSocket messages sent from the renderer to the browser.
// Open new virtual WebSocket connection to |socket_url|. |channel_id| is an
@@ -58,7 +63,7 @@ IPC_STRUCT_TRAITS_END()
IPC_MESSAGE_ROUTED3(WebSocketHostMsg_AddChannelRequest,
GURL /* socket_url */,
std::vector<std::string> /* requested_protocols */,
- GURL /* origin */)
+ content::SerializedOrigin /* origin */)
// WebSocket messages sent from the browser to the renderer.

Powered by Google App Engine
This is Rietveld 408576698