Index: chrome/browser/task_manager/guest_information.cc |
diff --git a/chrome/browser/task_manager/guest_information.cc b/chrome/browser/task_manager/guest_information.cc |
index fdfa035a4dd7f73446e4578b30899b5436b39763..dab29aac02c93c91c7b5eb389704727e276bd5b3 100644 |
--- a/chrome/browser/task_manager/guest_information.cc |
+++ b/chrome/browser/task_manager/guest_information.cc |
@@ -13,6 +13,7 @@ |
#include "chrome/browser/task_manager/task_manager_util.h" |
#include "chrome/grit/generated_resources.h" |
#include "components/favicon/content/content_favicon_driver.h" |
+#include "components/guest_view/browser/guest_view_base.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/render_frame_host.h" |
#include "content/public/browser/render_process_host.h" |
@@ -20,7 +21,6 @@ |
#include "content/public/browser/render_widget_host_iterator.h" |
#include "content/public/browser/site_instance.h" |
#include "content/public/browser/web_contents.h" |
-#include "extensions/browser/guest_view/guest_view_base.h" |
#include "extensions/strings/grit/extensions_strings.h" |
#include "ui/base/l10n/l10n_util.h" |
#include "ui/gfx/image/image.h" |
@@ -31,6 +31,7 @@ using content::RenderViewHost; |
using content::RenderWidgetHost; |
using content::WebContents; |
using extensions::Extension; |
+using guestview::GuestViewBase; |
namespace task_manager { |
@@ -68,8 +69,7 @@ base::string16 GuestResource::GetTitle() const { |
const int message_id = IDS_EXTENSION_TASK_MANAGER_WEBVIEW_TAG_PREFIX; |
return l10n_util::GetStringFUTF16(message_id, base::string16()); |
} |
- extensions::GuestViewBase* guest = |
- extensions::GuestViewBase::FromWebContents(web_contents); |
+ GuestViewBase* guest = GuestViewBase::FromWebContents(web_contents); |
return l10n_util::GetStringFUTF16( |
guest->GetTaskPrefix(), |
util::GetTitleFromWebContents(web_contents)); |
@@ -100,7 +100,7 @@ GuestInformation::~GuestInformation() {} |
bool GuestInformation::CheckOwnership(WebContents* web_contents) { |
// Guest WebContentses are created and owned internally by the content layer. |
- return extensions::GuestViewBase::IsGuest(web_contents); |
+ return GuestViewBase::IsGuest(web_contents); |
} |
void GuestInformation::GetAll(const NewWebContentsCallback& callback) { |
@@ -110,7 +110,7 @@ void GuestInformation::GetAll(const NewWebContentsCallback& callback) { |
if (widget->IsRenderView()) { |
content::RenderViewHost* rvh = content::RenderViewHost::From(widget); |
WebContents* web_contents = WebContents::FromRenderViewHost(rvh); |
- if (web_contents && extensions::GuestViewBase::IsGuest(web_contents)) |
+ if (web_contents && GuestViewBase::IsGuest(web_contents)) |
callback.Run(web_contents); |
} |
} |