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/containers/hash_tables.h" | 8 #include "base/containers/hash_tables.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/metrics/user_metrics_action.h" | 10 #include "base/metrics/user_metrics_action.h" |
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
740 // cross-site URLs that are not allowed to commit in this process. | 740 // cross-site URLs that are not allowed to commit in this process. |
741 | 741 |
742 // Give the client a chance to disallow URLs from committing. | 742 // Give the client a chance to disallow URLs from committing. |
743 return GetContentClient()->browser()->CanCommitURL(GetProcess(), url); | 743 return GetContentClient()->browser()->CanCommitURL(GetProcess(), url); |
744 } | 744 } |
745 | 745 |
746 void RenderFrameHostImpl::Navigate(const FrameMsg_Navigate_Params& params) { | 746 void RenderFrameHostImpl::Navigate(const FrameMsg_Navigate_Params& params) { |
747 TRACE_EVENT0("frame_host", "RenderFrameHostImpl::Navigate"); | 747 TRACE_EVENT0("frame_host", "RenderFrameHostImpl::Navigate"); |
748 // Browser plugin guests are not allowed to navigate outside web-safe schemes, | 748 // Browser plugin guests are not allowed to navigate outside web-safe schemes, |
749 // so do not grant them the ability to request additional URLs. | 749 // so do not grant them the ability to request additional URLs. |
750 if (!GetProcess()->IsGuest()) { | 750 if (!GetProcess()->IsIsolatedGuest()) { |
751 ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL( | 751 ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL( |
752 GetProcess()->GetID(), params.url); | 752 GetProcess()->GetID(), params.url); |
753 if (params.url.SchemeIs(url::kDataScheme) && | 753 if (params.url.SchemeIs(url::kDataScheme) && |
754 params.base_url_for_data_url.SchemeIs(url::kFileScheme)) { | 754 params.base_url_for_data_url.SchemeIs(url::kFileScheme)) { |
755 // If 'data:' is used, and we have a 'file:' base url, grant access to | 755 // If 'data:' is used, and we have a 'file:' base url, grant access to |
756 // local files. | 756 // local files. |
757 ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL( | 757 ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL( |
758 GetProcess()->GetID(), params.base_url_for_data_url); | 758 GetProcess()->GetID(), params.base_url_for_data_url); |
759 } | 759 } |
760 } | 760 } |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
890 cancel_notification_callbacks_.erase(notification_id); | 890 cancel_notification_callbacks_.erase(notification_id); |
891 } | 891 } |
892 | 892 |
893 void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( | 893 void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( |
894 int callback_context) { | 894 int callback_context) { |
895 Send(new DesktopNotificationMsg_PermissionRequestDone( | 895 Send(new DesktopNotificationMsg_PermissionRequestDone( |
896 routing_id_, callback_context)); | 896 routing_id_, callback_context)); |
897 } | 897 } |
898 | 898 |
899 } // namespace content | 899 } // namespace content |
OLD | NEW |