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

Side by Side Diff: content/browser/renderer_host/frame_tree_node.cc

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Initial upload Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/frame_tree_node.h" 5 #include "content/browser/renderer_host/frame_tree_node.h"
6 6
7 #include <queue> 7 #include <queue>
8 8
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "content/browser/renderer_host/render_frame_host_impl.h" 10 #include "content/browser/renderer_host/render_frame_host_impl.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 const int64 FrameTreeNode::kInvalidFrameId = -1; 14 const int64 FrameTreeNode::kInvalidFrameId = -1;
15 15
16 FrameTreeNode::FrameTreeNode(int64 frame_id, const std::string& name, 16 FrameTreeNode::FrameTreeNode(Navigator* navigator,
17 int64 frame_id,
18 const std::string& name,
17 scoped_ptr<RenderFrameHostImpl> render_frame_host) 19 scoped_ptr<RenderFrameHostImpl> render_frame_host)
18 : frame_id_(frame_id), 20 : frame_id_(frame_id),
19 frame_name_(name), 21 frame_name_(name),
20 owns_render_frame_host_(true), 22 navigator_(navigator),
21 render_frame_host_(render_frame_host.release()) { 23 owns_render_frame_host_(true),
22 } 24 render_frame_host_(render_frame_host.release()) {}
23 25
24 FrameTreeNode::~FrameTreeNode() { 26 FrameTreeNode::~FrameTreeNode() {
25 if (owns_render_frame_host_) 27 if (owns_render_frame_host_)
26 delete render_frame_host_; 28 delete render_frame_host_;
27 } 29 }
28 30
29 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) { 31 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) {
30 children_.push_back(child.release()); 32 children_.push_back(child.release());
31 } 33 }
32 34
(...skipping 15 matching lines...) Expand all
48 50
49 owns_render_frame_host_ = false; 51 owns_render_frame_host_ = false;
50 frame_id_ = kInvalidFrameId; 52 frame_id_ = kInvalidFrameId;
51 current_url_ = GURL(); 53 current_url_ = GURL();
52 children_.clear(); 54 children_.clear();
53 55
54 render_frame_host_ = new_render_frame_host; 56 render_frame_host_ = new_render_frame_host;
55 } 57 }
56 58
57 } // namespace content 59 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698