| 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 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 881 | 881 |
| 882 Send(new FrameMsg_NewFrame(params)); | 882 Send(new FrameMsg_NewFrame(params)); |
| 883 | 883 |
| 884 // The RenderWidgetHost takes ownership of its view. It is tied to the | 884 // The RenderWidgetHost takes ownership of its view. It is tied to the |
| 885 // lifetime of the current RenderProcessHost for this RenderFrameHost. | 885 // lifetime of the current RenderProcessHost for this RenderFrameHost. |
| 886 // TODO(avi): This will need to change to initialize a | 886 // TODO(avi): This will need to change to initialize a |
| 887 // RenderWidgetHostViewAura for the main frame once RenderViewHostImpl has-a | 887 // RenderWidgetHostViewAura for the main frame once RenderViewHostImpl has-a |
| 888 // RenderWidgetHostImpl. https://crbug.com/545684 | 888 // RenderWidgetHostImpl. https://crbug.com/545684 |
| 889 if (parent_routing_id != MSG_ROUTING_NONE && render_widget_host_) { | 889 if (parent_routing_id != MSG_ROUTING_NONE && render_widget_host_) { |
| 890 RenderWidgetHostView* rwhv = | 890 RenderWidgetHostView* rwhv = |
| 891 new RenderWidgetHostViewChildFrame(render_widget_host_); | 891 RenderWidgetHostViewChildFrame::Create(render_widget_host_); |
| 892 rwhv->Hide(); | 892 rwhv->Hide(); |
| 893 } | 893 } |
| 894 | 894 |
| 895 if (proxy_routing_id != MSG_ROUTING_NONE) { | 895 if (proxy_routing_id != MSG_ROUTING_NONE) { |
| 896 RenderFrameProxyHost* proxy = RenderFrameProxyHost::FromID( | 896 RenderFrameProxyHost* proxy = RenderFrameProxyHost::FromID( |
| 897 GetProcess()->GetID(), proxy_routing_id); | 897 GetProcess()->GetID(), proxy_routing_id); |
| 898 // We have also created a RenderFrameProxy in FrameMsg_NewFrame above, so | 898 // We have also created a RenderFrameProxy in FrameMsg_NewFrame above, so |
| 899 // remember that. | 899 // remember that. |
| 900 proxy->set_render_frame_proxy_created(true); | 900 proxy->set_render_frame_proxy_created(true); |
| 901 } | 901 } |
| (...skipping 2183 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 |