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

Side by Side Diff: content/browser/frame_host/frame_tree_node.h

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 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 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 15 matching lines...) Expand all
26 // are frame-specific (as opposed to page-specific). 26 // are frame-specific (as opposed to page-specific).
27 class CONTENT_EXPORT FrameTreeNode { 27 class CONTENT_EXPORT FrameTreeNode {
28 public: 28 public:
29 static const int64 kInvalidFrameId; 29 static const int64 kInvalidFrameId;
30 30
31 FrameTreeNode(Navigator* navigator, 31 FrameTreeNode(Navigator* navigator,
32 RenderViewHostDelegate* render_view_delegate, 32 RenderViewHostDelegate* render_view_delegate,
33 RenderWidgetHostDelegate* render_widget_delegate, 33 RenderWidgetHostDelegate* render_widget_delegate,
34 RenderViewHostManager::Delegate* manager_delegate, 34 RenderViewHostManager::Delegate* manager_delegate,
35 int64 frame_id, 35 int64 frame_id,
36 const std::string& name, 36 const std::string& name);
37 scoped_ptr<RenderFrameHostImpl> render_frame_host);
38 37
39 ~FrameTreeNode(); 38 ~FrameTreeNode();
40 39
41 void AddChild(scoped_ptr<FrameTreeNode> child); 40 void AddChild(scoped_ptr<FrameTreeNode> child);
42 void RemoveChild(FrameTreeNode* child); 41 void RemoveChild(FrameTreeNode* child);
43 42
43 // TODO(nasko): This method should be removed once there is a
44 // RenderFrameHostManager for each node in the frame tree.
45 void set_render_frame_host(
Charlie Reis 2013/11/21 21:59:32 I'm a bit uncomfortable about decoupling this from
nasko 2013/11/22 01:02:34 Yes, we do. Since RFH is created after FTN, until
46 scoped_ptr<RenderFrameHostImpl> render_frame_host) {
47 render_frame_host_ = render_frame_host.release();
48 }
49
44 // Transitional API allowing the RenderFrameHost of a FrameTreeNode 50 // Transitional API allowing the RenderFrameHost of a FrameTreeNode
45 // representing the main frame to be provided by someone else. After 51 // representing the main frame to be provided by someone else. After
46 // this is called, the FrameTreeNode no longer owns its RenderFrameHost. 52 // this is called, the FrameTreeNode no longer owns its RenderFrameHost.
47 // 53 //
48 // This should only be used for the main frame (aka root) in a frame tree. 54 // This should only be used for the main frame (aka root) in a frame tree.
49 // 55 //
50 // TODO(ajwong): Remove this method once the main frame RenderFrameHostImpl is 56 // TODO(ajwong): Remove this method once the main frame RenderFrameHostImpl is
51 // no longer owned by the RenderViewHostImpl. 57 // no longer owned by the RenderViewHostImpl.
52 void ResetForMainFrame(RenderFrameHostImpl* new_render_frame_host); 58 void ResetForMainFrame(RenderFrameHostImpl* new_render_frame_host);
53 59
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 // TODO(creis): Remove this when we can store subframe URLs in the 157 // TODO(creis): Remove this when we can store subframe URLs in the
152 // NavigationController. 158 // NavigationController.
153 GURL current_url_; 159 GURL current_url_;
154 160
155 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode); 161 DISALLOW_COPY_AND_ASSIGN(FrameTreeNode);
156 }; 162 };
157 163
158 } // namespace content 164 } // namespace content
159 165
160 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_ 166 #endif // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_NODE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698