DevTools: Add parent id to target descriptor in remote debugging.

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_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/guest_view/guest_view_base.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 using content::RenderViewHost;
 using content::WebContents;
 using content::WorkerService;
 
 namespace {
 
 const char kTargetTypeApp[] = "app";
 const char kTargetTypeBackgroundPage[] = "background_page";
 const char kTargetTypePage[] = "page";
 const char kTargetTypeWorker[] = "worker";
+const char kTargetTypeWebView[] = "webview";
+const char kTargetTypeIFrame[] = "iframe";
 const char kTargetTypeOther[] = "other";
 
 // RenderViewHostTarget --------------------------------------------------------
 
 class RenderViewHostTarget : public DevToolsTargetImpl {
  public:
   explicit RenderViewHostTarget(RenderViewHost* rvh, bool is_tab);
 
   // DevToolsTargetImpl overrides:
   virtual bool Activate() const OVERRIDE;
@@ skipping 12 matching lines @@
     : DevToolsTargetImpl(DevToolsAgentHost::GetOrCreateFor(rvh)),
       tab_id_(-1) {
   set_type(kTargetTypeOther);
   WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
   if (!web_contents)
     return;  // Orphan RVH will show up with no title/url/icon in clients.
 
   content::RenderFrameHost* rfh = rvh->GetMainFrame();
   if (rfh->IsCrossProcessSubframe()) {
     set_url(rfh->GetLastCommittedURL());
-    set_type(kTargetTypeOther);
+    set_type(kTargetTypeIFrame);
     // TODO(kaznacheev) Try setting the title when the frame navigation
     // refactoring is done.
+    RenderViewHost* parent_rvh = rfh->GetParent()->GetRenderViewHost();
+    set_parent_id(DevToolsAgentHost::GetOrCreateFor(parent_rvh)->GetId());
     return;
   }
 
   set_title(base::UTF16ToUTF8(web_contents->GetTitle()));
   set_url(web_contents->GetURL());
   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());
 
+  GuestViewBase* guest = GuestViewBase::FromWebContents(web_contents);
+  if (guest) {
+    set_type(kTargetTypeWebView);
+    RenderViewHost* parent_rvh =
+        guest->embedder_web_contents()->GetRenderViewHost();
+    set_parent_id(DevToolsAgentHost::GetOrCreateFor(parent_rvh)->GetId());
+    return;
+  }
+
   if (is_tab) {
     set_type(kTargetTypePage);
     tab_id_ = extensions::ExtensionTabUtil::GetTabId(web_contents);
   } else {
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
     if (profile) {
       ExtensionService* extension_service = profile->GetExtensionService();
       const extensions::Extension* extension = extension_service->
           extensions()->GetByID(GetURL().host());
@@ skipping 105 matching lines @@
 
 // DevToolsTargetImpl ----------------------------------------------------------
 
 DevToolsTargetImpl::~DevToolsTargetImpl() {
 }
 
 DevToolsTargetImpl::DevToolsTargetImpl(DevToolsAgentHost* agent_host)
     : agent_host_(agent_host) {
 }
 
+std::string DevToolsTargetImpl::GetParentId() const {
+  return parent_id_;
+}
+
 std::string DevToolsTargetImpl::GetId() const {
   return agent_host_->GetId();
 }
 
 std::string DevToolsTargetImpl::GetType() const {
   return type_;
 }
 
 std::string DevToolsTargetImpl::GetTitle() const {
   return title_;
@@ skipping 108 matching lines @@
 
 // static
 void DevToolsTargetImpl::EnumerateAllTargets(Callback callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&DevToolsTargetImpl::EnumerateWorkerTargets,
                  base::Bind(&CollectAllTargets, callback)));
 }