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 2621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2632 blink::WebLocalFrame* frame, | 2632 blink::WebLocalFrame* frame, |
2633 const blink::WebSecurityOrigin& origin, | 2633 const blink::WebSecurityOrigin& origin, |
2634 const blink::WebURL& target) { | 2634 const blink::WebURL& target) { |
2635 DCHECK(!frame_ || frame_ == frame); | 2635 DCHECK(!frame_ || frame_ == frame); |
2636 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( | 2636 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( |
2637 render_view_->GetRoutingID(), | 2637 render_view_->GetRoutingID(), |
2638 origin.toString().utf8(), | 2638 origin.toString().utf8(), |
2639 target)); | 2639 target)); |
2640 } | 2640 } |
2641 | 2641 |
2642 void RenderFrameImpl::didDetectXSS(blink::WebLocalFrame* frame, | |
2643 const blink::WebURL& url, | |
2644 bool blocked_entire_page) { | |
2645 render_view_->Send( | |
nasko
2014/06/10 23:21:30
Just send it through the RenderFrameImpl Send with
| |
2646 new ViewHostMsg_DidDetectXSS(render_view_->GetRoutingID(), | |
2647 render_view_->page_id_, | |
2648 url, | |
2649 blocked_entire_page)); | |
2650 } | |
2651 | |
2642 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { | 2652 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { |
2643 DCHECK(!frame_ || frame_ == frame); | 2653 DCHECK(!frame_ || frame_ == frame); |
2644 #if defined(ENABLE_PLUGINS) | 2654 #if defined(ENABLE_PLUGINS) |
2645 if (frame != render_view_->webview()->mainFrame()) | 2655 if (frame != render_view_->webview()->mainFrame()) |
2646 return; | 2656 return; |
2647 PluginChannelHost::Broadcast( | 2657 PluginChannelHost::Broadcast( |
2648 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); | 2658 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); |
2649 #endif | 2659 #endif |
2650 } | 2660 } |
2651 | 2661 |
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3572 | 3582 |
3573 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3583 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
3574 if (!cdm_manager_) | 3584 if (!cdm_manager_) |
3575 cdm_manager_ = new RendererCdmManager(this); | 3585 cdm_manager_ = new RendererCdmManager(this); |
3576 return cdm_manager_; | 3586 return cdm_manager_; |
3577 } | 3587 } |
3578 | 3588 |
3579 #endif // defined(OS_ANDROID) | 3589 #endif // defined(OS_ANDROID) |
3580 | 3590 |
3581 } // namespace content | 3591 } // namespace content |
OLD | NEW |