| 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 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 3788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3799 const WebURL& url) { | 3799 const WebURL& url) { |
| 3800 bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); | 3800 bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture(); |
| 3801 Send(new FrameHostMsg_UnregisterProtocolHandler(routing_id_, | 3801 Send(new FrameHostMsg_UnregisterProtocolHandler(routing_id_, |
| 3802 base::UTF16ToUTF8(scheme), | 3802 base::UTF16ToUTF8(scheme), |
| 3803 url, | 3803 url, |
| 3804 user_gesture)); | 3804 user_gesture)); |
| 3805 } | 3805 } |
| 3806 | 3806 |
| 3807 blink::WebBluetooth* RenderFrameImpl::bluetooth() { | 3807 blink::WebBluetooth* RenderFrameImpl::bluetooth() { |
| 3808 if (!bluetooth_) { | 3808 if (!bluetooth_) { |
| 3809 bluetooth_.reset( | 3809 bluetooth_.reset(new WebBluetoothImpl( |
| 3810 new WebBluetoothImpl(ChildThreadImpl::current()->thread_safe_sender())); | 3810 ChildThreadImpl::current()->thread_safe_sender(), routing_id_)); |
| 3811 } | 3811 } |
| 3812 | 3812 |
| 3813 return bluetooth_.get(); | 3813 return bluetooth_.get(); |
| 3814 } | 3814 } |
| 3815 | 3815 |
| 3816 #if defined(ENABLE_WEBVR) | 3816 #if defined(ENABLE_WEBVR) |
| 3817 blink::WebVRClient* RenderFrameImpl::webVRClient() { | 3817 blink::WebVRClient* RenderFrameImpl::webVRClient() { |
| 3818 if (!vr_dispatcher_) | 3818 if (!vr_dispatcher_) |
| 3819 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry())); | 3819 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry())); |
| 3820 | 3820 |
| (...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5044 void RenderFrameImpl::RegisterMojoServices() { | 5044 void RenderFrameImpl::RegisterMojoServices() { |
| 5045 // Only main frame have ImageDownloader service. | 5045 // Only main frame have ImageDownloader service. |
| 5046 if (!frame_->parent()) { | 5046 if (!frame_->parent()) { |
| 5047 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( | 5047 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( |
| 5048 base::Bind(&ImageDownloaderImpl::CreateMojoService, | 5048 base::Bind(&ImageDownloaderImpl::CreateMojoService, |
| 5049 base::Unretained(this))); | 5049 base::Unretained(this))); |
| 5050 } | 5050 } |
| 5051 } | 5051 } |
| 5052 | 5052 |
| 5053 } // namespace content | 5053 } // namespace content |
| OLD | NEW |