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

Unified Diff: content/browser/web_contents/render_view_host_manager.cc

Issue 16032007: Create RenderFrame/RenderFrameHost for the main frame of a page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing routing ID expectations. Created 7 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/web_contents/render_view_host_manager.cc
diff --git a/content/browser/web_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc
index 4cbd0fc4f7d6cbe424b7bbe592b79eb1652f073d..73cd00a323140273eba28d9ab0e140176827a264 100644
--- a/content/browser/web_contents/render_view_host_manager.cc
+++ b/content/browser/web_contents/render_view_host_manager.cc
@@ -64,7 +64,8 @@ RenderViewHostManager::~RenderViewHostManager() {
void RenderViewHostManager::Init(BrowserContext* browser_context,
SiteInstance* site_instance,
- int routing_id) {
+ int routing_id,
+ int main_frame_routing_id) {
// Create a RenderViewHost, once we have an instance. It is important to
// immediately give this SiteInstance to a RenderViewHost so that it is
// ref counted.
@@ -73,7 +74,7 @@ void RenderViewHostManager::Init(BrowserContext* browser_context,
render_view_host_ = static_cast<RenderViewHostImpl*>(
RenderViewHostFactory::Create(
site_instance, render_view_delegate_, render_widget_delegate_,
- routing_id, false, delegate_->
+ routing_id, main_frame_routing_id, false, delegate_->
GetControllerForRenderManager().GetSessionStorageNamespace(
site_instance)));
@@ -624,7 +625,7 @@ int RenderViewHostManager::CreateRenderView(
new_render_view_host = static_cast<RenderViewHostImpl*>(
RenderViewHostFactory::Create(instance,
render_view_delegate_, render_widget_delegate_, MSG_ROUTING_NONE,
- swapped_out, delegate_->
+ MSG_ROUTING_NONE, swapped_out, delegate_->
GetControllerForRenderManager().GetSessionStorageNamespace(
instance)));

Powered by Google App Engine
This is Rietveld 408576698