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

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

Issue 1934703002: Fix keyboard focus for OOPIF-<webview>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ready for review: Fix works with oopif webview but does not fix crbug.com/609903 Created 4 years, 7 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
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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 frame_tree_->AddFrame(frame_tree_node_, GetProcess()->GetID(), new_routing_id, 852 frame_tree_->AddFrame(frame_tree_node_, GetProcess()->GetID(), new_routing_id,
853 scope, frame_name, frame_unique_name, sandbox_flags, 853 scope, frame_name, frame_unique_name, sandbox_flags,
854 frame_owner_properties); 854 frame_owner_properties);
855 } 855 }
856 856
857 void RenderFrameHostImpl::OnDetach() { 857 void RenderFrameHostImpl::OnDetach() {
858 frame_tree_->RemoveFrame(frame_tree_node_); 858 frame_tree_->RemoveFrame(frame_tree_node_);
859 } 859 }
860 860
861 void RenderFrameHostImpl::OnFrameFocused() { 861 void RenderFrameHostImpl::OnFrameFocused() {
862 frame_tree_->SetFocusedFrame(frame_tree_node_, GetSiteInstance()); 862 delegate_->SetFocusedFrame(frame_tree_node_, GetSiteInstance());
863 } 863 }
864 864
865 void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) { 865 void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) {
866 if (params.is_history_navigation_in_new_child) { 866 if (params.is_history_navigation_in_new_child) {
867 DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries()); 867 DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries());
868 868
869 // Try to find a FrameNavigationEntry that matches this frame instead, based 869 // Try to find a FrameNavigationEntry that matches this frame instead, based
870 // on the frame's unique name. If this can't be found, fall back to the 870 // on the frame's unique name. If this can't be found, fall back to the
871 // default params using OpenURL below. 871 // default params using OpenURL below.
872 if (frame_tree_node_->navigator()->NavigateNewChildFrame( 872 if (frame_tree_node_->navigator()->NavigateNewChildFrame(
(...skipping 1266 matching lines...) Expand 10 before | Expand all | Expand 10 after
2139 2139
2140 int opener_routing_id = 2140 int opener_routing_id =
2141 frame_tree_node_->render_manager()->GetOpenerRoutingID(GetSiteInstance()); 2141 frame_tree_node_->render_manager()->GetOpenerRoutingID(GetSiteInstance());
2142 Send(new FrameMsg_UpdateOpener(GetRoutingID(), opener_routing_id)); 2142 Send(new FrameMsg_UpdateOpener(GetRoutingID(), opener_routing_id));
2143 } 2143 }
2144 2144
2145 void RenderFrameHostImpl::SetFocusedFrame() { 2145 void RenderFrameHostImpl::SetFocusedFrame() {
2146 Send(new FrameMsg_SetFocusedFrame(routing_id_)); 2146 Send(new FrameMsg_SetFocusedFrame(routing_id_));
2147 } 2147 }
2148 2148
2149 void RenderFrameHostImpl::UnsetFocusedFrame() {
2150 Send(new FrameMsg_UnsetFocusedFrame(routing_id_));
2151 }
2152
2149 void RenderFrameHostImpl::ExtendSelectionAndDelete(size_t before, 2153 void RenderFrameHostImpl::ExtendSelectionAndDelete(size_t before,
2150 size_t after) { 2154 size_t after) {
2151 Send(new InputMsg_ExtendSelectionAndDelete(routing_id_, before, after)); 2155 Send(new InputMsg_ExtendSelectionAndDelete(routing_id_, before, after));
2152 } 2156 }
2153 2157
2154 void RenderFrameHostImpl::JavaScriptDialogClosed( 2158 void RenderFrameHostImpl::JavaScriptDialogClosed(
2155 IPC::Message* reply_msg, 2159 IPC::Message* reply_msg,
2156 bool success, 2160 bool success,
2157 const base::string16& user_input, 2161 const base::string16& user_input,
2158 bool dialog_was_suppressed) { 2162 bool dialog_was_suppressed) {
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
2763 // handler after it's destroyed so it can't run after the RFHI is destroyed. 2767 // handler after it's destroyed so it can't run after the RFHI is destroyed.
2764 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 2768 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
2765 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 2769 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
2766 } 2770 }
2767 2771
2768 void RenderFrameHostImpl::DeleteWebBluetoothService() { 2772 void RenderFrameHostImpl::DeleteWebBluetoothService() {
2769 web_bluetooth_service_.reset(); 2773 web_bluetooth_service_.reset();
2770 } 2774 }
2771 2775
2772 } // namespace content 2776 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698