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 2647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2658 const LoadCommittedDetails& details, | 2658 const LoadCommittedDetails& details, |
2659 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { | 2659 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { |
2660 if (details.is_navigation_to_different_page()) { | 2660 if (details.is_navigation_to_different_page()) { |
2661 // Clear the status bubble. This is a workaround for a bug where WebKit | 2661 // Clear the status bubble. This is a workaround for a bug where WebKit |
2662 // doesn't let us know that the cursor left an element during a | 2662 // doesn't let us know that the cursor left an element during a |
2663 // transition (this is also why the mouse cursor remains as a hand after | 2663 // transition (this is also why the mouse cursor remains as a hand after |
2664 // clicking on a link); see bugs 1184641 and 980803. We don't want to | 2664 // clicking on a link); see bugs 1184641 and 980803. We don't want to |
2665 // clear the bubble when a user navigates to a named anchor in the same | 2665 // clear the bubble when a user navigates to a named anchor in the same |
2666 // page. | 2666 // page. |
2667 UpdateTargetURL(render_frame_host->GetRenderViewHost(), GURL()); | 2667 UpdateTargetURL(render_frame_host->GetRenderViewHost(), GURL()); |
| 2668 |
| 2669 RenderWidgetHostViewBase* rwhvb = |
| 2670 static_cast<RenderWidgetHostViewBase*>(GetRenderWidgetHostView()); |
| 2671 if (rwhvb) |
| 2672 rwhvb->OnDidNavigateMainFrameToNewPage(); |
2668 } | 2673 } |
2669 | 2674 |
2670 if (!details.is_in_page) { | 2675 if (!details.is_in_page) { |
2671 // Once the main frame is navigated, we're no longer considered to have | 2676 // Once the main frame is navigated, we're no longer considered to have |
2672 // displayed insecure content. | 2677 // displayed insecure content. |
2673 displayed_insecure_content_ = false; | 2678 displayed_insecure_content_ = false; |
2674 SSLManager::NotifySSLInternalStateChanged( | 2679 SSLManager::NotifySSLInternalStateChanged( |
2675 GetController().GetBrowserContext()); | 2680 GetController().GetBrowserContext()); |
2676 } | 2681 } |
2677 | 2682 |
(...skipping 1805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4483 node->render_manager()->ResumeResponseDeferredAtStart(); | 4488 node->render_manager()->ResumeResponseDeferredAtStart(); |
4484 } | 4489 } |
4485 | 4490 |
4486 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4491 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4487 force_disable_overscroll_content_ = force_disable; | 4492 force_disable_overscroll_content_ = force_disable; |
4488 if (view_) | 4493 if (view_) |
4489 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4494 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4490 } | 4495 } |
4491 | 4496 |
4492 } // namespace content | 4497 } // namespace content |
OLD | NEW |