| 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/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 975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 986 delegate_->SetFocusedFrame(frame_tree_node_, GetSiteInstance()); | 986 delegate_->SetFocusedFrame(frame_tree_node_, GetSiteInstance()); |
| 987 } | 987 } |
| 988 | 988 |
| 989 void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) { | 989 void RenderFrameHostImpl::OnOpenURL(const FrameHostMsg_OpenURL_Params& params) { |
| 990 if (params.is_history_navigation_in_new_child) { | 990 if (params.is_history_navigation_in_new_child) { |
| 991 DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries()); | 991 DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries()); |
| 992 | 992 |
| 993 // Try to find a FrameNavigationEntry that matches this frame instead, based | 993 // Try to find a FrameNavigationEntry that matches this frame instead, based |
| 994 // on the frame's unique name. If this can't be found, fall back to the | 994 // on the frame's unique name. If this can't be found, fall back to the |
| 995 // default params using OpenURL below. | 995 // default params using OpenURL below. |
| 996 if (frame_tree_node_->navigator()->NavigateNewChildFrame(this)) | 996 if (frame_tree_node_->navigator()->NavigateNewChildFrame(this, params.url)) |
| 997 return; | 997 return; |
| 998 } | 998 } |
| 999 | 999 |
| 1000 OpenURL(params, GetSiteInstance()); | 1000 OpenURL(params, GetSiteInstance()); |
| 1001 } | 1001 } |
| 1002 | 1002 |
| 1003 void RenderFrameHostImpl::OnCancelInitialHistoryLoad() { | 1003 void RenderFrameHostImpl::OnCancelInitialHistoryLoad() { |
| 1004 // A Javascript navigation interrupted the initial history load. Check if an | 1004 // A Javascript navigation interrupted the initial history load. Check if an |
| 1005 // initial subframe cross-process navigation needs to be canceled as a result. | 1005 // initial subframe cross-process navigation needs to be canceled as a result. |
| 1006 // TODO(creis, clamy): Cancel any cross-process navigation in PlzNavigate. | 1006 // TODO(creis, clamy): Cancel any cross-process navigation in PlzNavigate. |
| (...skipping 2078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3085 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3085 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
| 3086 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3086 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
| 3087 return web_bluetooth_service_.get(); | 3087 return web_bluetooth_service_.get(); |
| 3088 } | 3088 } |
| 3089 | 3089 |
| 3090 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3090 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
| 3091 web_bluetooth_service_.reset(); | 3091 web_bluetooth_service_.reset(); |
| 3092 } | 3092 } |
| 3093 | 3093 |
| 3094 } // namespace content | 3094 } // namespace content |
| OLD | NEW |