| Index: content/browser/tab_contents/tab_contents.cc
|
| diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
|
| index 7c113a3dc38f4d4badf33291c9ce7a5acf1ef569..5d2dbba48d68ae95335e69ad6b91333f3af62763 100644
|
| --- a/content/browser/tab_contents/tab_contents.cc
|
| +++ b/content/browser/tab_contents/tab_contents.cc
|
| @@ -1232,9 +1232,7 @@ void TabContents::OnDidFailProvisionalLoadWithError(
|
| // before the page loaded so that the discard would discard the wrong entry.
|
| NavigationEntry* pending_entry = controller_.pending_entry();
|
| if (pending_entry && pending_entry->url() == validated_url) {
|
| - controller_.DiscardNonCommittedEntries();
|
| - // Update the URL display.
|
| - NotifyNavigationStateChanged(TabContents::INVALIDATE_URL);
|
| + DidCancelLoading();
|
| }
|
|
|
| render_manager_.RendererAbortedProvisionalLoad(render_view_host());
|
| @@ -1980,6 +1978,13 @@ void TabContents::DidStopLoading() {
|
| FOR_EACH_OBSERVER(TabContentsObserver, observers_, DidStopLoading());
|
| }
|
|
|
| +void TabContents::DidCancelLoading() {
|
| + controller_.DiscardNonCommittedEntries();
|
| +
|
| + // Update the URL display.
|
| + NotifyNavigationStateChanged(TabContents::INVALIDATE_URL);
|
| +}
|
| +
|
| void TabContents::DidChangeLoadProgress(double progress) {
|
| if (delegate())
|
| delegate()->LoadProgressChanged(progress);
|
|
|