| 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 3380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3391 | 3391 |
| 3392 void RenderFrameImpl::didRunInsecureContent( | 3392 void RenderFrameImpl::didRunInsecureContent( |
| 3393 blink::WebLocalFrame* frame, | 3393 blink::WebLocalFrame* frame, |
| 3394 const blink::WebSecurityOrigin& origin, | 3394 const blink::WebSecurityOrigin& origin, |
| 3395 const blink::WebURL& target) { | 3395 const blink::WebURL& target) { |
| 3396 DCHECK(!frame_ || frame_ == frame); | 3396 DCHECK(!frame_ || frame_ == frame); |
| 3397 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( | 3397 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( |
| 3398 render_view_->GetRoutingID(), | 3398 render_view_->GetRoutingID(), |
| 3399 origin.toString().utf8(), | 3399 origin.toString().utf8(), |
| 3400 target)); | 3400 target)); |
| 3401 GetContentClient()->renderer()->RecordRapporURL( |
| 3402 "ContentSettings.MixedScript.RanMixedScript", |
| 3403 GURL(origin.toString().utf8())); |
| 3401 } | 3404 } |
| 3402 | 3405 |
| 3403 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { | 3406 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { |
| 3404 DCHECK(!frame_ || frame_ == frame); | 3407 DCHECK(!frame_ || frame_ == frame); |
| 3405 #if defined(ENABLE_PLUGINS) | 3408 #if defined(ENABLE_PLUGINS) |
| 3406 if (frame != render_view_->webview()->mainFrame()) | 3409 if (frame != render_view_->webview()->mainFrame()) |
| 3407 return; | 3410 return; |
| 3408 PluginChannelHost::Broadcast( | 3411 PluginChannelHost::Broadcast( |
| 3409 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); | 3412 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); |
| 3410 #endif | 3413 #endif |
| (...skipping 1506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4917 #elif defined(ENABLE_BROWSER_CDMS) | 4920 #elif defined(ENABLE_BROWSER_CDMS) |
| 4918 cdm_manager_, | 4921 cdm_manager_, |
| 4919 #endif | 4922 #endif |
| 4920 this); | 4923 this); |
| 4921 } | 4924 } |
| 4922 | 4925 |
| 4923 return cdm_factory_; | 4926 return cdm_factory_; |
| 4924 } | 4927 } |
| 4925 | 4928 |
| 4926 } // namespace content | 4929 } // namespace content |
| OLD | NEW |