Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2761153003: PlzNavigate & CSP. Use the SourceLocation in violation reports. (Closed)
Patch Set: Addressed comment @alexmos Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 DCHECK_EQ(site_instance_.get(), site_instance); 920 DCHECK_EQ(site_instance_.get(), site_instance);
921 921
922 // The renderer process is gone, so this frame can no longer be loading. 922 // The renderer process is gone, so this frame can no longer be loading.
923 ResetLoadingState(); 923 ResetLoadingState();
924 924
925 // Any future UpdateState or UpdateTitle messages from this or a recreated 925 // Any future UpdateState or UpdateTitle messages from this or a recreated
926 // process should be ignored until the next commit. 926 // process should be ignored until the next commit.
927 set_nav_entry_id(0); 927 set_nav_entry_id(0);
928 } 928 }
929 929
930 void RenderFrameHostImpl::LogToConsole(const std::string& message) {
931 AddMessageToConsole(CONSOLE_MESSAGE_LEVEL_ERROR, message);
932 }
933
934 void RenderFrameHostImpl::ReportContentSecurityPolicyViolation( 930 void RenderFrameHostImpl::ReportContentSecurityPolicyViolation(
935 const CSPViolationParams& violation_params) { 931 const CSPViolationParams& violation_params) {
936 Send(new FrameMsg_ReportContentSecurityPolicyViolation(routing_id_, 932 Send(new FrameMsg_ReportContentSecurityPolicyViolation(routing_id_,
937 violation_params)); 933 violation_params));
938 } 934 }
939 935
940 bool RenderFrameHostImpl::SchemeShouldBypassCSP( 936 bool RenderFrameHostImpl::SchemeShouldBypassCSP(
941 const base::StringPiece& scheme) { 937 const base::StringPiece& scheme) {
942 // Blink uses its SchemeRegistry to check if a scheme should be bypassed. 938 // Blink uses its SchemeRegistry to check if a scheme should be bypassed.
943 // It can't be used on the browser process. It is used for two things: 939 // It can't be used on the browser process. It is used for two things:
(...skipping 2729 matching lines...) Expand 10 before | Expand all | Expand 10 after
3673 service_manager::mojom::InterfaceProviderPtr provider; 3669 service_manager::mojom::InterfaceProviderPtr provider;
3674 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); 3670 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3675 java_interfaces_.reset(new service_manager::InterfaceProvider); 3671 java_interfaces_.reset(new service_manager::InterfaceProvider);
3676 java_interfaces_->Bind(std::move(provider)); 3672 java_interfaces_->Bind(std::move(provider));
3677 } 3673 }
3678 return java_interfaces_.get(); 3674 return java_interfaces_.get();
3679 } 3675 }
3680 #endif 3676 #endif
3681 3677
3682 } // namespace content 3678 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/common/content_security_policy/content_security_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698