| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 3902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3913 } | 3913 } |
| 3914 } | 3914 } |
| 3915 | 3915 |
| 3916 for (auto& observer : render_view_->observers_) | 3916 for (auto& observer : render_view_->observers_) |
| 3917 observer.DidCommitProvisionalLoad(frame_, is_new_navigation); | 3917 observer.DidCommitProvisionalLoad(frame_, is_new_navigation); |
| 3918 for (auto& observer : observers_) { | 3918 for (auto& observer : observers_) { |
| 3919 observer.DidCommitProvisionalLoad( | 3919 observer.DidCommitProvisionalLoad( |
| 3920 is_new_navigation, navigation_state->WasWithinSameDocument()); | 3920 is_new_navigation, navigation_state->WasWithinSameDocument()); |
| 3921 } | 3921 } |
| 3922 | 3922 |
| 3923 // Notify the MediaPermissionDispatcher that its connection will be closed |
| 3924 // due to a navigation to a different document. |
| 3925 if (media_permission_dispatcher_ && |
| 3926 !navigation_state->WasWithinSameDocument()) { |
| 3927 media_permission_dispatcher_->OnNavigation(); |
| 3928 } |
| 3929 |
| 3923 if (!frame_->Parent()) { // Only for top frames. | 3930 if (!frame_->Parent()) { // Only for top frames. |
| 3924 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); | 3931 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); |
| 3925 if (render_thread_impl) { // Can be NULL in tests. | 3932 if (render_thread_impl) { // Can be NULL in tests. |
| 3926 render_thread_impl->histogram_customizer()-> | 3933 render_thread_impl->histogram_customizer()-> |
| 3927 RenderViewNavigatedToHost(GURL(GetLoadingUrl()).host(), | 3934 RenderViewNavigatedToHost(GURL(GetLoadingUrl()).host(), |
| 3928 RenderView::GetRenderViewCount()); | 3935 RenderView::GetRenderViewCount()); |
| 3929 // The scheduler isn't interested in history inert commits unless they | 3936 // The scheduler isn't interested in history inert commits unless they |
| 3930 // are reloads. | 3937 // are reloads. |
| 3931 if (commit_type != blink::kWebHistoryInertCommit || | 3938 if (commit_type != blink::kWebHistoryInertCommit || |
| 3932 PageTransitionCoreTypeIs(navigation_state->GetTransitionType(), | 3939 PageTransitionCoreTypeIs(navigation_state->GetTransitionType(), |
| (...skipping 3246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7179 policy(info.default_policy), | 7186 policy(info.default_policy), |
| 7180 replaces_current_history_item(info.replaces_current_history_item), | 7187 replaces_current_history_item(info.replaces_current_history_item), |
| 7181 history_navigation_in_new_child_frame( | 7188 history_navigation_in_new_child_frame( |
| 7182 info.is_history_navigation_in_new_child_frame), | 7189 info.is_history_navigation_in_new_child_frame), |
| 7183 client_redirect(info.is_client_redirect), | 7190 client_redirect(info.is_client_redirect), |
| 7184 cache_disabled(info.is_cache_disabled), | 7191 cache_disabled(info.is_cache_disabled), |
| 7185 form(info.form), | 7192 form(info.form), |
| 7186 source_location(info.source_location) {} | 7193 source_location(info.source_location) {} |
| 7187 | 7194 |
| 7188 } // namespace content | 7195 } // namespace content |
| OLD | NEW |