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/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
753 | 753 |
754 // Without this check, the renderer can trick the browser into using | 754 // Without this check, the renderer can trick the browser into using |
755 // filenames it can't access in a future session restore. | 755 // filenames it can't access in a future session restore. |
756 if (!render_view_host_->CanAccessFilesOfPageState( | 756 if (!render_view_host_->CanAccessFilesOfPageState( |
757 validated_params.page_state)) { | 757 validated_params.page_state)) { |
758 GetProcess()->ReceivedBadMessage(); | 758 GetProcess()->ReceivedBadMessage(); |
759 return; | 759 return; |
760 } | 760 } |
761 | 761 |
762 accessibility_reset_count_ = 0; | 762 accessibility_reset_count_ = 0; |
763 frame_tree_node()->navigator()->DidNavigate(this, validated_params); | 763 frame_tree_node()->navigator()->DidNavigate( |
| 764 this, render_view_host_->page_id_, validated_params); |
764 } | 765 } |
765 | 766 |
766 RenderWidgetHostImpl* RenderFrameHostImpl::GetRenderWidgetHost() { | 767 RenderWidgetHostImpl* RenderFrameHostImpl::GetRenderWidgetHost() { |
767 return static_cast<RenderWidgetHostImpl*>(render_view_host_); | 768 return static_cast<RenderWidgetHostImpl*>(render_view_host_); |
768 } | 769 } |
769 | 770 |
770 int RenderFrameHostImpl::GetEnabledBindings() { | 771 int RenderFrameHostImpl::GetEnabledBindings() { |
771 return render_view_host_->GetEnabledBindings(); | 772 return render_view_host_->GetEnabledBindings(); |
772 } | 773 } |
773 | 774 |
(...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1658 void RenderFrameHostImpl::DidUseGeolocationPermission() { | 1659 void RenderFrameHostImpl::DidUseGeolocationPermission() { |
1659 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); | 1660 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); |
1660 GetContentClient()->browser()->RegisterPermissionUsage( | 1661 GetContentClient()->browser()->RegisterPermissionUsage( |
1661 PERMISSION_GEOLOCATION, | 1662 PERMISSION_GEOLOCATION, |
1662 delegate_->GetAsWebContents(), | 1663 delegate_->GetAsWebContents(), |
1663 GetLastCommittedURL().GetOrigin(), | 1664 GetLastCommittedURL().GetOrigin(), |
1664 top_frame->GetLastCommittedURL().GetOrigin()); | 1665 top_frame->GetLastCommittedURL().GetOrigin()); |
1665 } | 1666 } |
1666 | 1667 |
1667 } // namespace content | 1668 } // namespace content |
OLD | NEW |