Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2241)

Unified Diff: chrome/browser/task_manager/extension_information.cc

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made in guest_view_manager_unittest.cc Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_manager/extension_information.cc
diff --git a/chrome/browser/task_manager/extension_information.cc b/chrome/browser/task_manager/extension_information.cc
index b657adf7a8986481c2d4ef4f590d6df40ee9d939..10b01393b478fbac964b00af9f537dcd5fbd2216 100644
--- a/chrome/browser/task_manager/extension_information.cc
+++ b/chrome/browser/task_manager/extension_information.cc
@@ -7,7 +7,6 @@
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/guest_view/guest_view_base.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/task_manager/renderer_resource.h"
@@ -17,6 +16,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/extension_system.h"
+#include "extensions/browser/guest_view/guest_view_base.h"
#include "extensions/browser/process_manager.h"
#include "extensions/browser/view_type_utils.h"
#include "extensions/common/extension.h"
@@ -148,7 +148,7 @@ void ExtensionInformation::GetAll(const NewWebContentsCallback& callback) {
bool ExtensionInformation::CheckOwnership(WebContents* web_contents) {
// Don't add WebContents that belong to a guest (those are handled by
// GuestInformation). Otherwise they will be added twice.
- if (GuestViewBase::IsGuest(web_contents))
+ if (extensions::GuestViewBase::IsGuest(web_contents))
return false;
// Extension WebContents tracked by this class will always host extension

Powered by Google App Engine
This is Rietveld 408576698