DevTools: Added service workers to chrome://inspect/#devices

content/shell/browser/shell_devtools_delegate.cc

 // Copyright 2013 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 "content/shell/browser/shell_devtools_delegate.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 57 matching lines @@
     } else {
       DLOG(WARNING) << "Invalid http debugger port number " << temp_port;
     }
   }
   return new net::TCPListenSocketFactory("127.0.0.1", port);
 #endif
 }
 
 class Target : public content::DevToolsTarget {
  public:
-  explicit Target(WebContents* web_contents);
+  explicit Target(scoped_refptr<DevToolsAgentHost> agent_host);
 
   virtual std::string GetId() const OVERRIDE { return id_; }
   virtual std::string GetParentId() const OVERRIDE { return std::string(); }
   virtual std::string GetType() const OVERRIDE { return kTargetTypePage; }
   virtual std::string GetTitle() const OVERRIDE { return title_; }
   virtual std::string GetDescription() const OVERRIDE { return std::string(); }
   virtual GURL GetURL() const OVERRIDE { return url_; }
   virtual GURL GetFaviconURL() const OVERRIDE { return favicon_url_; }
   virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
     return last_activity_time_;
   }
   virtual bool IsAttached() const OVERRIDE {
     return agent_host_->IsAttached();
   }
   virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
     return agent_host_;
   }
   virtual bool Activate() const OVERRIDE;
   virtual bool Close() const OVERRIDE;
 
  private:
   scoped_refptr<DevToolsAgentHost> agent_host_;
   std::string id_;
   std::string title_;
   GURL url_;
   GURL favicon_url_;
   base::TimeTicks last_activity_time_;
 };
 
-Target::Target(WebContents* web_contents) {
-  agent_host_ =
-      DevToolsAgentHost::GetOrCreateFor(web_contents->GetRenderViewHost());
-  id_ = agent_host_->GetId();
-  title_ = base::UTF16ToUTF8(web_contents->GetTitle());
-  url_ = web_contents->GetURL();
-  content::NavigationController& controller = web_contents->GetController();
-  content::NavigationEntry* entry = controller.GetActiveEntry();
-  if (entry != NULL && entry->GetURL().is_valid())
-    favicon_url_ = entry->GetFavicon().url;
-  last_activity_time_ = web_contents->GetLastActiveTime();
+Target::Target(scoped_refptr<DevToolsAgentHost> agent_host)
+    : agent_host_(agent_host),
+      id_(agent_host_->GetId()),
+      url_(agent_host_->GetURL()) {
+  if (RenderViewHost* rvh = agent_host_->GetRenderViewHost()) {
+    if (WebContents* web_contents = WebContents::FromRenderViewHost(rvh)) {
+      title_ = base::UTF16ToUTF8(web_contents->GetTitle());
+      content::NavigationController& controller = web_contents->GetController();
+      content::NavigationEntry* entry = controller.GetActiveEntry();
+      if (entry != NULL && entry->GetURL().is_valid())
+        favicon_url_ = entry->GetFavicon().url;
+      last_activity_time_ = web_contents->GetLastActiveTime();
+    }
+  }
 }
 
 bool Target::Activate() const {
   RenderViewHost* rvh = agent_host_->GetRenderViewHost();
   if (!rvh)
     return false;
   WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
   if (!web_contents)
     return false;
   web_contents->GetDelegate()->ActivateContents(web_contents);
@@ skipping 56 matching lines @@
   return std::string();
 }
 
 scoped_ptr<DevToolsTarget>
 ShellDevToolsDelegate::CreateNewTarget(const GURL& url) {
   Shell* shell = Shell::CreateNewWindow(browser_context_,
                                         url,
                                         NULL,
                                         MSG_ROUTING_NONE,
                                         gfx::Size());
-  return scoped_ptr<DevToolsTarget>(new Target(shell->web_contents()));
+  return scoped_ptr<DevToolsTarget>(
+      new Target(DevToolsAgentHost::GetOrCreateFor(shell->web_contents())));
+}
+
+static void CreateTargets(const ShellDevToolsDelegate::TargetCallback& callback,
+                          const DevToolsAgentHost::List& agents) {
+  ShellDevToolsDelegate::TargetList targets;
+  for (DevToolsAgentHost::List::const_iterator it = agents.begin();
+      it != agents.end(); ++it) {
+    targets.push_back(new Target(*it));
+  }
+  callback.Run(targets);
 }
 
 void ShellDevToolsDelegate::EnumerateTargets(TargetCallback callback) {
-  TargetList targets;
-  std::vector<RenderViewHost*> rvh_list =
-      content::DevToolsAgentHost::GetValidRenderViewHosts();
-  for (std::vector<RenderViewHost*>::iterator it = rvh_list.begin();
-       it != rvh_list.end(); ++it) {
-    WebContents* web_contents = WebContents::FromRenderViewHost(*it);
-    if (web_contents)
-      targets.push_back(new Target(web_contents));
-  }
-  callback.Run(targets);
+  DevToolsAgentHost::GetOrCreateAllHosts(base::Bind(&CreateTargets, callback));
 }
 
 scoped_ptr<net::StreamListenSocket>
 ShellDevToolsDelegate::CreateSocketForTethering(
     net::StreamListenSocket::Delegate* delegate,
     std::string* name) {
   return scoped_ptr<net::StreamListenSocket>();
 }
 
 }  // namespace content