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

Unified Diff: content/browser/frame_host/render_frame_proxy_host.cc

Issue 2474323002: Implement WebContentsViewChildFrame::TakeFocus. (Closed)
Patch Set: Conflicted with my own cl https://codereview.chromium.org/2455133005/ Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index b8ec5d390ec6a0fe9e84b550a2fa927d9bbb1903..b2b509045e7248c81f92ce064b146173d694b95b 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -359,18 +359,12 @@ void RenderFrameProxyHost::OnAdvanceFocus(blink::WebFocusType type,
// child frames finishes its traversal.
RenderFrameHostImpl* source_rfh =
RenderFrameHostImpl::FromID(GetProcess()->GetID(), source_routing_id);
- int32_t source_proxy_routing_id = MSG_ROUTING_NONE;
- if (source_rfh) {
- RenderFrameProxyHost* source_proxy =
- source_rfh->frame_tree_node()
- ->render_manager()
- ->GetRenderFrameProxyHost(target_rfh->GetSiteInstance());
- if (source_proxy)
- source_proxy_routing_id = source_proxy->GetRoutingID();
- }
-
- target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type,
- source_proxy_routing_id));
+ target_rfh->AdvanceFocus(
+ type, (source_rfh
alexmos 2016/11/22 02:45:27 Let's keep source_proxy defined as a separate var
avallee 2016/11/25 19:39:54 Done.
+ ? source_rfh->frame_tree_node()
+ ->render_manager()
+ ->GetRenderFrameProxyHost(target_rfh->GetSiteInstance())
+ : nullptr));
}
void RenderFrameProxyHost::OnFrameFocused() {

Powered by Google App Engine
This is Rietveld 408576698