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/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 2556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2567 FOR_EACH_OBSERVER( | 2567 FOR_EACH_OBSERVER( |
2568 WebContentsObserver, | 2568 WebContentsObserver, |
2569 observers_, | 2569 observers_, |
2570 ProvisionalChangeToMainFrameUrl(validated_target_url, | 2570 ProvisionalChangeToMainFrameUrl(validated_target_url, |
2571 render_frame_host)); | 2571 render_frame_host)); |
2572 } | 2572 } |
2573 | 2573 |
2574 void WebContentsImpl::DidCommitProvisionalLoad( | 2574 void WebContentsImpl::DidCommitProvisionalLoad( |
2575 RenderFrameHostImpl* render_frame_host, | 2575 RenderFrameHostImpl* render_frame_host, |
2576 const GURL& url, | 2576 const GURL& url, |
2577 bool url_is_unreachable, | |
2577 ui::PageTransition transition_type) { | 2578 ui::PageTransition transition_type) { |
2578 // Notify observers about the commit of the provisional load. | 2579 // Notify observers about the commit of the provisional load. |
2579 FOR_EACH_OBSERVER(WebContentsObserver, | 2580 FOR_EACH_OBSERVER( |
2580 observers_, | 2581 WebContentsObserver, |
2581 DidCommitProvisionalLoadForFrame( | 2582 observers_, |
2582 render_frame_host, url, transition_type)); | 2583 DidCommitProvisionalLoadForFrame( |
2584 render_frame_host, url, url_is_unreachable, transition_type)); | |
wjmaclean
2014/09/22 17:11:13
We could avoid touching a lot of files if we store
| |
2583 } | 2585 } |
2584 | 2586 |
2585 void WebContentsImpl::DidNavigateMainFramePreCommit( | 2587 void WebContentsImpl::DidNavigateMainFramePreCommit( |
2586 bool navigation_is_within_page) { | 2588 bool navigation_is_within_page) { |
2587 // Ensure fullscreen mode is exited before committing the navigation to a | 2589 // Ensure fullscreen mode is exited before committing the navigation to a |
2588 // different page. The next page will not start out assuming it is in | 2590 // different page. The next page will not start out assuming it is in |
2589 // fullscreen mode. | 2591 // fullscreen mode. |
2590 if (navigation_is_within_page) { | 2592 if (navigation_is_within_page) { |
2591 // No page change? Then, the renderer and browser can remain in fullscreen. | 2593 // No page change? Then, the renderer and browser can remain in fullscreen. |
2592 return; | 2594 return; |
(...skipping 1773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4366 node->render_manager()->ResumeResponseDeferredAtStart(); | 4368 node->render_manager()->ResumeResponseDeferredAtStart(); |
4367 } | 4369 } |
4368 | 4370 |
4369 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4371 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
4370 force_disable_overscroll_content_ = force_disable; | 4372 force_disable_overscroll_content_ = force_disable; |
4371 if (view_) | 4373 if (view_) |
4372 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4374 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
4373 } | 4375 } |
4374 | 4376 |
4375 } // namespace content | 4377 } // namespace content |
OLD | NEW |