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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 72233002: Move RenderViewHostManager from WebContents to FrameTreeNode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. 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/interstitial_page_impl.h" 5 #include "content/browser/frame_host/interstitial_page_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 new_navigation_(new_navigation), 152 new_navigation_(new_navigation),
153 should_discard_pending_nav_entry_(new_navigation), 153 should_discard_pending_nav_entry_(new_navigation),
154 reload_on_dont_proceed_(false), 154 reload_on_dont_proceed_(false),
155 enabled_(true), 155 enabled_(true),
156 action_taken_(NO_ACTION), 156 action_taken_(NO_ACTION),
157 render_view_host_(NULL), 157 render_view_host_(NULL),
158 // TODO(nasko): The InterstitialPageImpl will need to provide its own 158 // TODO(nasko): The InterstitialPageImpl will need to provide its own
159 // NavigationControllerImpl to the Navigator, which is separate from 159 // NavigationControllerImpl to the Navigator, which is separate from
160 // the WebContents one, so we can enforce no navigation policy here. 160 // the WebContents one, so we can enforce no navigation policy here.
161 // While we get the code to a point to do this, pass NULL for it. 161 // While we get the code to a point to do this, pass NULL for it.
162 frame_tree_(new Navigator(NULL, this)), 162 // TODO(creis): We will also need to pass delegates for the RVHM as we
163 // start to use it.
164 frame_tree_(new Navigator(NULL, this), NULL, NULL, NULL),
163 original_child_id_(web_contents->GetRenderProcessHost()->GetID()), 165 original_child_id_(web_contents->GetRenderProcessHost()->GetID()),
164 original_rvh_id_(web_contents->GetRenderViewHost()->GetRoutingID()), 166 original_rvh_id_(web_contents->GetRenderViewHost()->GetRoutingID()),
165 should_revert_web_contents_title_(false), 167 should_revert_web_contents_title_(false),
166 web_contents_was_loading_(false), 168 web_contents_was_loading_(false),
167 resource_dispatcher_host_notified_(false), 169 resource_dispatcher_host_notified_(false),
168 rvh_delegate_view_(new InterstitialPageRVHDelegateView(this)), 170 rvh_delegate_view_(new InterstitialPageRVHDelegateView(this)),
169 create_view_(true), 171 create_view_(true),
170 delegate_(delegate), 172 delegate_(delegate),
171 weak_ptr_factory_(this) { 173 weak_ptr_factory_(this) {
172 InitInterstitialPageMap(); 174 InitInterstitialPageMap();
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 842
841 web_contents->GetDelegateView()->TakeFocus(reverse); 843 web_contents->GetDelegateView()->TakeFocus(reverse);
842 } 844 }
843 845
844 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 846 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
845 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 847 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
846 int active_match_ordinal, bool final_update) { 848 int active_match_ordinal, bool final_update) {
847 } 849 }
848 850
849 } // namespace content 851 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_unittest.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698