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

Unified Diff: chrome/browser/debugger/devtools_http_protocol_handler.h

Issue 6875024: net: Put net/server/* into namespace net. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: willchan review Created 9 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/debugger/devtools_http_protocol_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « no previous file | chrome/browser/debugger/devtools_http_protocol_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698