| 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2650 blink::WebLocalFrame* frame, | 2650 blink::WebLocalFrame* frame, |
| 2651 const blink::WebSecurityOrigin& origin, | 2651 const blink::WebSecurityOrigin& origin, |
| 2652 const blink::WebURL& target) { | 2652 const blink::WebURL& target) { |
| 2653 DCHECK(!frame_ || frame_ == frame); | 2653 DCHECK(!frame_ || frame_ == frame); |
| 2654 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( | 2654 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( |
| 2655 render_view_->GetRoutingID(), | 2655 render_view_->GetRoutingID(), |
| 2656 origin.toString().utf8(), | 2656 origin.toString().utf8(), |
| 2657 target)); | 2657 target)); |
| 2658 } | 2658 } |
| 2659 | 2659 |
| 2660 void RenderFrameImpl::didDetectXSS(blink::WebLocalFrame* frame, |
| 2661 const blink::WebURL& url, |
| 2662 bool blocked_entire_page) { |
| 2663 Send(new FrameHostMsg_DidDetectXSS(routing_id_, render_view_->page_id_, url, |
| 2664 blocked_entire_page)); |
| 2665 } |
| 2666 |
| 2660 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { | 2667 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { |
| 2661 DCHECK(!frame_ || frame_ == frame); | 2668 DCHECK(!frame_ || frame_ == frame); |
| 2662 #if defined(ENABLE_PLUGINS) | 2669 #if defined(ENABLE_PLUGINS) |
| 2663 if (frame != render_view_->webview()->mainFrame()) | 2670 if (frame != render_view_->webview()->mainFrame()) |
| 2664 return; | 2671 return; |
| 2665 PluginChannelHost::Broadcast( | 2672 PluginChannelHost::Broadcast( |
| 2666 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); | 2673 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); |
| 2667 #endif | 2674 #endif |
| 2668 } | 2675 } |
| 2669 | 2676 |
| (...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3593 | 3600 |
| 3594 #if defined(ENABLE_BROWSER_CDMS) | 3601 #if defined(ENABLE_BROWSER_CDMS) |
| 3595 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3602 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3596 if (!cdm_manager_) | 3603 if (!cdm_manager_) |
| 3597 cdm_manager_ = new RendererCdmManager(this); | 3604 cdm_manager_ = new RendererCdmManager(this); |
| 3598 return cdm_manager_; | 3605 return cdm_manager_; |
| 3599 } | 3606 } |
| 3600 #endif // defined(ENABLE_BROWSER_CDMS) | 3607 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3601 | 3608 |
| 3602 } // namespace content | 3609 } // namespace content |
| OLD | NEW |