Chromium Code Reviews| Index: content/browser/frame_host/navigator_impl.cc |
| diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc |
| index 64d242174b8d8586eb9678d4319e97f86b3d868e..3c609b3ea5e9ad8293ebf92c0b9c9ad39761e630 100644 |
| --- a/content/browser/frame_host/navigator_impl.cc |
| +++ b/content/browser/frame_host/navigator_impl.cc |
| @@ -7,6 +7,7 @@ |
| #include "base/command_line.h" |
| #include "content/browser/frame_host/frame_tree.h" |
| #include "content/browser/frame_host/frame_tree_node.h" |
| +#include "content/browser/frame_host/load_progress_tracker.h" |
| #include "content/browser/frame_host/navigation_controller_impl.h" |
| #include "content/browser/frame_host/navigation_entry_impl.h" |
| #include "content/browser/frame_host/navigator_delegate.h" |
| @@ -134,7 +135,11 @@ NavigatorImpl::NavigatorImpl( |
| NavigationControllerImpl* navigation_controller, |
| NavigatorDelegate* delegate) |
| : controller_(navigation_controller), |
| - delegate_(delegate) { |
| + delegate_(delegate), |
| + load_progress_tracker_(new LoadProgressTracker(delegate)) { |
| +} |
| + |
| +NavigatorImpl::~NavigatorImpl() { |
| } |
| NavigationController* NavigatorImpl::GetController() { |
| @@ -391,6 +396,26 @@ bool NavigatorImpl::NavigateToPendingEntry( |
| reload_type); |
| } |
| +void NavigatorImpl::DidStartLoading(RenderFrameHostImpl* render_frame_host, |
| + bool to_different_document) { |
| + if (delegate_) |
| + delegate_->DidStartLoading(render_frame_host, to_different_document); |
| + load_progress_tracker_->DidStartLoading(render_frame_host->GetRoutingID()); |
| +} |
| + |
| +void NavigatorImpl::DidStopLoading(RenderFrameHostImpl* render_frame_host) { |
| + if (delegate_) |
|
nasko
2014/05/02 22:48:23
Don't we have to track that all frames are complet
Avi (use Gerrit)
2014/05/05 15:15:02
Let me think about this one for a while.
|
| + delegate_->DidStopLoading(render_frame_host); |
| + load_progress_tracker_->DidStopLoading(render_frame_host->GetRoutingID()); |
| +} |
| + |
| +void NavigatorImpl::DidChangeLoadProgress( |
| + RenderFrameHostImpl* render_frame_host, |
| + double load_progress) { |
| + load_progress_tracker_->DidChangeLoadProgress( |
| + render_frame_host->GetRoutingID(), load_progress); |
| +} |
| + |
| base::TimeTicks NavigatorImpl::GetCurrentLoadStart() { |
| return current_load_start_; |
| } |