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

Side by Side Diff: content/browser/frame_host/render_frame_proxy_host.cc

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Pass through FrameReplicationState Created 3 years, 11 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
« no previous file with comments | « content/browser/frame_host/render_frame_proxy_host.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/frame_host/render_frame_proxy_host.h" 5 #include "content/browser/frame_host/render_frame_proxy_host.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "content/browser/bad_message.h" 10 #include "content/browser/bad_message.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 return true; 132 return true;
133 133
134 bool handled = true; 134 bool handled = true;
135 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxyHost, msg) 135 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxyHost, msg)
136 IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach) 136 IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach)
137 IPC_MESSAGE_HANDLER(FrameHostMsg_OpenURL, OnOpenURL) 137 IPC_MESSAGE_HANDLER(FrameHostMsg_OpenURL, OnOpenURL)
138 IPC_MESSAGE_HANDLER(FrameHostMsg_RouteMessageEvent, OnRouteMessageEvent) 138 IPC_MESSAGE_HANDLER(FrameHostMsg_RouteMessageEvent, OnRouteMessageEvent)
139 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeOpener, OnDidChangeOpener) 139 IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeOpener, OnDidChangeOpener)
140 IPC_MESSAGE_HANDLER(FrameHostMsg_AdvanceFocus, OnAdvanceFocus) 140 IPC_MESSAGE_HANDLER(FrameHostMsg_AdvanceFocus, OnAdvanceFocus)
141 IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused) 141 IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused)
142 IPC_MESSAGE_HANDLER(FrameHostMsg_SetHasReceivedUserGesture,
143 OnSetHasReceivedUserGesture)
144 IPC_MESSAGE_UNHANDLED(handled = false) 142 IPC_MESSAGE_UNHANDLED(handled = false)
145 IPC_END_MESSAGE_MAP() 143 IPC_END_MESSAGE_MAP()
146 return handled; 144 return handled;
147 } 145 }
148 146
149 bool RenderFrameProxyHost::InitRenderFrameProxy() { 147 bool RenderFrameProxyHost::InitRenderFrameProxy() {
150 DCHECK(!render_frame_proxy_created_); 148 DCHECK(!render_frame_proxy_created_);
151 149
152 // It is possible to reach this when the process is dead (in particular, when 150 // It is possible to reach this when the process is dead (in particular, when
153 // creating proxies from CreateProxiesForChildFrame). In that case, don't 151 // creating proxies from CreateProxiesForChildFrame). In that case, don't
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 369
372 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, 370 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type,
373 source_proxy_routing_id)); 371 source_proxy_routing_id));
374 } 372 }
375 373
376 void RenderFrameProxyHost::OnFrameFocused() { 374 void RenderFrameProxyHost::OnFrameFocused() {
377 frame_tree_node_->current_frame_host()->delegate()->SetFocusedFrame( 375 frame_tree_node_->current_frame_host()->delegate()->SetFocusedFrame(
378 frame_tree_node_, GetSiteInstance()); 376 frame_tree_node_, GetSiteInstance());
379 } 377 }
380 378
381 void RenderFrameProxyHost::OnSetHasReceivedUserGesture() {
382 frame_tree_node_->current_frame_host()->SetHasReceivedUserGesture();
383 }
384
385 } // namespace content 379 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_proxy_host.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698