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

Unified Diff: extensions/browser/api/guest_view/guest_view_internal_api.cc

Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extensions_guest_view_message_filter
Patch Set: Fixed tests I hope Created 5 years, 8 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: extensions/browser/api/guest_view/guest_view_internal_api.cc
diff --git a/extensions/browser/api/guest_view/guest_view_internal_api.cc b/extensions/browser/api/guest_view/guest_view_internal_api.cc
index bfe4fb56e19e5b2cf4c2225f494c33f82fe8c119..aea9c8ed8fc58d4a2c5090b3c8b57d13f1756a46 100644
--- a/extensions/browser/api/guest_view/guest_view_internal_api.cc
+++ b/extensions/browser/api/guest_view/guest_view_internal_api.cc
@@ -6,12 +6,15 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
+#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"
#include "extensions/browser/guest_view/guest_view_base.h"
#include "extensions/browser/guest_view/guest_view_manager.h"
#include "extensions/common/api/guest_view_internal.h"
#include "extensions/common/guest_view/guest_view_constants.h"
#include "extensions/common/permissions/permissions_data.h"
+using guestview::GuestViewManagerDelegate;
+
namespace guest_view_internal = extensions::core_api::guest_view_internal;
namespace extensions {
@@ -31,6 +34,12 @@ bool GuestViewInternalCreateGuestFunction::RunAsync() {
// if we don't already have one.
GuestViewManager* guest_view_manager =
GuestViewManager::FromBrowserContext(browser_context());
+ if (!guest_view_manager) {
+ guest_view_manager = GuestViewManager::CreateWithDelegate(
+ browser_context(),
+ scoped_ptr<GuestViewManagerDelegate>(
+ new ExtensionsGuestViewManagerDelegate(context_)));
+ }
GuestViewManager::WebContentsCreatedCallback callback =
base::Bind(&GuestViewInternalCreateGuestFunction::CreateGuestCallback,

Powered by Google App Engine
This is Rietveld 408576698