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

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

Issue 9609008: Implemented Browser Plugin (NOT FOR REVIEW) (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge with ToT. GuestToEmbedderChannel is now Dispatcher. 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
« no previous file with comments | « content/browser/browser_plugin/example.html ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9f1972d56b86c96f8e152fdd04cc3e839f1de79c..da04634fc8b79f1fb190a00571b8ac4ae3772e7c 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -20,6 +20,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/common/window_container_type.h"
#include "net/base/load_states.h"
+#include "ppapi/c/pp_instance.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
@@ -230,13 +231,20 @@ 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
+ // as the name of the new top-level frame. 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 and routing ID
+ // is also passed in so that the RenderView's process can establish a channel
+ // with its embedder if it's not already established.
+ // 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.
virtual bool CreateRenderView(const string16& frame_name,
int opener_route_id,
- int32 max_page_id);
+ int32 max_page_id,
+ int embedder_process_id,
+ int embedder_routing_id);
base::TerminationStatus render_view_termination_status() const {
return render_view_termination_status_;
@@ -350,8 +358,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;
@@ -560,9 +566,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
« no previous file with comments | « content/browser/browser_plugin/example.html ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698