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 4251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4262 routing_id_, | 4262 routing_id_, |
4263 base::UTF16ToUTF8(base::StringPiece16(scheme)), | 4263 base::UTF16ToUTF8(base::StringPiece16(scheme)), |
4264 url, | 4264 url, |
4265 user_gesture)); | 4265 user_gesture)); |
4266 } | 4266 } |
4267 | 4267 |
4268 blink::WebBluetooth* RenderFrameImpl::bluetooth() { | 4268 blink::WebBluetooth* RenderFrameImpl::bluetooth() { |
4269 // ChildThreadImpl::current() is null in some tests. | 4269 // ChildThreadImpl::current() is null in some tests. |
4270 if (!bluetooth_ && ChildThreadImpl::current()) { | 4270 if (!bluetooth_ && ChildThreadImpl::current()) { |
4271 bluetooth_.reset(new WebBluetoothImpl( | 4271 bluetooth_.reset(new WebBluetoothImpl( |
4272 ChildThreadImpl::current()->thread_safe_sender(), routing_id_)); | 4272 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(), |
| 4273 routing_id_)); |
4273 } | 4274 } |
4274 | 4275 |
4275 return bluetooth_.get(); | 4276 return bluetooth_.get(); |
4276 } | 4277 } |
4277 | 4278 |
4278 blink::WebUSBClient* RenderFrameImpl::usbClient() { | 4279 blink::WebUSBClient* RenderFrameImpl::usbClient() { |
4279 if (!usb_client_) | 4280 if (!usb_client_) |
4280 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); | 4281 usb_client_.reset(new WebUSBClientImpl(GetServiceRegistry())); |
4281 | 4282 |
4282 return usb_client_.get(); | 4283 return usb_client_.get(); |
(...skipping 1730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6013 int match_count, | 6014 int match_count, |
6014 int ordinal, | 6015 int ordinal, |
6015 const WebRect& selection_rect, | 6016 const WebRect& selection_rect, |
6016 bool final_status_update) { | 6017 bool final_status_update) { |
6017 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6018 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6018 selection_rect, ordinal, | 6019 selection_rect, ordinal, |
6019 final_status_update)); | 6020 final_status_update)); |
6020 } | 6021 } |
6021 | 6022 |
6022 } // namespace content | 6023 } // namespace content |
OLD | NEW |