[DevTools] Expose DevToolsAgentHost for OOPIF, display it in chrome://inspect.

chrome/browser/devtools/devtools_target_impl.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 "chrome/browser/devtools/devtools_target_impl.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ skipping 46 matching lines @@
   int tab_id_;
   std::string extension_id_;
 };
 
 WebContentsTarget::WebContentsTarget(WebContents* web_contents, bool is_tab)
     : DevToolsTargetImpl(DevToolsAgentHost::GetOrCreateFor(web_contents)),
       tab_id_(-1) {
   set_type(kTargetTypeOther);
 
   content::RenderFrameHost* rfh =
       web_contents->GetRenderViewHost()->GetMainFrame();

[Charlie Reis, 2015/03/05 20:31:14]

Please use web_contents->GetMainFrame().

[Charlie Reis, 2015/03/05 20:31:14]

Please use web_contents->GetMainFrame().

[dgozman, 2015/03/06 16:14:14]

I removed this code. Main frame can never be a cross process subframe.

   if (rfh->IsCrossProcessSubframe()) {
     set_url(rfh->GetLastCommittedURL());
     set_type(kTargetTypeIFrame);
-    // TODO(pfeldman) Update for out of process iframes.
     RenderViewHost* parent_rvh = rfh->GetParent()->GetRenderViewHost();
     set_parent_id(DevToolsAgentHost::GetOrCreateFor(
                       WebContents::FromRenderViewHost(parent_rvh))->GetId());

[Charlie Reis, 2015/03/05 20:31:14]

Please use WebContents::FromRenderFrameHost(rfh->GetParent()) instead, so that
we don't use RenderViewHost at all here.

     return;
   }
 
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();
   if (entry != NULL && entry->GetURL().is_valid())
     set_favicon_url(entry->GetFavicon().url);
   set_last_activity_time(web_contents->GetLastActiveTime());
 
   extensions::GuestViewBase* guest =
@@ skipping 51 matching lines @@
   return extension_id_;
 }
 
 void WebContentsTarget::Inspect(Profile* profile) const {
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return;
   DevToolsWindow::OpenDevToolsWindow(web_contents);
 }
 
+// FrameTarget ----------------------------------------------------------------
+
+class FrameTarget : public DevToolsTargetImpl {
+ public:
+  explicit FrameTarget(scoped_refptr<DevToolsAgentHost> agent_host);
+
+  // DevToolsTargetImpl overrides:
+  void Inspect(Profile* profile) const override;
+};
+
+FrameTarget::FrameTarget(scoped_refptr<DevToolsAgentHost> agent_host)
+    : DevToolsTargetImpl(agent_host) {
+  set_type(kTargetTypePage);
+  WebContents* wc = agent_host->GetWebContents();
+  DCHECK(DevToolsAgentHost::GetOrCreateFor(wc).get() != agent_host.get());
+  set_parent_id(DevToolsAgentHost::GetOrCreateFor(wc)->GetId());
+}
+
+void FrameTarget::Inspect(Profile* profile) const {
+  DevToolsWindow::OpenDevToolsWindow(profile, GetAgentHost());
+}
+
 // WorkerTarget ----------------------------------------------------------------
 
 class WorkerTarget : public DevToolsTargetImpl {
  public:
   explicit WorkerTarget(scoped_refptr<DevToolsAgentHost> agent_host);
 
   // DevToolsTargetImpl overrides:
   void Inspect(Profile* profile) const override;
 };
 
@@ skipping 118 matching lines @@
        it != agents.end(); ++it) {
     DevToolsAgentHost* agent_host = (*it).get();
     switch (agent_host->GetType()) {
       case DevToolsAgentHost::TYPE_WEB_CONTENTS:
         if (WebContents* web_contents = agent_host->GetWebContents()) {
           const bool is_tab =
               tab_web_contents.find(web_contents) != tab_web_contents.end();
           result.push_back(new WebContentsTarget(web_contents, is_tab));
         }
         break;
+      case DevToolsAgentHost::TYPE_FRAME:
+        result.push_back(new FrameTarget(agent_host));
+        break;
       case DevToolsAgentHost::TYPE_SHARED_WORKER:
         result.push_back(new WorkerTarget(agent_host));
         break;
       case DevToolsAgentHost::TYPE_SERVICE_WORKER:
         result.push_back(new WorkerTarget(agent_host));
         break;
       default:
         break;
     }
   }
 
   callback.Run(result);
 }