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

Unified Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 10378089: Browser Plugin: Removed BrowserPluginWebContentsObserver (to be replaced by rewritten BrowserPlugi… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Yet another unit test fixed Created 8 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
Index: content/browser/renderer_host/render_view_host_impl.h
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 63573baefd7a13f9fee86757babe9d5420f0720e..eb3683be99dd30bb369f4777dcb6d1a333b291d2 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -231,13 +231,17 @@ class CONTENT_EXPORT RenderViewHostImpl
// Set up the RenderView child process. Virtual because it is overridden by
// TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used
- // as the name of the new top-level frame. The |opener_route_id| parameter
- // indicates which RenderView created this (MSG_ROUTING_NONE if none). If
- // |max_page_id| is larger than -1, the RenderView is told to start issuing
- // page IDs at |max_page_id| + 1.
+ // as the name of the new top-level frame.
+ // The |opener_route_id| parameter indicates which RenderView created this
+ // (MSG_ROUTING_NONE if none). If |max_page_id| is larger than -1, the
+ // RenderView is told to start issuing page IDs at |max_page_id| + 1.
+ // If this RenderView is a guest, the embedder's process ID is also passed in
+ // so that the RenderView's process can establish a channel with its embedder
+ // if it's not already established.
virtual bool CreateRenderView(const string16& frame_name,
int opener_route_id,
- int32 max_page_id);
+ int32 max_page_id,
+ int embedder_process_id);
base::TerminationStatus render_view_termination_status() const {
return render_view_termination_status_;
@@ -351,8 +355,6 @@ class CONTENT_EXPORT RenderViewHostImpl
sudden_termination_allowed_ = enabled;
}
- void set_guest(bool guest) { guest_ = guest; }
-
// RenderWidgetHost public overrides.
virtual void Shutdown() OVERRIDE;
virtual bool IsRenderView() const OVERRIDE;
@@ -567,9 +569,6 @@ class CONTENT_EXPORT RenderViewHostImpl
// See BindingsPolicy for details.
int enabled_bindings_;
- // Indicates whether or not this RenderViewHost refers to a guest RenderView.
- bool guest_;
-
// The request_id for the pending cross-site request. Set to -1 if
// there is a pending request, but we have not yet started the unload
// for the current page. Set to the request_id value of the pending

Powered by Google App Engine
This is Rietveld 408576698