| 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 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 params.should_replace_current_entry, params.user_gesture); | 399 params.should_replace_current_entry, params.user_gesture); |
| 400 } | 400 } |
| 401 | 401 |
| 402 void RenderFrameHostImpl::OnDocumentOnLoadCompleted() { | 402 void RenderFrameHostImpl::OnDocumentOnLoadCompleted() { |
| 403 // This message is only sent for top-level frames. TODO(avi): when frame tree | 403 // This message is only sent for top-level frames. TODO(avi): when frame tree |
| 404 // mirroring works correctly, add a check here to enforce it. | 404 // mirroring works correctly, add a check here to enforce it. |
| 405 delegate_->DocumentOnLoadCompleted(this); | 405 delegate_->DocumentOnLoadCompleted(this); |
| 406 } | 406 } |
| 407 | 407 |
| 408 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( | 408 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( |
| 409 const GURL& url) { | 409 const GURL& url, |
| 410 frame_tree_node_->navigator()->DidStartProvisionalLoad(this, url); | 410 bool is_transition_navigation) { |
| 411 frame_tree_node_->navigator()->DidStartProvisionalLoad( |
| 412 this, url, is_transition_navigation); |
| 411 } | 413 } |
| 412 | 414 |
| 413 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( | 415 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( |
| 414 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { | 416 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { |
| 415 frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); | 417 frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); |
| 416 } | 418 } |
| 417 | 419 |
| 418 void RenderFrameHostImpl::OnDidFailLoadWithError( | 420 void RenderFrameHostImpl::OnDidFailLoadWithError( |
| 419 const GURL& url, | 421 const GURL& url, |
| 420 int error_code, | 422 int error_code, |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 955 FROM_HERE, | 957 FROM_HERE, |
| 956 base::Bind( | 958 base::Bind( |
| 957 &TransitionRequestManager::SetHasPendingTransitionRequest, | 959 &TransitionRequestManager::SetHasPendingTransitionRequest, |
| 958 base::Unretained(TransitionRequestManager::GetInstance()), | 960 base::Unretained(TransitionRequestManager::GetInstance()), |
| 959 GetProcess()->GetID(), | 961 GetProcess()->GetID(), |
| 960 routing_id_, | 962 routing_id_, |
| 961 has_pending_request)); | 963 has_pending_request)); |
| 962 } | 964 } |
| 963 | 965 |
| 964 } // namespace content | 966 } // namespace content |
| OLD | NEW |