summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host/frame_tree_node.cc
diff options
context:
space:
mode:
authornasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 01:35:44 +0000
committernasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 01:35:44 +0000
commit190b8c5d848077c5a3402eb04f835e5fb1a44ecc (patch)
treea5dc598bbaedcb793530ef28f35f35bbea7a9c97 /content/browser/frame_host/frame_tree_node.cc
parent9d64cb3cb87eee2483eab03fe45a01fe04139f38 (diff)
downloadchromium_src-190b8c5d848077c5a3402eb04f835e5fb1a44ecc.zip
chromium_src-190b8c5d848077c5a3402eb04f835e5fb1a44ecc.tar.gz
chromium_src-190b8c5d848077c5a3402eb04f835e5fb1a44ecc.tar.bz2
Add Navigator and NavigatorDelegate objects.
BUG=304341 Review URL: https://codereview.chromium.org/65363002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/frame_host/frame_tree_node.cc')
-rw-r--r--content/browser/frame_host/frame_tree_node.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index fc45dc1..fd9a3bf 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -7,6 +7,7 @@
#include <queue>
#include "base/stl_util.h"
+#include "content/browser/frame_host/navigator.h"
#include "content/browser/frame_host/render_frame_host_impl.h"
namespace content {
@@ -14,12 +15,15 @@ namespace content {
const int64 FrameTreeNode::kInvalidFrameId = -1;
int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
-FrameTreeNode::FrameTreeNode(int64 frame_id,
- const std::string& name,
- scoped_ptr<RenderFrameHostImpl> render_frame_host)
+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_++),
frame_id_(frame_id),
frame_name_(name),
+ navigator_(navigator),
owns_render_frame_host_(true),
render_frame_host_(render_frame_host.release()) {
}