| Index: chrome/browser/devtools/devtools_target_impl.cc
|
| diff --git a/chrome/browser/devtools/devtools_target_impl.cc b/chrome/browser/devtools/devtools_target_impl.cc
|
| index be739263be39a76c2fc5dc742ba65981876c67e2..ab9fa5144e5f4d4756c352c255c6c25a513de2d2 100644
|
| --- a/chrome/browser/devtools/devtools_target_impl.cc
|
| +++ b/chrome/browser/devtools/devtools_target_impl.cc
|
| @@ -12,6 +12,7 @@
|
| #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 "components/guest_view/browser/guest_view_base.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/favicon_status.h"
|
| #include "content/public/browser/navigation_entry.h"
|
| @@ -20,7 +21,6 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "extensions/browser/extension_host.h"
|
| #include "extensions/browser/extension_registry.h"
|
| -#include "extensions/browser/guest_view/guest_view_base.h"
|
| #include "extensions/browser/process_manager.h"
|
| #include "extensions/common/constants.h"
|
|
|
| @@ -69,9 +69,9 @@ WebContentsTarget::WebContentsTarget(WebContents* web_contents, bool is_tab)
|
| set_favicon_url(entry->GetFavicon().url);
|
| set_last_activity_time(web_contents->GetLastActiveTime());
|
|
|
| - extensions::GuestViewBase* guest =
|
| - extensions::GuestViewBase::FromWebContents(web_contents);
|
| - WebContents* guest_contents = guest ? guest->embedder_web_contents() : NULL;
|
| + guestview::GuestViewBase* guest =
|
| + guestview::GuestViewBase::FromWebContents(web_contents);
|
| + WebContents* guest_contents = guest ? guest->owner_web_contents() : NULL;
|
| if (guest_contents) {
|
| set_type(kTargetTypeWebView);
|
| set_parent_id(DevToolsAgentHost::GetOrCreateFor(guest_contents)->GetId());
|
|
|