| Index: chrome/browser/devtools/devtools_targets_ui.cc
|
| diff --git a/chrome/browser/devtools/devtools_targets_ui.cc b/chrome/browser/devtools/devtools_targets_ui.cc
|
| index 5f602758a65a91fbabc639d7f4757eabcec0fed6..1fa4d806aaaa9677ef8c4ee4764a429e2e5e6530 100644
|
| --- a/chrome/browser/devtools/devtools_targets_ui.cc
|
| +++ b/chrome/browser/devtools/devtools_targets_ui.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/version.h"
|
| #include "chrome/browser/devtools/device/devtools_android_bridge.h"
|
| #include "chrome/browser/devtools/devtools_target_impl.h"
|
| +#include "chrome/browser/guest_view/guest_view_base.h"
|
| #include "chrome/common/chrome_version_info.h"
|
| #include "content/public/browser/browser_child_process_observer.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -77,7 +78,7 @@ class CancelableTimer {
|
| FROM_HERE,
|
| base::Bind(&CancelableTimer::Fire, weak_factory_.GetWeakPtr()),
|
| delay);
|
| - };
|
| + }
|
|
|
| private:
|
| void Fire() { callback_.Run(); }
|
| @@ -175,9 +176,10 @@ void RenderViewHostTargetsUIHandler::UpdateTargets() {
|
| RenderFrameHost* rfh = (*it);
|
| RenderFrameHost* parent_rfh = NULL;
|
| content::RenderViewHost* rvh = rfh->GetRenderViewHost();
|
| - if (rvh->GetProcess()->IsGuest()) {
|
| - WebContents* nested_web_contents = WebContents::FromRenderViewHost(rvh);
|
| - WebContents* embedder = nested_web_contents->GetEmbedderWebContents();
|
| + WebContents* nested_web_contents = WebContents::FromRenderViewHost(rvh);
|
| + GuestViewBase* guest = GuestViewBase::FromWebContents(nested_web_contents);
|
| + if (guest) {
|
| + WebContents* embedder = guest->embedder_web_contents();
|
| parent_rfh = embedder->GetRenderViewHost()->GetMainFrame();
|
| } else {
|
| parent_rfh = rfh->GetParent();
|
|
|