| Index: chrome/browser/debugger/devtools_http_protocol_handler.h
|
| diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.h b/chrome/browser/debugger/devtools_http_protocol_handler.h
|
| index 3433b725cd7dd5904688068bf4adff63050f8dda..67eadc58933f6e84e621cce65deb23dde27a7fab 100644
|
| --- a/chrome/browser/debugger/devtools_http_protocol_handler.h
|
| +++ b/chrome/browser/debugger/devtools_http_protocol_handler.h
|
| @@ -21,7 +21,7 @@ class TabContents;
|
| class TabContentsWrapper;
|
|
|
| class DevToolsHttpProtocolHandler
|
| - : public HttpServer::Delegate,
|
| + : public net::HttpServer::Delegate,
|
| public net::URLRequest::Delegate,
|
| public base::RefCountedThreadSafe<DevToolsHttpProtocolHandler> {
|
| public:
|
| @@ -56,21 +56,21 @@ class DevToolsHttpProtocolHandler
|
| virtual ~DevToolsHttpProtocolHandler();
|
| void Start();
|
|
|
| - // HttpServer::Delegate implementation.
|
| + // net::HttpServer::Delegate implementation.
|
| virtual void OnHttpRequest(int connection_id,
|
| - const HttpServerRequestInfo& info);
|
| + const net::HttpServerRequestInfo& info);
|
| virtual void OnWebSocketRequest(int connection_id,
|
| - const HttpServerRequestInfo& info);
|
| + const net::HttpServerRequestInfo& info);
|
| virtual void OnWebSocketMessage(int connection_id,
|
| const std::string& data);
|
| virtual void OnClose(int connection_id);
|
|
|
| virtual void OnRootRequestUI(int connection_id,
|
| - const HttpServerRequestInfo& info);
|
| + const net::HttpServerRequestInfo& info);
|
| virtual void OnJsonRequestUI(int connection_id,
|
| - const HttpServerRequestInfo& info);
|
| + const net::HttpServerRequestInfo& info);
|
| virtual void OnWebSocketRequestUI(int connection_id,
|
| - const HttpServerRequestInfo& info);
|
| + const net::HttpServerRequestInfo& info);
|
| virtual void OnWebSocketMessageUI(int connection_id,
|
| const std::string& data);
|
| virtual void OnCloseUI(int connection_id);
|
| @@ -91,14 +91,14 @@ class DevToolsHttpProtocolHandler
|
| void Send500(int connection_id,
|
| const std::string& message);
|
| void AcceptWebSocket(int connection_id,
|
| - const HttpServerRequestInfo& request);
|
| + const net::HttpServerRequestInfo& request);
|
|
|
| TabContents* GetTabContents(int session_id);
|
|
|
| std::string ip_;
|
| int port_;
|
| std::string overriden_frontend_url_;
|
| - scoped_refptr<HttpServer> server_;
|
| + scoped_refptr<net::HttpServer> server_;
|
| typedef std::map<net::URLRequest*, int>
|
| RequestToSocketMap;
|
| RequestToSocketMap request_to_connection_io_;
|
|
|