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

Unified Diff: content/browser/devtools/render_frame_devtools_agent_host.cc

Issue 2354973003: [DevTools] Move subtargets functionality from ServiceWorker to Target domain. (Closed)
Patch Set: review comments Created 4 years, 3 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
Index: content/browser/devtools/render_frame_devtools_agent_host.cc
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index 786472c3556637391a8e4ba74405b7ad072192af..9a859821e80eb83c6f3f8462ee87d5b703556f90 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -29,6 +29,7 @@
#include "content/browser/devtools/protocol/security_handler.h"
#include "content/browser/devtools/protocol/service_worker_handler.h"
#include "content/browser/devtools/protocol/storage_handler.h"
+#include "content/browser/devtools/protocol/target_handler.h"
#include "content/browser/devtools/protocol/tracing_handler.h"
#include "content/browser/frame_host/navigation_handle_impl.h"
#include "content/browser/frame_host/render_frame_host_impl.h"
@@ -385,6 +386,7 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
service_worker_handler_(
new devtools::service_worker::ServiceWorkerHandler()),
storage_handler_(new devtools::storage::StorageHandler()),
+ target_handler_(new devtools::target::TargetHandler()),
tracing_handler_(new devtools::tracing::TracingHandler(
devtools::tracing::TracingHandler::Renderer,
host->GetFrameTreeNodeId(),
@@ -405,6 +407,7 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(
dispatcher->SetSchemaHandler(schema_handler_.get());
dispatcher->SetServiceWorkerHandler(service_worker_handler_.get());
dispatcher->SetStorageHandler(storage_handler_.get());
+ dispatcher->SetTargetHandler(target_handler_.get());
dispatcher->SetTracingHandler(tracing_handler_.get());
if (!host->GetParent()) {
@@ -544,6 +547,7 @@ void RenderFrameDevToolsAgentHost::OnClientDetached() {
if (page_handler_)
page_handler_->Detached();
service_worker_handler_->Detached();
+ target_handler_->Detached();
tracing_handler_->Detached();
frame_trace_recorder_.reset();
in_navigation_protocol_message_buffer_.clear();
@@ -609,7 +613,7 @@ void RenderFrameDevToolsAgentHost::DidFinishNavigation(
DispatchBufferedProtocolMessagesIfNecessary();
if (navigation_handle->HasCommitted())
- service_worker_handler_->UpdateHosts();
+ target_handler_->UpdateServiceWorkers();
}
void RenderFrameDevToolsAgentHost::AboutToNavigateRenderFrame(
@@ -776,7 +780,7 @@ void RenderFrameDevToolsAgentHost::DidCommitProvisionalLoadForFrame(
return;
if (pending_ && pending_->host() == render_frame_host)
CommitPending();
- service_worker_handler_->UpdateHosts();
+ target_handler_->UpdateServiceWorkers();
}
void RenderFrameDevToolsAgentHost::DidFailProvisionalLoad(
@@ -831,6 +835,7 @@ void RenderFrameDevToolsAgentHost::UpdateProtocolHandlers(
security_handler_->SetRenderFrameHost(host);
if (storage_handler_)
storage_handler_->SetRenderFrameHost(host);
+ target_handler_->SetRenderFrameHost(host);
}
void RenderFrameDevToolsAgentHost::DisconnectWebContents() {

Powered by Google App Engine
This is Rietveld 408576698