Move RenderViewHostManager from WebContents to FrameTreeNode.

content/browser/web_contents/web_contents_impl.h

 // Copyright (c) 2012 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_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 740 matching lines @@
   RenderWidgetHostViewPort* GetRenderWidgetHostViewPort() const;
 
   // Misc non-view stuff -------------------------------------------------------
 
   // Helper functions for sending notifications.
   void NotifySwapped(RenderViewHost* old_host, RenderViewHost* new_host);
   void NotifyDisconnected();
 
   void SetEncoding(const std::string& encoding);
 
+  // TODO(creis): This should take in a FrameTreeNode to know which node's
+  // render manager to return.  For now, we just return the root's.
+  RenderViewHostManager* GetRenderManager() const;
+
   RenderViewHostImpl* GetRenderViewHostImpl();
 
   // Removes browser plugin embedder if there is one.
   void RemoveBrowserPluginEmbedder();
 
   // Clear |render_view_host|'s PowerSaveBlockers.
   void ClearPowerSaveBlockers(RenderViewHost* render_view_host);
 
   // Clear all PowerSaveBlockers, leave power_save_blocker_ empty.
   void ClearAllPowerSaveBlockers();
@@ skipping 26 matching lines @@
 
   // These maps hold on to the widgets that we created on behalf of the renderer
   // that haven't shown yet.
   typedef std::map<int, RenderWidgetHostView*> PendingWidgetViews;
   PendingWidgetViews pending_widget_views_;
 
   typedef std::map<WebContentsImpl*, DestructionObserver*> DestructionObservers;
   DestructionObservers destruction_observers_;
 
   // A list of observers notified when page state changes. Weak references.
-  // This MUST be listed above render_manager_ since at destruction time the
+  // This MUST be listed above frame_tree_ since at destruction time the
   // latter might cause RenderViewHost's destructor to call us and we might use
   // the observer list then.
   ObserverList<WebContentsObserver> observers_;
 
   // The tab that opened this tab, if any.  Will be set to null if the opener
   // is closed.
   WebContentsImpl* opener_;
 
 #if defined(OS_WIN) && defined(USE_AURA)
   gfx::NativeViewAccessible accessible_parent_;
 #endif
 
   // Helper classes ------------------------------------------------------------
 
   // Maps the RenderViewHost to its media_player_cookie and PowerSaveBlocker
   // pairs. Key is the RenderViewHost, value is the map which maps player_cookie
   // on to PowerSaveBlocker.
   typedef std::map<RenderViewHost*, std::map<int64, PowerSaveBlocker*> >
       PowerSaveBlockerMap;
   PowerSaveBlockerMap power_save_blockers_;
 
-  // Manages creation and swapping of render views.
-  RenderViewHostManager render_manager_;
-
-  // The frame tree structure of the current page.
+  // Manages the frame tree of the page and process swaps in each node.
   FrameTree frame_tree_;
 
 #if defined(OS_ANDROID)
   // Manages injecting Java objects into all RenderViewHosts associated with
   // this WebContentsImpl.
   scoped_ptr<JavaBridgeDispatcherHostManager>
       java_bridge_dispatcher_host_manager_;
 #endif
 
   // SavePackage, lazily created.
@@ skipping 135 matching lines @@
   // Maps the ids of pending image downloads to their callbacks
   typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
   ImageDownloadMap image_download_map_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_