| 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 4320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4331 routing_id_, | 4331 routing_id_, |
| 4332 base::UTF16ToUTF8(base::StringPiece16(scheme)), | 4332 base::UTF16ToUTF8(base::StringPiece16(scheme)), |
| 4333 url, | 4333 url, |
| 4334 user_gesture)); | 4334 user_gesture)); |
| 4335 } | 4335 } |
| 4336 | 4336 |
| 4337 blink::WebBluetooth* RenderFrameImpl::bluetooth() { | 4337 blink::WebBluetooth* RenderFrameImpl::bluetooth() { |
| 4338 // ChildThreadImpl::current() is null in some tests. | 4338 // ChildThreadImpl::current() is null in some tests. |
| 4339 if (!bluetooth_ && ChildThreadImpl::current()) { | 4339 if (!bluetooth_ && ChildThreadImpl::current()) { |
| 4340 bluetooth_.reset(new WebBluetoothImpl( | 4340 bluetooth_.reset(new WebBluetoothImpl( |
| 4341 ChildThreadImpl::current()->thread_safe_sender(), routing_id_)); | 4341 ChildThreadImpl::current()->thread_safe_sender(), |
| 4342 ChildThreadImpl::current()->service_registry(), routing_id_)); |
| 4342 } | 4343 } |
| 4343 | 4344 |
| 4344 return bluetooth_.get(); | 4345 return bluetooth_.get(); |
| 4345 } | 4346 } |
| 4346 | 4347 |
| 4347 blink::WebUSBClient* RenderFrameImpl::usbClient() { | 4348 blink::WebUSBClient* RenderFrameImpl::usbClient() { |
| 4348 if (!usb_client_) | 4349 if (!usb_client_) |
| 4349 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); | 4350 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); |
| 4350 | 4351 |
| 4351 return usb_client_.get(); | 4352 return usb_client_.get(); |
| (...skipping 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6130 int match_count, | 6131 int match_count, |
| 6131 int ordinal, | 6132 int ordinal, |
| 6132 const WebRect& selection_rect, | 6133 const WebRect& selection_rect, |
| 6133 bool final_status_update) { | 6134 bool final_status_update) { |
| 6134 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6135 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6135 selection_rect, ordinal, | 6136 selection_rect, ordinal, |
| 6136 final_status_update)); | 6137 final_status_update)); |
| 6137 } | 6138 } |
| 6138 | 6139 |
| 6139 } // namespace content | 6140 } // namespace content |
| OLD | NEW |