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

Unified Diff: content/browser/frame_host/frame_tree.cc

Issue 72233002: Move RenderViewHostManager from WebContents to FrameTreeNode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 7 years, 1 month 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/frame_host/frame_tree.h ('k') | content/browser/frame_host/frame_tree_node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_tree.cc
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index 34d117b74948f1422c59a66402bf4a305165f812..9e1dc16c788f45b95351c66347be38730ad05eb4 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -42,9 +42,20 @@ bool FrameTreeNodeForFrameId(int64 frame_id,
} // namespace
-FrameTree::FrameTree(Navigator* navigator)
- : root_(new FrameTreeNode(FrameTreeNode::kInvalidFrameId, std::string(),
- navigator, scoped_ptr<RenderFrameHostImpl>())) {
+FrameTree::FrameTree(Navigator* navigator,
+ RenderViewHostDelegate* render_view_delegate,
+ RenderWidgetHostDelegate* render_widget_delegate,
+ RenderViewHostManager::Delegate* manager_delegate)
+ : render_view_delegate_(render_view_delegate),
+ render_widget_delegate_(render_widget_delegate),
+ manager_delegate_(manager_delegate),
+ root_(new FrameTreeNode(navigator,
+ render_view_delegate,
+ render_widget_delegate,
+ manager_delegate,
+ FrameTreeNode::kInvalidFrameId,
+ std::string(),
+ scoped_ptr<RenderFrameHostImpl>())) {
}
FrameTree::~FrameTree() {
@@ -158,8 +169,9 @@ scoped_ptr<FrameTreeNode> FrameTree::CreateNode(
new RenderFrameHostImpl(root_->render_frame_host()->render_view_host(),
this, render_frame_host_id, false));
- return make_scoped_ptr(new FrameTreeNode(
- frame_id, frame_name, navigator, render_frame_host.Pass()));
+ return make_scoped_ptr(new FrameTreeNode(navigator,
+ render_view_delegate_, render_widget_delegate_, manager_delegate_,
+ frame_id, frame_name, render_frame_host.Pass()));
}
} // namespace content
« no previous file with comments | « content/browser/frame_host/frame_tree.h ('k') | content/browser/frame_host/frame_tree_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698