| OLD | NEW |
| 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 3888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3899 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 3899 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
| 3900 } | 3900 } |
| 3901 | 3901 |
| 3902 void WebContentsImpl::DidAccessInitialDocument() { | 3902 void WebContentsImpl::DidAccessInitialDocument() { |
| 3903 has_accessed_initial_document_ = true; | 3903 has_accessed_initial_document_ = true; |
| 3904 | 3904 |
| 3905 // We may have left a failed browser-initiated navigation in the address bar | 3905 // We may have left a failed browser-initiated navigation in the address bar |
| 3906 // to let the user edit it and try again. Clear it now that content might | 3906 // to let the user edit it and try again. Clear it now that content might |
| 3907 // show up underneath it. | 3907 // show up underneath it. |
| 3908 if (!IsLoading() && controller_.GetPendingEntry()) | 3908 if (!IsLoading() && controller_.GetPendingEntry()) |
| 3909 controller_.DiscardPendingEntry(); | 3909 controller_.DiscardPendingEntry(false); |
| 3910 | 3910 |
| 3911 // Update the URL display. | 3911 // Update the URL display. |
| 3912 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 3912 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
| 3913 } | 3913 } |
| 3914 | 3914 |
| 3915 void WebContentsImpl::DidChangeName(RenderFrameHost* render_frame_host, | 3915 void WebContentsImpl::DidChangeName(RenderFrameHost* render_frame_host, |
| 3916 const std::string& name) { | 3916 const std::string& name) { |
| 3917 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 3917 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
| 3918 FrameNameChanged(render_frame_host, name)); | 3918 FrameNameChanged(render_frame_host, name)); |
| 3919 } | 3919 } |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4559 node->render_manager()->ResumeResponseDeferredAtStart(); | 4559 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4560 } | 4560 } |
| 4561 | 4561 |
| 4562 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4562 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4563 force_disable_overscroll_content_ = force_disable; | 4563 force_disable_overscroll_content_ = force_disable; |
| 4564 if (view_) | 4564 if (view_) |
| 4565 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4565 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4566 } | 4566 } |
| 4567 | 4567 |
| 4568 } // namespace content | 4568 } // namespace content |
| OLD | NEW |