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

Unified Diff: content/child/websocket_bridge.cc

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, 9 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 | « content/browser/renderer_host/websocket_host.cc ('k') | content/common/websocket_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/websocket_bridge.cc
diff --git a/content/child/websocket_bridge.cc b/content/child/websocket_bridge.cc
index 15a92dcd54166aef537070efff74bfb267b7290b..8eaf2cce5b9e4a59ceab4a7724658ed22d22ccd4 100644
--- a/content/child/websocket_bridge.cc
+++ b/content/child/websocket_bridge.cc
@@ -17,7 +17,6 @@
#include "content/common/websocket_messages.h"
#include "ipc/ipc_message.h"
#include "ipc/ipc_message_macros.h"
-#include "url/gurl.h"
#include "third_party/WebKit/public/platform/WebSocketHandle.h"
#include "third_party/WebKit/public/platform/WebSocketHandleClient.h"
#include "third_party/WebKit/public/platform/WebSocketHandshakeRequestInfo.h"
@@ -25,6 +24,8 @@
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebVector.h"
+#include "url/gurl.h"
+#include "url/origin.h"
using blink::WebSocketHandle;
using blink::WebSocketHandleClient;
@@ -216,11 +217,11 @@ void WebSocketBridge::connect(
std::vector<std::string> protocols_to_pass;
for (size_t i = 0; i < protocols.size(); ++i)
protocols_to_pass.push_back(protocols[i].utf8());
- GURL origin_to_pass(origin.utf8());
+ url::Origin origin_to_pass(origin.utf8());
- DVLOG(1) << "Bridge#" << channel_id_ << " Connect("
- << url << ", (" << JoinString(protocols_to_pass, ", ") << "), "
- << origin_to_pass << ")";
+ DVLOG(1) << "Bridge#" << channel_id_ << " Connect(" << url << ", ("
+ << JoinString(protocols_to_pass, ", ") << "), "
+ << origin_to_pass.string() << ")";
ChildThread::current()->Send(
new WebSocketHostMsg_AddChannelRequest(channel_id_,
« no previous file with comments | « content/browser/renderer_host/websocket_host.cc ('k') | content/common/websocket_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698