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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 258373002: Towards moving guest management to chrome: Introduce GuestViewManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android build Created 6 years, 7 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
« no previous file with comments | « android_webview/browser/aw_browser_context.cc ('k') | chrome/browser/guest_view/ad_view/ad_view_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index b1df7341b60202494ebc3c5e9034755d94485327..34d18ba27b7ffc9b845869e88e55ef266739eeff 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -44,6 +44,7 @@
#include "chrome/browser/guest_view/ad_view/ad_view_guest.h"
#include "chrome/browser/guest_view/guest_view_base.h"
#include "chrome/browser/guest_view/guest_view_constants.h"
+#include "chrome/browser/guest_view/guest_view_manager.h"
#include "chrome/browser/guest_view/web_view/web_view_guest.h"
#include "chrome/browser/media/cast_transport_host_filter.h"
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
@@ -848,7 +849,10 @@ void ChromeContentBrowserClient::GuestWebContentsCreated(
// Create a new GuestViewBase of the same type as the opener.
*guest_delegate = GuestViewBase::Create(
- guest_web_contents, extension_id, guest->GetViewType());
+ guest_web_contents,
+ extension_id,
+ guest->GetViewType(),
+ guest->AsWeakPtr());
return;
}
@@ -863,7 +867,10 @@ void ChromeContentBrowserClient::GuestWebContentsCreated(
return;
*guest_delegate =
- GuestViewBase::Create(guest_web_contents, extension_id, api_type);
+ GuestViewBase::Create(guest_web_contents,
+ extension_id,
+ api_type,
+ base::WeakPtr<GuestViewBase>());
}
void ChromeContentBrowserClient::GuestWebContentsAttached(
« no previous file with comments | « android_webview/browser/aw_browser_context.cc ('k') | chrome/browser/guest_view/ad_view/ad_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698