Index: content/browser/web_contents/web_contents_impl.cc |
=================================================================== |
--- content/browser/web_contents/web_contents_impl.cc (revision 147723) |
+++ content/browser/web_contents/web_contents_impl.cc (working copy) |
@@ -2583,17 +2583,20 @@ |
delegate_->MoveContents(this, new_bounds); |
} |
-void WebContentsImpl::DidStartLoading() { |
+void WebContentsImpl::DidStartLoading( |
+ content::RenderViewHost* render_view_host) { |
SetIsLoading(true, NULL); |
if (delegate_ && content_restrictions_) |
OnUpdateContentRestrictions(0); |
// Notify observers about navigation. |
- FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidStartLoading()); |
+ FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
+ DidStartLoading(render_view_host)); |
} |
-void WebContentsImpl::DidStopLoading() { |
+void WebContentsImpl::DidStopLoading( |
+ content::RenderViewHost* render_view_host) { |
scoped_ptr<LoadNotificationDetails> details; |
NavigationEntry* entry = controller_.GetActiveEntry(); |
@@ -2613,7 +2616,8 @@ |
SetIsLoading(false, details.get()); |
// Notify observers about navigation. |
- FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidStopLoading()); |
+ FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
+ DidStopLoading(render_view_host)); |
} |
void WebContentsImpl::DidCancelLoading() { |
@@ -2932,11 +2936,6 @@ |
delegate_->BeforeUnloadFired(this, proceed, proceed_to_fire_unload); |
} |
-void WebContentsImpl::DidStartLoadingFromRenderManager( |
- RenderViewHost* render_view_host) { |
- DidStartLoading(); |
-} |
- |
void WebContentsImpl::RenderViewGoneFromRenderManager( |
RenderViewHost* render_view_host) { |
DCHECK(crashed_status_ != base::TERMINATION_STATUS_STILL_RUNNING); |
@@ -3040,7 +3039,7 @@ |
if (is_showing_before_unload_dialog_ && !success) { |
// If a beforeunload dialog is canceled, we need to stop the throbber from |
// spinning, since we forced it to start spinning in Navigate. |
- DidStopLoading(); |
+ DidStopLoading(rvh); |
controller_.DiscardNonCommittedEntries(); |
close_start_time_ = base::TimeTicks(); |