| Index: content/browser/devtools/devtools_http_handler_impl.h
|
| diff --git a/content/browser/devtools/devtools_http_handler_impl.h b/content/browser/devtools/devtools_http_handler_impl.h
|
| index 4e40db07f112e7ba3424457d008c8a0f3fe5f3d4..2d7cc5bd449f36cf40de190b3b00736973708842 100644
|
| --- a/content/browser/devtools/devtools_http_handler_impl.h
|
| +++ b/content/browser/devtools/devtools_http_handler_impl.h
|
| @@ -80,6 +80,7 @@ class DevToolsHttpHandlerImpl
|
| void OnTargetListReceived(
|
| int connection_id,
|
| const std::string& host,
|
| + const GURL& aux_url,
|
| const DevToolsHttpHandlerDelegate::TargetList& targets);
|
|
|
| DevToolsTarget* GetTarget(const std::string& id);
|
| @@ -105,15 +106,18 @@ class DevToolsHttpHandlerImpl
|
|
|
| // Returns the front end url without the host at the beginning.
|
| std::string GetFrontendURLInternal(const std::string target_id,
|
| - const std::string& host);
|
| + const std::string& host,
|
| + const std::string& frontend_url);
|
|
|
| - base::DictionaryValue* SerializeTarget(const DevToolsTarget& target,
|
| - const std::string& host);
|
| + base::DictionaryValue* SerializeTarget(
|
| + const DevToolsTarget& target,
|
| + const std::string& host,
|
| + const GURL& aux_url);
|
|
|
| // The thread used by the devtools handler to run server socket.
|
| scoped_ptr<base::Thread> thread_;
|
|
|
| - std::string overridden_frontend_url_;
|
| + std::string frontend_url_;
|
| scoped_ptr<const net::StreamListenSocketFactory> socket_factory_;
|
| scoped_refptr<net::HttpServer> server_;
|
| typedef std::map<int, DevToolsClientHost*> ConnectionToClientHostMap;
|
|
|