Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1048963002: Fix incorrect creation of duplicate navigation entries for repeated page load failures. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@committype3
Patch Set: works Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 3915 matching lines...) Expand 10 before | Expand all | Expand 10 after
3926 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); 3926 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL);
3927 } 3927 }
3928 3928
3929 void WebContentsImpl::DidAccessInitialDocument() { 3929 void WebContentsImpl::DidAccessInitialDocument() {
3930 has_accessed_initial_document_ = true; 3930 has_accessed_initial_document_ = true;
3931 3931
3932 // We may have left a failed browser-initiated navigation in the address bar 3932 // We may have left a failed browser-initiated navigation in the address bar
3933 // to let the user edit it and try again. Clear it now that content might 3933 // to let the user edit it and try again. Clear it now that content might
3934 // show up underneath it. 3934 // show up underneath it.
3935 if (!IsLoading() && controller_.GetPendingEntry()) 3935 if (!IsLoading() && controller_.GetPendingEntry())
3936 controller_.DiscardPendingEntry(); 3936 controller_.DiscardPendingEntry(false);
3937 3937
3938 // Update the URL display. 3938 // Update the URL display.
3939 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); 3939 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL);
3940 } 3940 }
3941 3941
3942 void WebContentsImpl::DidChangeName(RenderFrameHost* render_frame_host, 3942 void WebContentsImpl::DidChangeName(RenderFrameHost* render_frame_host,
3943 const std::string& name) { 3943 const std::string& name) {
3944 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 3944 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3945 FrameNameChanged(render_frame_host, name)); 3945 FrameNameChanged(render_frame_host, name));
3946 } 3946 }
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
4586 node->render_manager()->ResumeResponseDeferredAtStart(); 4586 node->render_manager()->ResumeResponseDeferredAtStart();
4587 } 4587 }
4588 4588
4589 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4589 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4590 force_disable_overscroll_content_ = force_disable; 4590 force_disable_overscroll_content_ = force_disable;
4591 if (view_) 4591 if (view_)
4592 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4592 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4593 } 4593 }
4594 4594
4595 } // namespace content 4595 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698