| 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 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 if (render_widget_host_) { | 924 if (render_widget_host_) { |
| 925 params->widget_params->routing_id = render_widget_host_->GetRoutingID(); | 925 params->widget_params->routing_id = render_widget_host_->GetRoutingID(); |
| 926 params->widget_params->hidden = render_widget_host_->is_hidden(); | 926 params->widget_params->hidden = render_widget_host_->is_hidden(); |
| 927 } else { | 927 } else { |
| 928 // MSG_ROUTING_NONE will prevent a new RenderWidget from being created in | 928 // MSG_ROUTING_NONE will prevent a new RenderWidget from being created in |
| 929 // the renderer process. | 929 // the renderer process. |
| 930 params->widget_params->routing_id = MSG_ROUTING_NONE; | 930 params->widget_params->routing_id = MSG_ROUTING_NONE; |
| 931 params->widget_params->hidden = true; | 931 params->widget_params->hidden = true; |
| 932 } | 932 } |
| 933 | 933 |
| 934 RenderProcessHostImpl::GetRendererInterface(GetProcess())->CreateFrame( | 934 GetProcess()->GetRendererInterface()->CreateFrame(std::move(params)); |
| 935 std::move(params)); | |
| 936 | 935 |
| 937 // The RenderWidgetHost takes ownership of its view. It is tied to the | 936 // The RenderWidgetHost takes ownership of its view. It is tied to the |
| 938 // lifetime of the current RenderProcessHost for this RenderFrameHost. | 937 // lifetime of the current RenderProcessHost for this RenderFrameHost. |
| 939 // TODO(avi): This will need to change to initialize a | 938 // TODO(avi): This will need to change to initialize a |
| 940 // RenderWidgetHostViewAura for the main frame once RenderViewHostImpl has-a | 939 // RenderWidgetHostViewAura for the main frame once RenderViewHostImpl has-a |
| 941 // RenderWidgetHostImpl. https://crbug.com/545684 | 940 // RenderWidgetHostImpl. https://crbug.com/545684 |
| 942 if (parent_routing_id != MSG_ROUTING_NONE && render_widget_host_) { | 941 if (parent_routing_id != MSG_ROUTING_NONE && render_widget_host_) { |
| 943 RenderWidgetHostView* rwhv = | 942 RenderWidgetHostView* rwhv = |
| 944 RenderWidgetHostViewChildFrame::Create(render_widget_host_); | 943 RenderWidgetHostViewChildFrame::Create(render_widget_host_); |
| 945 rwhv->Hide(); | 944 rwhv->Hide(); |
| (...skipping 2237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3183 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3182 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
| 3184 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3183 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
| 3185 return web_bluetooth_service_.get(); | 3184 return web_bluetooth_service_.get(); |
| 3186 } | 3185 } |
| 3187 | 3186 |
| 3188 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3187 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
| 3189 web_bluetooth_service_.reset(); | 3188 web_bluetooth_service_.reset(); |
| 3190 } | 3189 } |
| 3191 | 3190 |
| 3192 } // namespace content | 3191 } // namespace content |
| OLD | NEW |