OLD | NEW |
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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 sudden_termination_allowed_(false), | 184 sudden_termination_allowed_(false), |
185 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { | 185 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { |
186 DCHECK(instance_.get()); | 186 DCHECK(instance_.get()); |
187 CHECK(delegate_); // http://crbug.com/82827 | 187 CHECK(delegate_); // http://crbug.com/82827 |
188 | 188 |
189 if (main_frame_routing_id == MSG_ROUTING_NONE) | 189 if (main_frame_routing_id == MSG_ROUTING_NONE) |
190 main_frame_routing_id = GetProcess()->GetNextRoutingID(); | 190 main_frame_routing_id = GetProcess()->GetNextRoutingID(); |
191 | 191 |
192 main_render_frame_host_.reset( | 192 main_render_frame_host_.reset( |
193 new RenderFrameHostImpl(this, delegate_->GetFrameTree(), | 193 new RenderFrameHostImpl(this, delegate_->GetFrameTree(), |
| 194 delegate_->GetFrameTree()->navigator(), |
194 main_frame_routing_id, is_swapped_out_)); | 195 main_frame_routing_id, is_swapped_out_)); |
195 | 196 |
196 GetProcess()->EnableSendQueue(); | 197 GetProcess()->EnableSendQueue(); |
197 | 198 |
198 if (!swapped_out) | 199 if (!swapped_out) |
199 instance_->increment_active_view_count(); | 200 instance_->increment_active_view_count(); |
200 | 201 |
201 if (ResourceDispatcherHostImpl::Get()) { | 202 if (ResourceDispatcherHostImpl::Get()) { |
202 BrowserThread::PostTask( | 203 BrowserThread::PostTask( |
203 BrowserThread::IO, FROM_HERE, | 204 BrowserThread::IO, FROM_HERE, |
(...skipping 2045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2249 void RenderViewHostImpl::AttachToFrameTree() { | 2250 void RenderViewHostImpl::AttachToFrameTree() { |
2250 FrameTree* frame_tree = delegate_->GetFrameTree(); | 2251 FrameTree* frame_tree = delegate_->GetFrameTree(); |
2251 | 2252 |
2252 frame_tree->SwapMainFrame(main_render_frame_host_.get()); | 2253 frame_tree->SwapMainFrame(main_render_frame_host_.get()); |
2253 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { | 2254 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { |
2254 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); | 2255 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); |
2255 } | 2256 } |
2256 } | 2257 } |
2257 | 2258 |
2258 } // namespace content | 2259 } // namespace content |
OLD | NEW |