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

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

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: Default to 0 Ids in IntersitialPageImpl 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.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index fb2a07840610277ef4363724998e1d23656589e7..aec6a3f18e2a030769d16a5fef137666ab6c3cff 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -141,7 +141,6 @@ RenderViewHostImpl::RenderViewHostImpl(SiteInstance* instance,
instance_(static_cast<SiteInstanceImpl*>(instance)),
waiting_for_drag_context_response_(false),
enabled_bindings_(0),
- guest_(false),
pending_request_id_(-1),
navigations_suspended_(false),
suspended_nav_message_(NULL),
@@ -207,7 +206,9 @@ content::SiteInstance* RenderViewHostImpl::GetSiteInstance() const {
bool RenderViewHostImpl::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) {
DCHECK(!IsRenderViewLive()) << "Creating view twice";
// The process may (if we're sharing a process with another host that already
@@ -256,7 +257,8 @@ bool RenderViewHostImpl::CreateRenderView(const string16& frame_name,
WebKit::WebScreenInfoFactory::screenInfo(
gfx::NativeViewFromId(GetNativeViewId()));
#endif
- params.guest = guest_;
+ params.embedder_process_id = embedder_process_id;
+ params.embedder_routing_id = embedder_routing_id;
params.accessibility_mode =
BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser() ?
AccessibilityModeComplete :

Powered by Google App Engine
This is Rietveld 408576698