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

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: Transmit the source_location instead of the line number. 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 903 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 DCHECK_EQ(site_instance_.get(), site_instance); 914 DCHECK_EQ(site_instance_.get(), site_instance);
915 915
916 // The renderer process is gone, so this frame can no longer be loading. 916 // The renderer process is gone, so this frame can no longer be loading.
917 ResetLoadingState(); 917 ResetLoadingState();
918 918
919 // Any future UpdateState or UpdateTitle messages from this or a recreated 919 // Any future UpdateState or UpdateTitle messages from this or a recreated
920 // process should be ignored until the next commit. 920 // process should be ignored until the next commit.
921 set_nav_entry_id(0); 921 set_nav_entry_id(0);
922 } 922 }
923 923
924 void RenderFrameHostImpl::LogToConsole(const std::string& message) {
925 AddMessageToConsole(CONSOLE_MESSAGE_LEVEL_ERROR, message);
926 }
927
928 void RenderFrameHostImpl::ReportContentSecurityPolicyViolation( 924 void RenderFrameHostImpl::ReportContentSecurityPolicyViolation(
929 const CSPViolationParams& violation_params) { 925 const CSPViolationParams& violation_params) {
930 Send(new FrameMsg_ReportContentSecurityPolicyViolation(routing_id_, 926 Send(new FrameMsg_ReportContentSecurityPolicyViolation(routing_id_,
931 violation_params)); 927 violation_params));
932 } 928 }
933 929
934 bool RenderFrameHostImpl::SchemeShouldBypassCSP( 930 bool RenderFrameHostImpl::SchemeShouldBypassCSP(
935 const base::StringPiece& scheme) { 931 const base::StringPiece& scheme) {
936 // Blink uses its SchemeRegistry to check if a scheme should be bypassed. 932 // Blink uses its SchemeRegistry to check if a scheme should be bypassed.
937 // It can't be used on the browser process. It is used for two things: 933 // It can't be used on the browser process. It is used for two things:
(...skipping 2692 matching lines...) Expand 10 before | Expand all | Expand 10 after
3630 service_manager::mojom::InterfaceProviderPtr provider; 3626 service_manager::mojom::InterfaceProviderPtr provider;
3631 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); 3627 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3632 java_interfaces_.reset(new service_manager::InterfaceProvider); 3628 java_interfaces_.reset(new service_manager::InterfaceProvider);
3633 java_interfaces_->Bind(std::move(provider)); 3629 java_interfaces_->Bind(std::move(provider));
3634 } 3630 }
3635 return java_interfaces_.get(); 3631 return java_interfaces_.get();
3636 } 3632 }
3637 #endif 3633 #endif
3638 3634
3639 } // namespace content 3635 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698