Index: mojo/services/html_viewer/websockethandle_impl.h |
diff --git a/mojo/services/html_viewer/websockethandle_impl.h b/mojo/services/html_viewer/websockethandle_impl.h |
index 07491020ba587d4922064a88532218f6322cdcb8..eef6a96a7f61eb82539bbbbe05e10e50e16533d8 100644 |
--- a/mojo/services/html_viewer/websockethandle_impl.h |
+++ b/mojo/services/html_viewer/websockethandle_impl.h |
@@ -13,13 +13,17 @@ |
namespace mojo { |
class NetworkService; |
-class WebSocketClientImpl; |
class WebSocketWriteQueue; |
+} |
+ |
+namespace html_viewer { |
+ |
+class WebSocketClientImpl; |
// Implements WebSocketHandle by talking to the mojo WebSocket interface. |
class WebSocketHandleImpl : public blink::WebSocketHandle { |
public: |
- explicit WebSocketHandleImpl(NetworkService* network_service); |
+ explicit WebSocketHandleImpl(mojo::NetworkService* network_service); |
private: |
friend class WebSocketClientImpl; |
@@ -48,16 +52,16 @@ class WebSocketHandleImpl : public blink::WebSocketHandle { |
// Called when the socket is closed. |
void Disconnect(); |
- WebSocketPtr web_socket_; |
+ mojo::WebSocketPtr web_socket_; |
scoped_ptr<WebSocketClientImpl> client_; |
- ScopedDataPipeProducerHandle send_stream_; |
- scoped_ptr<WebSocketWriteQueue> write_queue_; |
+ mojo::ScopedDataPipeProducerHandle send_stream_; |
+ scoped_ptr<mojo::WebSocketWriteQueue> write_queue_; |
// True if close() was called. |
bool did_close_; |
DISALLOW_COPY_AND_ASSIGN(WebSocketHandleImpl); |
}; |
-} // namespace mojo |
+} // namespace html_viewer |
#endif // MOJO_SERVICES_HTML_VIEWER_WEBSOCKETHANDLE_IMPL_H_ |