Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(669)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 438733002: Revert https://src.chromium.org/viewvc/chrome?view=rev&revision=283728 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2662 matching lines...) Expand 10 before | Expand all | Expand 10 after
2673 blink::WebLocalFrame* frame, 2673 blink::WebLocalFrame* frame,
2674 const blink::WebSecurityOrigin& origin, 2674 const blink::WebSecurityOrigin& origin,
2675 const blink::WebURL& target) { 2675 const blink::WebURL& target) {
2676 DCHECK(!frame_ || frame_ == frame); 2676 DCHECK(!frame_ || frame_ == frame);
2677 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( 2677 render_view_->Send(new ViewHostMsg_DidRunInsecureContent(
2678 render_view_->GetRoutingID(), 2678 render_view_->GetRoutingID(),
2679 origin.toString().utf8(), 2679 origin.toString().utf8(),
2680 target)); 2680 target));
2681 } 2681 }
2682 2682
2683 void RenderFrameImpl::didDetectXSS(blink::WebLocalFrame* frame,
2684 const blink::WebURL& url,
2685 bool blocked_entire_page) {
2686 Send(new FrameHostMsg_DidDetectXSS(routing_id_, render_view_->page_id_, url,
2687 blocked_entire_page));
2688 }
2689
2690 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { 2683 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) {
2691 DCHECK(!frame_ || frame_ == frame); 2684 DCHECK(!frame_ || frame_ == frame);
2692 #if defined(ENABLE_PLUGINS) 2685 #if defined(ENABLE_PLUGINS)
2693 if (frame != render_view_->webview()->mainFrame()) 2686 if (frame != render_view_->webview()->mainFrame())
2694 return; 2687 return;
2695 PluginChannelHost::Broadcast( 2688 PluginChannelHost::Broadcast(
2696 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); 2689 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID()));
2697 #endif 2690 #endif
2698 } 2691 }
2699 2692
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
3634 3627
3635 #if defined(ENABLE_BROWSER_CDMS) 3628 #if defined(ENABLE_BROWSER_CDMS)
3636 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3629 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3637 if (!cdm_manager_) 3630 if (!cdm_manager_)
3638 cdm_manager_ = new RendererCdmManager(this); 3631 cdm_manager_ = new RendererCdmManager(this);
3639 return cdm_manager_; 3632 return cdm_manager_;
3640 } 3633 }
3641 #endif // defined(ENABLE_BROWSER_CDMS) 3634 #endif // defined(ENABLE_BROWSER_CDMS)
3642 3635
3643 } // namespace content 3636 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698