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

Unified Diff: content/renderer/render_view_impl.cc

Issue 172063002: Unify frame IDs with RenderFrameHost routing IDs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix type Created 6 years, 10 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/renderer/render_frame_impl.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8feea244cfd8399175ee6deac74ba2c7ca909add..dee26afb40210ac586468ef4cd015db81a292270 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -833,7 +833,8 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
RenderFrameImpl::Create(this, params->main_frame_routing_id));
// The main frame WebFrame object is closed by
// RenderFrameImpl::frameDetached().
- webview()->setMainFrame(WebFrame::create(main_render_frame_.get()));
+ webview()->setMainFrame(WebFrame::create(main_render_frame_.get(),
+ params->main_frame_routing_id));
main_render_frame_->SetWebFrame(webview()->mainFrame());
if (switches::IsTouchDragDropEnabled())
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698