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

Unified Diff: content/browser/renderer_host/websocket_host.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, 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/browser/renderer_host/websocket_host.cc
diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc
index 48b04b081cc92417f551c64c2ff0469d5663b1db..1a5d07bb9700b2a3c7c9219d496c53403927eae8 100644
--- a/content/browser/renderer_host/websocket_host.cc
+++ b/content/browser/renderer_host/websocket_host.cc
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "base/strings/string_util.h"
#include "content/browser/renderer_host/websocket_dispatcher_host.h"
+#include "content/common/serialized_origin.h"
#include "content/common/websocket_messages.h"
#include "ipc/ipc_message_macros.h"
#include "net/http/http_request_headers.h"
@@ -231,14 +232,15 @@ bool WebSocketHost::OnMessageReceived(const IPC::Message& message,
void WebSocketHost::OnAddChannelRequest(
const GURL& socket_url,
const std::vector<std::string>& requested_protocols,
- const GURL& origin) {
+ const SerializedOrigin& origin) {
DVLOG(3) << "WebSocketHost::OnAddChannelRequest"
<< " routing_id=" << routing_id_ << " socket_url=\"" << socket_url
<< "\" requested_protocols=\""
- << JoinString(requested_protocols, ", ") << "\" origin=\"" << origin
- << "\"";
+ << JoinString(requested_protocols, ", ") << "\" origin=\""
+ << origin.string << "\"";
- channel_->SendAddChannelRequest(socket_url, requested_protocols, origin);
+ channel_->SendAddChannelRequest(
+ socket_url, requested_protocols, origin.string);
}
void WebSocketHost::OnSendFrame(bool fin,

Powered by Google App Engine
This is Rietveld 408576698