HeadlessWebContents Observers for devtools clients attaching/detatching

headless/lib/browser/headless_web_contents_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "headless/lib/browser/headless_web_contents_impl.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 174 matching lines @@
           new HeadlessWebContentsImpl::Delegate(browser_context)),
       web_contents_(web_contents),
       agent_host_(content::DevToolsAgentHost::GetOrCreateFor(web_contents)),
       browser_context_(browser_context),
       render_process_host_(web_contents->GetRenderProcessHost()) {
 #if BUILDFLAG(ENABLE_BASIC_PRINTING)
   printing::HeadlessPrintManager::CreateForWebContents(web_contents);
 #endif
   web_contents_->SetDelegate(web_contents_delegate_.get());
   render_process_host_->AddObserver(this);
+  agent_host_->AddObserver(this);
 }
 
 HeadlessWebContentsImpl::~HeadlessWebContentsImpl() {
+  if (agent_host_)

[Sami, 2017/04/25 18:31:12]

agent_host_ should always be non-null, right?

[alex clarke (OOO till 29th), 2017/04/26 08:11:07]

Done.

+    agent_host_->RemoveObserver(this);
   if (render_process_host_)
     render_process_host_->RemoveObserver(this);
 }
 
 void HeadlessWebContentsImpl::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
   if (!mojo_services_.empty()) {
     render_frame_host->AllowBindings(content::BINDINGS_POLICY_HEADLESS);
   }
 
@@ skipping 62 matching lines @@
   observer_map_[observer] = base::MakeUnique<WebContentsObserverAdapter>(
       web_contents_.get(), observer);
 }
 
 void HeadlessWebContentsImpl::RemoveObserver(Observer* observer) {
   ObserverMap::iterator it = observer_map_.find(observer);
   DCHECK(it != observer_map_.end());
   observer_map_.erase(it);
 }
 
+void HeadlessWebContentsImpl::DevToolsAgentHostAttached(
+    content::DevToolsAgentHost* agent_host) {
+  for (const auto& pair : observer_map_) {
+    pair.second->observer()->DevToolsClientAttached();
+  }
+}
+
+void HeadlessWebContentsImpl::DevToolsAgentHostDetached(
+    content::DevToolsAgentHost* agent_host) {
+  for (const auto& pair : observer_map_) {
+    pair.second->observer()->DevToolsClientDettached();

[Sami, 2017/04/25 18:31:12]

typo: Detached

[alex clarke (OOO till 29th), 2017/04/26 08:11:07]

Done.

+  }
+}
+
 void HeadlessWebContentsImpl::RenderProcessExited(
     content::RenderProcessHost* host,
     base::TerminationStatus status,
     int exit_code) {
   DCHECK_EQ(render_process_host_, host);
   for (const auto& pair : observer_map_) {
     pair.second->observer()->RenderProcessExited(status, exit_code);
   }
 }
 
@@ skipping 86 matching lines @@
 HeadlessWebContents::Builder::MojoService::MojoService() {}
 
 HeadlessWebContents::Builder::MojoService::MojoService(
     const std::string& service_name,
     const base::Callback<void(mojo::ScopedMessagePipeHandle)>& service_factory)
     : service_name(service_name), service_factory(service_factory) {}
 
 HeadlessWebContents::Builder::MojoService::~MojoService() {}
 
 }  // namespace headless