| OLD | NEW |
| 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/render_frame_host_manager.h" | 5 #include "content/browser/frame_host/render_frame_host_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 2299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2310 } else { | 2310 } else { |
| 2311 // If this is a new WebUI it has never interacted with the existing | 2311 // If this is a new WebUI it has never interacted with the existing |
| 2312 // RenderView so call RenderViewCreated. | 2312 // RenderView so call RenderViewCreated. |
| 2313 render_frame_host_->pending_web_ui()->RenderViewCreated( | 2313 render_frame_host_->pending_web_ui()->RenderViewCreated( |
| 2314 render_frame_host_->render_view_host()); | 2314 render_frame_host_->render_view_host()); |
| 2315 } | 2315 } |
| 2316 } | 2316 } |
| 2317 } | 2317 } |
| 2318 | 2318 |
| 2319 void RenderFrameHostManager::CancelPending() { | 2319 void RenderFrameHostManager::CancelPending() { |
| 2320 CHECK(pending_render_frame_host_); |
| 2320 TRACE_EVENT1("navigation", "RenderFrameHostManager::CancelPending", | 2321 TRACE_EVENT1("navigation", "RenderFrameHostManager::CancelPending", |
| 2321 "FrameTreeNode id", frame_tree_node_->frame_tree_node_id()); | 2322 "FrameTreeNode id", frame_tree_node_->frame_tree_node_id()); |
| 2322 render_frame_host_->ClearPendingWebUI(); | 2323 render_frame_host_->ClearPendingWebUI(); |
| 2323 | 2324 |
| 2324 bool pending_was_loading = pending_render_frame_host_->is_loading(); | 2325 bool pending_was_loading = pending_render_frame_host_->is_loading(); |
| 2325 DiscardUnusedFrame(UnsetPendingRenderFrameHost()); | 2326 DiscardUnusedFrame(UnsetPendingRenderFrameHost()); |
| 2326 if (pending_was_loading) | 2327 if (pending_was_loading) |
| 2327 frame_tree_node_->DidStopLoading(); | 2328 frame_tree_node_->DidStopLoading(); |
| 2328 } | 2329 } |
| 2329 | 2330 |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2604 resolved_url)) { | 2605 resolved_url)) { |
| 2605 DCHECK(!dest_instance || | 2606 DCHECK(!dest_instance || |
| 2606 dest_instance == render_frame_host_->GetSiteInstance()); | 2607 dest_instance == render_frame_host_->GetSiteInstance()); |
| 2607 return false; | 2608 return false; |
| 2608 } | 2609 } |
| 2609 | 2610 |
| 2610 return true; | 2611 return true; |
| 2611 } | 2612 } |
| 2612 | 2613 |
| 2613 } // namespace content | 2614 } // namespace content |
| OLD | NEW |