| 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 2609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2620 return; | 2620 return; |
| 2621 | 2621 |
| 2622 // Let the browser know we loaded a resource from the memory cache. This | 2622 // Let the browser know we loaded a resource from the memory cache. This |
| 2623 // message is needed to display the correct SSL indicators. | 2623 // message is needed to display the correct SSL indicators. |
| 2624 render_view_->Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( | 2624 render_view_->Send(new ViewHostMsg_DidLoadResourceFromMemoryCache( |
| 2625 render_view_->GetRoutingID(), | 2625 render_view_->GetRoutingID(), |
| 2626 url, | 2626 url, |
| 2627 response.securityInfo(), | 2627 response.securityInfo(), |
| 2628 request.httpMethod().utf8(), | 2628 request.httpMethod().utf8(), |
| 2629 response.mimeType().utf8(), | 2629 response.mimeType().utf8(), |
| 2630 ResourceType::FromTargetType(request.targetType()))); | 2630 ResourceType::FromWebURLRequest(request))); |
| 2631 } | 2631 } |
| 2632 | 2632 |
| 2633 void RenderFrameImpl::didDisplayInsecureContent(blink::WebLocalFrame* frame) { | 2633 void RenderFrameImpl::didDisplayInsecureContent(blink::WebLocalFrame* frame) { |
| 2634 DCHECK(!frame_ || frame_ == frame); | 2634 DCHECK(!frame_ || frame_ == frame); |
| 2635 render_view_->Send(new ViewHostMsg_DidDisplayInsecureContent( | 2635 render_view_->Send(new ViewHostMsg_DidDisplayInsecureContent( |
| 2636 render_view_->GetRoutingID())); | 2636 render_view_->GetRoutingID())); |
| 2637 } | 2637 } |
| 2638 | 2638 |
| 2639 void RenderFrameImpl::didRunInsecureContent( | 2639 void RenderFrameImpl::didRunInsecureContent( |
| 2640 blink::WebLocalFrame* frame, | 2640 blink::WebLocalFrame* frame, |
| (...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3582 | 3582 |
| 3583 #if defined(ENABLE_BROWSER_CDMS) | 3583 #if defined(ENABLE_BROWSER_CDMS) |
| 3584 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3584 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3585 if (!cdm_manager_) | 3585 if (!cdm_manager_) |
| 3586 cdm_manager_ = new RendererCdmManager(this); | 3586 cdm_manager_ = new RendererCdmManager(this); |
| 3587 return cdm_manager_; | 3587 return cdm_manager_; |
| 3588 } | 3588 } |
| 3589 #endif // defined(ENABLE_BROWSER_CDMS) | 3589 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3590 | 3590 |
| 3591 } // namespace content | 3591 } // namespace content |
| OLD | NEW |