| Index: content/child/websocket_bridge.h
|
| diff --git a/content/child/websocket_bridge.h b/content/child/websocket_bridge.h
|
| index 9f9264742d9fe21ac77b4eafb805bfad691df5f2..1ad836814edab98fc94ae18f66f999fb0666eb7e 100644
|
| --- a/content/child/websocket_bridge.h
|
| +++ b/content/child/websocket_bridge.h
|
| @@ -19,7 +19,7 @@
|
|
|
| namespace content {
|
|
|
| -class WebSocketBridge : public WebKit::WebSocketHandle {
|
| +class WebSocketBridge : public blink::WebSocketHandle {
|
| public:
|
| WebSocketBridge();
|
|
|
| @@ -27,17 +27,17 @@ class WebSocketBridge : public WebKit::WebSocketHandle {
|
| bool OnMessageReceived(const IPC::Message& message);
|
|
|
| // WebSocketHandle functions.
|
| - virtual void connect(const WebKit::WebURL& url,
|
| - const WebKit::WebVector<WebKit::WebString>& protocols,
|
| - const WebKit::WebString& origin,
|
| - WebKit::WebSocketHandleClient* client) OVERRIDE;
|
| + virtual void connect(const blink::WebURL& url,
|
| + const blink::WebVector<blink::WebString>& protocols,
|
| + const blink::WebString& origin,
|
| + blink::WebSocketHandleClient* client) OVERRIDE;
|
| virtual void send(bool fin,
|
| WebSocketHandle::MessageType type,
|
| const char* data,
|
| size_t size) OVERRIDE;
|
| virtual void flowControl(int64_t quota) OVERRIDE;
|
| virtual void close(unsigned short code,
|
| - const WebKit::WebString& reason) OVERRIDE;
|
| + const blink::WebString& reason) OVERRIDE;
|
|
|
| virtual void Disconnect();
|
|
|
| @@ -55,7 +55,7 @@ class WebSocketBridge : public WebKit::WebSocketHandle {
|
| void DidClose(bool was_clean, unsigned short code, const std::string& reason);
|
|
|
| int channel_id_;
|
| - WebKit::WebSocketHandleClient* client_;
|
| + blink::WebSocketHandleClient* client_;
|
|
|
| static const int kInvalidChannelId = -1;
|
| };
|
|
|