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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.h

Issue 2417693002: Allow MimeHandlerViewGuest be embedded inside OOPIFs (Closed)
Patch Set: Added a NOTREACHED Created 4 years, 2 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: content/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index b99654e3bc7698b25d771afc76bdbfbfad5a3335..39f00139f93f264965ea081089eb2921b36b8dd0 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -63,6 +63,7 @@ class Range;
namespace content {
class BrowserPluginGuestManager;
+class RenderFrameHostImpl;
class RenderViewHostImpl;
class RenderWidgetHost;
class RenderWidgetHostView;
@@ -183,6 +184,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
void GuestResizeDueToAutoResize(const gfx::Size& new_size) override;
void SizeContents(const gfx::Size& new_size) override;
void WillDestroy() override;
+ WebContents* RegisterEmbedderID(int process_id, int routing_id) override;
// Exposes the protected web_contents() from WebContentsObserver.
WebContentsImpl* GetWebContents() const;
@@ -279,6 +281,9 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
private:
class EmbedderVisibilityObserver;
+ // The RenderFrameHost embedding/containing the BrowserPlugin.
+ RenderFrameHostImpl* GetEmbedderFrame() const;
+
void InitInternal(const BrowserPluginHostMsg_Attach_Params& params,
WebContentsImpl* owner_web_contents);
@@ -456,6 +461,10 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
// WebContents associated with this BrowserPluginGuest has OOPIF structure.
bool can_use_cross_process_frames_;
+ // Routing and process IDs of the embedder frame.
+ int embedder_process_id_;
+ int embedder_routing_id_;
+
// Weak pointer used to ask GeolocationPermissionContext about geolocation
// permission.
base::WeakPtrFactory<BrowserPluginGuest> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698