OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/child/websocket_bridge.h" | 5 #include "content/child/websocket_bridge.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "content/child/child_thread.h" | 13 #include "content/child/child_thread.h" |
14 #include "content/child/websocket_dispatcher.h" | 14 #include "content/child/websocket_dispatcher.h" |
15 #include "content/common/websocket.h" | 15 #include "content/common/websocket.h" |
16 #include "content/common/websocket_messages.h" | 16 #include "content/common/websocket_messages.h" |
17 #include "ipc/ipc_message.h" | 17 #include "ipc/ipc_message.h" |
18 #include "ipc/ipc_message_macros.h" | 18 #include "ipc/ipc_message_macros.h" |
19 #include "url/gurl.h" | 19 #include "url/gurl.h" |
20 #include "third_party/WebKit/public/platform/WebSocketHandle.h" | 20 #include "third_party/WebKit/public/platform/WebSocketHandle.h" |
21 #include "third_party/WebKit/public/platform/WebSocketHandleClient.h" | 21 #include "third_party/WebKit/public/platform/WebSocketHandleClient.h" |
22 #include "third_party/WebKit/public/platform/WebString.h" | 22 #include "third_party/WebKit/public/platform/WebString.h" |
23 #include "third_party/WebKit/public/platform/WebURL.h" | 23 #include "third_party/WebKit/public/platform/WebURL.h" |
24 #include "third_party/WebKit/public/platform/WebVector.h" | 24 #include "third_party/WebKit/public/platform/WebVector.h" |
25 | 25 |
26 using WebKit::WebSocketHandle; | 26 using blink::WebSocketHandle; |
27 using WebKit::WebSocketHandleClient; | 27 using blink::WebSocketHandleClient; |
28 using WebKit::WebString; | 28 using blink::WebString; |
29 using WebKit::WebURL; | 29 using blink::WebURL; |
30 using WebKit::WebVector; | 30 using blink::WebVector; |
31 | 31 |
32 namespace content { | 32 namespace content { |
33 | 33 |
34 namespace { | 34 namespace { |
35 | 35 |
36 const unsigned short kAbnormalShutdownOpCode = 1006; | 36 const unsigned short kAbnormalShutdownOpCode = 1006; |
37 | 37 |
38 } // namespace | 38 } // namespace |
39 | 39 |
40 WebSocketBridge::WebSocketBridge() | 40 WebSocketBridge::WebSocketBridge() |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 return; | 237 return; |
238 WebSocketDispatcher* dispatcher = | 238 WebSocketDispatcher* dispatcher = |
239 ChildThread::current()->websocket_dispatcher(); | 239 ChildThread::current()->websocket_dispatcher(); |
240 dispatcher->RemoveBridge(channel_id_); | 240 dispatcher->RemoveBridge(channel_id_); |
241 | 241 |
242 channel_id_ = kInvalidChannelId; | 242 channel_id_ = kInvalidChannelId; |
243 client_ = NULL; | 243 client_ = NULL; |
244 } | 244 } |
245 | 245 |
246 } // namespace content | 246 } // namespace content |
OLD | NEW |