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

Side by Side Diff: content/browser/frame_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: Some cleanup. 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 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/frame_host/frame_tree_node.h" 5 #include "content/browser/frame_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/frame_host/navigator.h" 10 #include "content/browser/frame_host/navigator.h"
11 #include "content/browser/frame_host/render_frame_host_impl.h" 11 #include "content/browser/frame_host/render_frame_host_impl.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 const int64 FrameTreeNode::kInvalidFrameId = -1; 15 const int64 FrameTreeNode::kInvalidFrameId = -1;
16 int64 FrameTreeNode::next_frame_tree_node_id_ = 1; 16 int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
17 17
18 FrameTreeNode::FrameTreeNode(Navigator* navigator, 18 FrameTreeNode::FrameTreeNode(Navigator* navigator,
19 RenderViewHostDelegate* render_view_delegate, 19 RenderViewHostDelegate* render_view_delegate,
20 RenderWidgetHostDelegate* render_widget_delegate, 20 RenderWidgetHostDelegate* render_widget_delegate,
21 RenderViewHostManager::Delegate* manager_delegate, 21 RenderViewHostManager::Delegate* manager_delegate,
22 int64 frame_id, 22 int64 frame_id,
23 const std::string& name, 23 const std::string& name)
24 scoped_ptr<RenderFrameHostImpl> render_frame_host)
25 : navigator_(navigator), 24 : navigator_(navigator),
26 render_manager_(render_view_delegate, 25 render_manager_(render_view_delegate,
27 render_widget_delegate, 26 render_widget_delegate,
28 manager_delegate), 27 manager_delegate),
29 frame_tree_node_id_(next_frame_tree_node_id_++), 28 frame_tree_node_id_(next_frame_tree_node_id_++),
30 frame_id_(frame_id), 29 frame_id_(frame_id),
31 frame_name_(name), 30 frame_name_(name),
32 owns_render_frame_host_(true), 31 owns_render_frame_host_(true) {
33 render_frame_host_(render_frame_host.release()) {
34 } 32 }
35 33
36 FrameTreeNode::~FrameTreeNode() { 34 FrameTreeNode::~FrameTreeNode() {
37 if (owns_render_frame_host_) 35 if (owns_render_frame_host_)
38 delete render_frame_host_; 36 delete render_frame_host_;
39 } 37 }
40 38
41 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) { 39 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) {
42 children_.push_back(child.release()); 40 children_.push_back(child.release());
43 } 41 }
(...skipping 16 matching lines...) Expand all
60 58
61 owns_render_frame_host_ = false; 59 owns_render_frame_host_ = false;
62 frame_id_ = kInvalidFrameId; 60 frame_id_ = kInvalidFrameId;
63 current_url_ = GURL(); 61 current_url_ = GURL();
64 children_.clear(); 62 children_.clear();
65 63
66 render_frame_host_ = new_render_frame_host; 64 render_frame_host_ = new_render_frame_host;
67 } 65 }
68 66
69 } // namespace content 67 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698