| 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 :
|
|
|