| 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 2625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2636 blink::WebLocalFrame* frame, | 2636 blink::WebLocalFrame* frame, |
| 2637 const blink::WebSecurityOrigin& origin, | 2637 const blink::WebSecurityOrigin& origin, |
| 2638 const blink::WebURL& target) { | 2638 const blink::WebURL& target) { |
| 2639 DCHECK(!frame_ || frame_ == frame); | 2639 DCHECK(!frame_ || frame_ == frame); |
| 2640 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( | 2640 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( |
| 2641 render_view_->GetRoutingID(), | 2641 render_view_->GetRoutingID(), |
| 2642 origin.toString().utf8(), | 2642 origin.toString().utf8(), |
| 2643 target)); | 2643 target)); |
| 2644 } | 2644 } |
| 2645 | 2645 |
| 2646 void RenderFrameImpl::didDetectXSS(blink::WebLocalFrame* frame, |
| 2647 const blink::WebURL& url, |
| 2648 bool blocked_entire_page) { |
| 2649 Send(new FrameHostMsg_DidDetectXSS(routing_id_, render_view_->page_id_, url, |
| 2650 blocked_entire_page)); |
| 2651 } |
| 2652 |
| 2646 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { | 2653 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { |
| 2647 DCHECK(!frame_ || frame_ == frame); | 2654 DCHECK(!frame_ || frame_ == frame); |
| 2648 #if defined(ENABLE_PLUGINS) | 2655 #if defined(ENABLE_PLUGINS) |
| 2649 if (frame != render_view_->webview()->mainFrame()) | 2656 if (frame != render_view_->webview()->mainFrame()) |
| 2650 return; | 2657 return; |
| 2651 PluginChannelHost::Broadcast( | 2658 PluginChannelHost::Broadcast( |
| 2652 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); | 2659 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); |
| 2653 #endif | 2660 #endif |
| 2654 } | 2661 } |
| 2655 | 2662 |
| (...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3579 | 3586 |
| 3580 #if defined(ENABLE_BROWSER_CDMS) | 3587 #if defined(ENABLE_BROWSER_CDMS) |
| 3581 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3588 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3582 if (!cdm_manager_) | 3589 if (!cdm_manager_) |
| 3583 cdm_manager_ = new RendererCdmManager(this); | 3590 cdm_manager_ = new RendererCdmManager(this); |
| 3584 return cdm_manager_; | 3591 return cdm_manager_; |
| 3585 } | 3592 } |
| 3586 #endif // defined(ENABLE_BROWSER_CDMS) | 3593 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3587 | 3594 |
| 3588 } // namespace content | 3595 } // namespace content |
| OLD | NEW |