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

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: Nit. Created 3 years, 9 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 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 DCHECK_EQ(site_instance_.get(), site_instance); 869 DCHECK_EQ(site_instance_.get(), site_instance);
870 870
871 // The renderer process is gone, so this frame can no longer be loading. 871 // The renderer process is gone, so this frame can no longer be loading.
872 ResetLoadingState(); 872 ResetLoadingState();
873 873
874 // Any future UpdateState or UpdateTitle messages from this or a recreated 874 // Any future UpdateState or UpdateTitle messages from this or a recreated
875 // process should be ignored until the next commit. 875 // process should be ignored until the next commit.
876 set_nav_entry_id(0); 876 set_nav_entry_id(0);
877 } 877 }
878 878
879 void RenderFrameHostImpl::LogToConsole(const std::string& message) {
880 AddMessageToConsole(CONSOLE_MESSAGE_LEVEL_ERROR, message);
881 }
882
883 void RenderFrameHostImpl::ReportContentSecurityPolicyViolation( 879 void RenderFrameHostImpl::ReportContentSecurityPolicyViolation(
884 const CSPViolationParams& violation_params) { 880 const CSPViolationParams& violation_params) {
885 Send(new FrameMsg_ReportContentSecurityPolicyViolation(routing_id_, 881 Send(new FrameMsg_ReportContentSecurityPolicyViolation(routing_id_,
886 violation_params)); 882 violation_params));
887 } 883 }
888 884
889 bool RenderFrameHostImpl::SchemeShouldBypassCSP( 885 bool RenderFrameHostImpl::SchemeShouldBypassCSP(
890 const base::StringPiece& scheme) { 886 const base::StringPiece& scheme) {
891 // Blink uses its SchemeRegistry to check if a scheme should be bypassed. 887 // Blink uses its SchemeRegistry to check if a scheme should be bypassed.
892 // It can't be used on the browser process. It is used for two things: 888 // It can't be used on the browser process. It is used for two things:
(...skipping 2667 matching lines...) Expand 10 before | Expand all | Expand 10 after
3560 service_manager::mojom::InterfaceProviderPtr provider; 3556 service_manager::mojom::InterfaceProviderPtr provider;
3561 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); 3557 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3562 java_interfaces_.reset(new service_manager::InterfaceProvider); 3558 java_interfaces_.reset(new service_manager::InterfaceProvider);
3563 java_interfaces_->Bind(std::move(provider)); 3559 java_interfaces_->Bind(std::move(provider));
3564 } 3560 }
3565 return java_interfaces_.get(); 3561 return java_interfaces_.get();
3566 } 3562 }
3567 #endif 3563 #endif
3568 3564
3569 } // namespace content 3565 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698