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_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/containers/hash_tables.h" | 8 #include "base/containers/hash_tables.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/metrics/user_metrics_action.h" | 10 #include "base/metrics/user_metrics_action.h" |
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
494 params.should_replace_current_entry, params.user_gesture); | 494 params.should_replace_current_entry, params.user_gesture); |
495 } | 495 } |
496 | 496 |
497 void RenderFrameHostImpl::OnDocumentOnLoadCompleted() { | 497 void RenderFrameHostImpl::OnDocumentOnLoadCompleted() { |
498 // This message is only sent for top-level frames. TODO(avi): when frame tree | 498 // This message is only sent for top-level frames. TODO(avi): when frame tree |
499 // mirroring works correctly, add a check here to enforce it. | 499 // mirroring works correctly, add a check here to enforce it. |
500 delegate_->DocumentOnLoadCompleted(this); | 500 delegate_->DocumentOnLoadCompleted(this); |
501 } | 501 } |
502 | 502 |
503 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( | 503 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( |
504 const GURL& url) { | 504 const GURL& url, |
505 frame_tree_node_->navigator()->DidStartProvisionalLoad(this, url); | 505 bool is_transition_navigation) { |
| 506 frame_tree_node_->navigator()->DidStartProvisionalLoad( |
| 507 this, url, is_transition_navigation); |
506 } | 508 } |
507 | 509 |
508 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( | 510 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( |
509 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { | 511 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { |
510 frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); | 512 frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); |
511 } | 513 } |
512 | 514 |
513 void RenderFrameHostImpl::OnDidFailLoadWithError( | 515 void RenderFrameHostImpl::OnDidFailLoadWithError( |
514 const GURL& url, | 516 const GURL& url, |
515 int error_code, | 517 int error_code, |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1163 FROM_HERE, | 1165 FROM_HERE, |
1164 base::Bind( | 1166 base::Bind( |
1165 &TransitionRequestManager::SetHasPendingTransitionRequest, | 1167 &TransitionRequestManager::SetHasPendingTransitionRequest, |
1166 base::Unretained(TransitionRequestManager::GetInstance()), | 1168 base::Unretained(TransitionRequestManager::GetInstance()), |
1167 GetProcess()->GetID(), | 1169 GetProcess()->GetID(), |
1168 routing_id_, | 1170 routing_id_, |
1169 has_pending_request)); | 1171 has_pending_request)); |
1170 } | 1172 } |
1171 | 1173 |
1172 } // namespace content | 1174 } // namespace content |
OLD | NEW |