diff options
author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 09:44:41 +0000 |
---|---|---|
committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 09:44:41 +0000 |
commit | e67d2179178b955a07df2c908d8c49a26fb0e71d (patch) | |
tree | c7f1113691da747da61a7e76b5574d25ba2afebf /content/browser/debugger/devtools_http_handler_impl.h | |
parent | a942b8c1ca4b002376306cf399e000d0842c630b (diff) | |
download | chromium_src-e67d2179178b955a07df2c908d8c49a26fb0e71d.zip chromium_src-e67d2179178b955a07df2c908d8c49a26fb0e71d.tar.gz chromium_src-e67d2179178b955a07df2c908d8c49a26fb0e71d.tar.bz2 |
DevTools: add /json/activate/ command to the discovery protocol.
This change adds suppot for /activate command and refactors the json commands handling so that all commands supported jsonp properly. For the jsonp support, we always respond with 200 OK and specify the actual code in the jsonp call parameter.
For the above purposes, migrates net/server/http_server from Send404() scheme to Send(net::HTTP_NOT_FOUND).
BUG=157495
Review URL: https://chromiumcodereview.appspot.com/11499004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/debugger/devtools_http_handler_impl.h')
-rw-r--r-- | content/browser/debugger/devtools_http_handler_impl.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/content/browser/debugger/devtools_http_handler_impl.h b/content/browser/debugger/devtools_http_handler_impl.h index b51bb1e..c912b92 100644 --- a/content/browser/debugger/devtools_http_handler_impl.h +++ b/content/browser/debugger/devtools_http_handler_impl.h @@ -76,14 +76,8 @@ class DevToolsHttpHandlerImpl const std::string& data) OVERRIDE; virtual void OnClose(int connection_id) OVERRIDE; - void OnVersionRequestUI(int connection_id, - const net::HttpServerRequestInfo& info); void OnJsonRequestUI(int connection_id, const net::HttpServerRequestInfo& info); - void OnNewTargetRequestUI(int connection_id, - const net::HttpServerRequestInfo& info); - void OnCloseTargetRequestUI(int connection_id, - const net::HttpServerRequestInfo& info); void OnThumbnailRequestUI(int connection_id, const net::HttpServerRequestInfo& info); void OnDiscoveryPageRequestUI(int connection_id); @@ -102,12 +96,14 @@ class DevToolsHttpHandlerImpl void StartHandlerThread(); void StopHandlerThread(); + void SendJson(int connection_id, + net::HttpStatusCode status_code, + base::Value* value, + const std::string& message, + const std::string& jsonp); void Send200(int connection_id, const std::string& data, - const std::string& mime_type = "text/html"); - void SendJson(int connection_id, - const net::HttpServerRequestInfo& info, - const base::Value& value); + const std::string& mime_type); void Send404(int connection_id); void Send500(int connection_id, const std::string& message); |