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 3929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3940 // We may have left a failed browser-initiated navigation in the address bar | 3940 // We may have left a failed browser-initiated navigation in the address bar |
3941 // to let the user edit it and try again. Clear it now that content might | 3941 // to let the user edit it and try again. Clear it now that content might |
3942 // show up underneath it. | 3942 // show up underneath it. |
3943 if (!IsLoading() && controller_.GetPendingEntry()) | 3943 if (!IsLoading() && controller_.GetPendingEntry()) |
3944 controller_.DiscardPendingEntry(); | 3944 controller_.DiscardPendingEntry(); |
3945 | 3945 |
3946 // Update the URL display. | 3946 // Update the URL display. |
3947 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 3947 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
3948 } | 3948 } |
3949 | 3949 |
| 3950 void WebContentsImpl::DidChangeName(RenderFrameHost* render_frame_host, |
| 3951 const std::string& name) { |
| 3952 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
| 3953 FrameNameChanged(render_frame_host, name)); |
| 3954 } |
| 3955 |
3950 void WebContentsImpl::DidDisownOpener(RenderFrameHost* render_frame_host) { | 3956 void WebContentsImpl::DidDisownOpener(RenderFrameHost* render_frame_host) { |
3951 // No action is necessary if the opener has already been cleared. | 3957 // No action is necessary if the opener has already been cleared. |
3952 if (!opener_) | 3958 if (!opener_) |
3953 return; | 3959 return; |
3954 | 3960 |
3955 // Clear our opener so that future cross-process navigations don't have an | 3961 // Clear our opener so that future cross-process navigations don't have an |
3956 // opener assigned. | 3962 // opener assigned. |
3957 RemoveDestructionObserver(opener_); | 3963 RemoveDestructionObserver(opener_); |
3958 opener_ = NULL; | 3964 opener_ = NULL; |
3959 | 3965 |
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4578 node->render_manager()->ResumeResponseDeferredAtStart(); | 4584 node->render_manager()->ResumeResponseDeferredAtStart(); |
4579 } | 4585 } |
4580 | 4586 |
4581 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4587 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4582 force_disable_overscroll_content_ = force_disable; | 4588 force_disable_overscroll_content_ = force_disable; |
4583 if (view_) | 4589 if (view_) |
4584 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4590 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4585 } | 4591 } |
4586 | 4592 |
4587 } // namespace content | 4593 } // namespace content |
OLD | NEW |