Move RenderViewHostManager from WebContents to FrameTreeNode.

content/browser/frame_host/interstitial_page_impl.cc

 // 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.
 
 #include "content/browser/frame_host/interstitial_page_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 141 matching lines @@
       new_navigation_(new_navigation),
       should_discard_pending_nav_entry_(new_navigation),
       reload_on_dont_proceed_(false),
       enabled_(true),
       action_taken_(NO_ACTION),
       render_view_host_(NULL),
       // TODO(nasko): The InterstitialPageImpl will need to provide its own
       // NavigationControllerImpl to the Navigator, which is separate from
       // the WebContents one, so we can enforce no navigation policy here.
       // While we get the code to a point to do this, pass NULL for it.
-      frame_tree_(new Navigator(NULL, this)),
+      // TODO(creis): We will also need to pass delegates for the RVHM as we

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

TODOs pile on ; )

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

They certainly do.  :)

+      // start to use it.
+      frame_tree_(new Navigator(NULL, this), NULL, NULL, NULL),
       original_child_id_(web_contents->GetRenderProcessHost()->GetID()),
       original_rvh_id_(web_contents->GetRenderViewHost()->GetRoutingID()),
       should_revert_web_contents_title_(false),
       web_contents_was_loading_(false),
       resource_dispatcher_host_notified_(false),
       rvh_delegate_view_(new InterstitialPageRVHDelegateView(this)),
       create_view_(true),
       delegate_(delegate),
       weak_ptr_factory_(this) {
   InitInterstitialPageMap();
@@ skipping 667 matching lines @@
 
   web_contents->GetDelegateView()->TakeFocus(reverse);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }
 
 }  // namespace content