Move RenderViewHostManager from WebContents to FrameTreeNode.

content/browser/frame_host/frame_tree.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_
 #define CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 class FrameTreeNode;
 class Navigator;
 class RenderProcessHost;
+class RenderViewHostDelegate;
 class RenderViewHostImpl;
+class RenderViewHostManager;
+class RenderWidgetHostDelegate;
 
 // Represents the frame tree for a page. With the exception of the main frame,
 // all FrameTreeNodes will be created/deleted in response to frame attach and
 // detach events in the DOM.
 //
 // The main frame's FrameTreeNode is special in that it is reused. This allows
 // it to serve as an anchor for state that needs to persist across top-level
 // page navigations.
 //
 // TODO(ajwong): Move NavigationController ownership to the main frame
 // FrameTreeNode. Possibly expose access to it from here.
 //
 // TODO(ajwong): Currently this class only contains FrameTreeNodes for
 // subframes if the --site-per-process flag is enabled.
 //
 // This object is only used on the UI thread.
 class CONTENT_EXPORT FrameTree {
  public:
   // Each FrameTreeNode will default to using the given |navigator| for
   // navigation tasks in the frame.
-  FrameTree(Navigator* navigator);
+  // A set of delegates are remembered here so that we can create
+  // RenderViewHostManagers.  TODO(creis): This set of delegates will change as

[nasko, 2013/11/14 08:23:38]

nit: TODO on a new line?

[Charlie Reis, 2013/11/14 19:01:16]

Done.

+  // we move things to Navigator.
+  FrameTree(Navigator* navigator,
+            RenderViewHostDelegate* render_view_delegate,
+            RenderWidgetHostDelegate* render_widget_delegate,
+            RenderViewHostManager::Delegate* manager_delegate);
   ~FrameTree();
 
   // Returns the FrameTreeNode with the given |frame_tree_node_id|.
   FrameTreeNode* FindByID(int64 frame_tree_node_id);
 
   // Executes |on_node| on each node in the frame tree.  If |on_node| returns
   // false, terminates the iteration immediately. Returning false is useful
   // if |on_node| is just doing a search over the tree.
   void ForEach(const base::Callback<bool(FrameTreeNode*)>& on_node) const;
 
@@ skipping 33 matching lines @@
   // Convenience accessor for the main frame's RenderFrameHostImpl.
   RenderFrameHostImpl* GetMainFrame() const;
 
   // Allows a client to listen for frame removal.  The listener should expect
   // to receive the RenderViewHostImpl containing the frame and the renderer-
   // specific frame ID of the removed frame.
   // TODO(creis): These parameters will later change to be the RenderFrameHost.
   void SetFrameRemoveListener(
       const base::Callback<void(RenderViewHostImpl*, int64)>& on_frame_removed);
 
-  FrameTreeNode* GetRootForTesting() { return root_.get(); }
+  FrameTreeNode* root() const { return root_.get(); }
 
  private:
   // Returns the FrameTreeNode with the given renderer-specific |frame_id|.
   // For internal use only.
   // TODO(creis): Replace this with a version that takes in a routing ID.
   FrameTreeNode* FindByFrameID(int64 frame_id);
 
   scoped_ptr<FrameTreeNode> CreateNode(int64 frame_id,
                                        const std::string& frame_name,
                                        int render_frame_host_id,
                                        Navigator* navigator,
                                        RenderProcessHost* render_process_host);
 
+  // These delegates are installed into all the RenderViewHosts and
+  // RenderFrameHosts that we create.
+  RenderViewHostDelegate* render_view_delegate_;
+  RenderWidgetHostDelegate* render_widget_delegate_;
+  RenderViewHostManager::Delegate* manager_delegate_;
+
   scoped_ptr<FrameTreeNode> root_;
 
   base::Callback<void(RenderViewHostImpl*, int64)> on_frame_removed_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameTree);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_TREE_H_