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

Unified Diff: content/browser/frame_host/frame_tree_node.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_node.h ('k') | content/browser/frame_host/frame_tree_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index fd9a3bf024cc1aa580fce7e4511f925ae07c5a32..ce357750443542d1ea3f4f1380313d6196b111e1 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -15,15 +15,20 @@ namespace content {
const int64 FrameTreeNode::kInvalidFrameId = -1;
int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
-FrameTreeNode::FrameTreeNode(
- int64 frame_id,
- const std::string& name,
- Navigator* navigator,
- scoped_ptr<RenderFrameHostImpl> render_frame_host)
- : frame_tree_node_id_(next_frame_tree_node_id_++),
+FrameTreeNode::FrameTreeNode(Navigator* navigator,
+ RenderViewHostDelegate* render_view_delegate,
+ RenderWidgetHostDelegate* render_widget_delegate,
+ RenderViewHostManager::Delegate* manager_delegate,
+ int64 frame_id,
+ const std::string& name,
+ scoped_ptr<RenderFrameHostImpl> render_frame_host)
+ : navigator_(navigator),
+ render_manager_(render_view_delegate,
+ render_widget_delegate,
+ manager_delegate),
+ frame_tree_node_id_(next_frame_tree_node_id_++),
frame_id_(frame_id),
frame_name_(name),
- navigator_(navigator),
owns_render_frame_host_(true),
render_frame_host_(render_frame_host.release()) {
}
« no previous file with comments | « content/browser/frame_host/frame_tree_node.h ('k') | content/browser/frame_host/frame_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698