diff options
| -rw-r--r-- | content/browser/debugger/devtools_http_protocol_handler.cc | 63 | ||||
| -rw-r--r-- | content/browser/debugger/devtools_manager.cc | 5 | ||||
| -rw-r--r-- | content/browser/debugger/worker_devtools_manager.cc | 20 |
3 files changed, 40 insertions, 48 deletions
diff --git a/content/browser/debugger/devtools_http_protocol_handler.cc b/content/browser/debugger/devtools_http_protocol_handler.cc index a7c4730..4d654d2 100644 --- a/content/browser/debugger/devtools_http_protocol_handler.cc +++ b/content/browser/debugger/devtools_http_protocol_handler.cc @@ -6,6 +6,7 @@ #include <utility> +#include "base/bind.h" #include "base/compiler_specific.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" @@ -51,9 +52,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(server_, - &net::HttpServer::Close, - connection_id_)); + base::Bind(&net::HttpServer::Close, server_, connection_id_)); } virtual void SendMessageToClient(const IPC::Message& msg) { @@ -76,10 +75,10 @@ class DevToolsClientHostImpl : public DevToolsClientHost { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(server_, - &net::HttpServer::SendOverWebSocket, - connection_id_, - data)); + base::Bind(&net::HttpServer::SendOverWebSocket, + server_, + connection_id_, + data)); } virtual void FrameNavigating(const std::string& url) {} @@ -165,13 +164,13 @@ DevToolsHttpProtocolHandler::~DevToolsHttpProtocolHandler() { void DevToolsHttpProtocolHandler::Start() { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(this, &DevToolsHttpProtocolHandler::Init)); + base::Bind(&DevToolsHttpProtocolHandler::Init, this)); } void DevToolsHttpProtocolHandler::Stop() { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(this, &DevToolsHttpProtocolHandler::Teardown)); + base::Bind(&DevToolsHttpProtocolHandler::Teardown, this)); } void DevToolsHttpProtocolHandler::OnHttpRequest( @@ -182,10 +181,10 @@ void DevToolsHttpProtocolHandler::OnHttpRequest( BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableMethod(this, - &DevToolsHttpProtocolHandler::OnJsonRequestUI, - connection_id, - info)); + base::Bind(&DevToolsHttpProtocolHandler::OnJsonRequestUI, + this, + connection_id, + info)); return; } @@ -224,9 +223,9 @@ void DevToolsHttpProtocolHandler::OnWebSocketRequest( BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableMethod( - this, + base::Bind( &DevToolsHttpProtocolHandler::OnWebSocketRequestUI, + this, connection_id, request)); } @@ -237,9 +236,9 @@ void DevToolsHttpProtocolHandler::OnWebSocketMessage( BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableMethod( - this, + base::Bind( &DevToolsHttpProtocolHandler::OnWebSocketMessageUI, + this, connection_id, data)); } @@ -263,9 +262,9 @@ void DevToolsHttpProtocolHandler::OnClose(int connection_id) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableMethod( - this, + base::Bind( &DevToolsHttpProtocolHandler::OnCloseUI, + this, connection_id)); } @@ -528,29 +527,25 @@ void DevToolsHttpProtocolHandler::Send200(int connection_id, const std::string& mime_type) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(server_.get(), - &net::HttpServer::Send200, - connection_id, - data, - mime_type)); + base::Bind(&net::HttpServer::Send200, + server_.get(), + connection_id, + data, + mime_type)); } void DevToolsHttpProtocolHandler::Send404(int connection_id) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(server_.get(), - &net::HttpServer::Send404, - connection_id)); + base::Bind(&net::HttpServer::Send404, server_.get(), connection_id)); } void DevToolsHttpProtocolHandler::Send500(int connection_id, const std::string& message) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(server_.get(), - &net::HttpServer::Send500, - connection_id, - message)); + base::Bind(&net::HttpServer::Send500, server_.get(), connection_id, + message)); } void DevToolsHttpProtocolHandler::AcceptWebSocket( @@ -558,8 +553,6 @@ void DevToolsHttpProtocolHandler::AcceptWebSocket( const net::HttpServerRequestInfo& request) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(server_.get(), - &net::HttpServer::AcceptWebSocket, - connection_id, - request)); + base::Bind(&net::HttpServer::AcceptWebSocket, server_.get(), + connection_id, request)); } diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc index 7db5ae7..82a7c09 100644 --- a/content/browser/debugger/devtools_manager.cc +++ b/content/browser/debugger/devtools_manager.cc @@ -6,6 +6,7 @@ #include <vector> +#include "base/bind.h" #include "base/message_loop.h" #include "content/browser/browsing_instance.h" #include "content/browser/child_process_security_policy.h" @@ -228,7 +229,7 @@ void DevToolsManager::BindClientHost( BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableFunction(&DevToolsNetLogObserver::Attach)); + base::Bind(&DevToolsNetLogObserver::Attach)); } agent_to_client_host_[agent_host] = client_host; client_to_agent_host_[client_host] = agent_host; @@ -256,7 +257,7 @@ void DevToolsManager::UnbindClientHost(DevToolsAgentHost* agent_host, BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableFunction(&DevToolsNetLogObserver::Detach)); + base::Bind(&DevToolsNetLogObserver::Detach)); } agent_host->Detach(); diff --git a/content/browser/debugger/worker_devtools_manager.cc b/content/browser/debugger/worker_devtools_manager.cc index 85bb498..a2f2f22 100644 --- a/content/browser/debugger/worker_devtools_manager.cc +++ b/content/browser/debugger/worker_devtools_manager.cc @@ -7,7 +7,7 @@ #include <list> #include <map> -#include "base/tuple.h" +#include "base/bind.h" #include "content/browser/debugger/devtools_agent_host.h" #include "content/browser/debugger/devtools_manager.h" #include "content/browser/debugger/worker_devtools_message_filter.h" @@ -98,7 +98,7 @@ class WorkerDevToolsManager::WorkerDevToolsAgentHost BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableFunction( + base::Bind( &RegisterAgent, worker_id.first, worker_id.second)); @@ -133,7 +133,7 @@ class WorkerDevToolsManager::WorkerDevToolsAgentHost virtual void SendMessageToAgent(IPC::Message* message) OVERRIDE { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableFunction( + base::Bind( &WorkerDevToolsAgentHost::ForwardToWorkerDevToolsAgent, worker_id_.first, worker_id_.second, @@ -205,7 +205,7 @@ class WorkerDevToolsManager::DetachedClientHosts { static void RemovePendingWorkerData(WorkerId id) { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableFunction(RemoveInspectedWorkerDataOnIOThread, id)); + base::Bind(RemoveInspectedWorkerDataOnIOThread, id)); } static void RemoveInspectedWorkerDataOnIOThread(WorkerId id) { @@ -303,9 +303,7 @@ void WorkerDevToolsManager::WorkerDestroyed( inspected_workers_.erase(it); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableFunction( - DetachedClientHosts::WorkerDestroyed, - worker_id)); + base::Bind(DetachedClientHosts::WorkerDestroyed, worker_id)); } void WorkerDevToolsManager::WorkerContextStarted(WorkerProcessHost* process, @@ -317,7 +315,7 @@ void WorkerDevToolsManager::WorkerContextStarted(WorkerProcessHost* process, BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableFunction( + base::Bind( DetachedClientHosts::WorkerReloaded, it->second, new_worker_id)); @@ -395,7 +393,7 @@ void WorkerDevToolsManager::ForwardToDevToolsClient( } BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableFunction( + base::Bind( ForwardToDevToolsClientOnUIThread, worker_process_id, worker_route_id, @@ -407,7 +405,7 @@ void WorkerDevToolsManager::SaveAgentRuntimeState(int worker_process_id, const std::string& state) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableFunction( + base::Bind( SaveAgentRuntimeStateOnUIThread, worker_process_id, worker_route_id, @@ -460,7 +458,7 @@ void WorkerDevToolsManager::NotifyWorkerDestroyedOnIOThread( int worker_route_id) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableFunction( + base::Bind( &WorkerDevToolsManager::NotifyWorkerDestroyedOnUIThread, worker_process_id, worker_route_id)); |