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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 103633002: Add RenderFrameHostDelegate and plumb it through all the necessary classes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 RenderWidgetHost* widget = 152 RenderWidgetHost* widget =
153 RenderWidgetHost::FromID(render_process_id, render_view_id); 153 RenderWidgetHost::FromID(render_process_id, render_view_id);
154 if (!widget || !widget->IsRenderView()) 154 if (!widget || !widget->IsRenderView())
155 return NULL; 155 return NULL;
156 return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget)); 156 return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget));
157 } 157 }
158 158
159 RenderViewHostImpl::RenderViewHostImpl( 159 RenderViewHostImpl::RenderViewHostImpl(
160 SiteInstance* instance, 160 SiteInstance* instance,
161 RenderViewHostDelegate* delegate, 161 RenderViewHostDelegate* delegate,
162 RenderFrameHostDelegate* frame_delegate,
162 RenderWidgetHostDelegate* widget_delegate, 163 RenderWidgetHostDelegate* widget_delegate,
163 int routing_id, 164 int routing_id,
164 int main_frame_routing_id, 165 int main_frame_routing_id,
165 bool swapped_out, 166 bool swapped_out,
166 bool hidden) 167 bool hidden)
167 : RenderWidgetHostImpl(widget_delegate, 168 : RenderWidgetHostImpl(widget_delegate,
168 instance->GetProcess(), 169 instance->GetProcess(),
169 routing_id, 170 routing_id,
170 hidden), 171 hidden),
171 delegate_(delegate), 172 delegate_(delegate),
(...skipping 14 matching lines...) Expand all
186 are_javascript_messages_suppressed_(false), 187 are_javascript_messages_suppressed_(false),
187 sudden_termination_allowed_(false), 188 sudden_termination_allowed_(false),
188 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { 189 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) {
189 DCHECK(instance_.get()); 190 DCHECK(instance_.get());
190 CHECK(delegate_); // http://crbug.com/82827 191 CHECK(delegate_); // http://crbug.com/82827
191 192
192 if (main_frame_routing_id == MSG_ROUTING_NONE) 193 if (main_frame_routing_id == MSG_ROUTING_NONE)
193 main_frame_routing_id = GetProcess()->GetNextRoutingID(); 194 main_frame_routing_id = GetProcess()->GetNextRoutingID();
194 195
195 main_render_frame_host_ = RenderFrameHostFactory::Create( 196 main_render_frame_host_ = RenderFrameHostFactory::Create(
196 this, delegate_->GetFrameTree(), main_frame_routing_id, is_swapped_out_); 197 this, frame_delegate, delegate_->GetFrameTree(), main_frame_routing_id,
198 is_swapped_out_);
197 199
198 GetProcess()->EnableSendQueue(); 200 GetProcess()->EnableSendQueue();
199 201
200 if (!swapped_out) 202 if (!swapped_out)
201 instance_->increment_active_view_count(); 203 instance_->increment_active_view_count();
202 204
203 if (ResourceDispatcherHostImpl::Get()) { 205 if (ResourceDispatcherHostImpl::Get()) {
204 BrowserThread::PostTask( 206 BrowserThread::PostTask(
205 BrowserThread::IO, FROM_HERE, 207 BrowserThread::IO, FROM_HERE,
206 base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated, 208 base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated,
(...skipping 2086 matching lines...) Expand 10 before | Expand all | Expand 10 after
2293 void RenderViewHostImpl::AttachToFrameTree() { 2295 void RenderViewHostImpl::AttachToFrameTree() {
2294 FrameTree* frame_tree = delegate_->GetFrameTree(); 2296 FrameTree* frame_tree = delegate_->GetFrameTree();
2295 2297
2296 frame_tree->SwapMainFrame(main_render_frame_host_.get()); 2298 frame_tree->SwapMainFrame(main_render_frame_host_.get());
2297 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { 2299 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) {
2298 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); 2300 frame_tree->OnFirstNavigationAfterSwap(main_frame_id());
2299 } 2301 }
2300 } 2302 }
2301 2303
2302 } // namespace content 2304 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/renderer_host/test_render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698