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 <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 2983 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2994 base::Bind(&ForwardRequest<device::mojom::SensorProvider>, | 2994 base::Bind(&ForwardRequest<device::mojom::SensorProvider>, |
2995 device::mojom::kServiceName)); | 2995 device::mojom::kServiceName)); |
2996 } | 2996 } |
2997 | 2997 |
2998 registry_->AddInterface( | 2998 registry_->AddInterface( |
2999 base::Bind(&ForwardRequest<device::mojom::VibrationManager>, | 2999 base::Bind(&ForwardRequest<device::mojom::VibrationManager>, |
3000 device::mojom::kServiceName)); | 3000 device::mojom::kServiceName)); |
3001 | 3001 |
3002 registry_->AddInterface( | 3002 registry_->AddInterface( |
3003 base::Bind(&media::WatchTimeRecorder::CreateWatchTimeRecorderProvider)); | 3003 base::Bind(&media::WatchTimeRecorder::CreateWatchTimeRecorderProvider)); |
| 3004 |
| 3005 registry_->AddInterface(base::Bind( |
| 3006 &KeyboardLockServiceImpl::CreateMojoService, base::Unretained(this))); |
3004 } | 3007 } |
3005 | 3008 |
3006 void RenderFrameHostImpl::ResetWaitingState() { | 3009 void RenderFrameHostImpl::ResetWaitingState() { |
3007 DCHECK(is_active()); | 3010 DCHECK(is_active()); |
3008 | 3011 |
3009 // Whenever we reset the RFH state, we should not be waiting for beforeunload | 3012 // Whenever we reset the RFH state, we should not be waiting for beforeunload |
3010 // or close acks. We clear them here to be safe, since they can cause | 3013 // or close acks. We clear them here to be safe, since they can cause |
3011 // navigations to be ignored in OnDidCommitProvisionalLoad. | 3014 // navigations to be ignored in OnDidCommitProvisionalLoad. |
3012 if (is_waiting_for_beforeunload_ack_) { | 3015 if (is_waiting_for_beforeunload_ack_) { |
3013 is_waiting_for_beforeunload_ack_ = false; | 3016 is_waiting_for_beforeunload_ack_ = false; |
(...skipping 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4246 } | 4249 } |
4247 | 4250 |
4248 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 4251 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
4249 const std::string& interface_name, | 4252 const std::string& interface_name, |
4250 mojo::ScopedMessagePipeHandle pipe) { | 4253 mojo::ScopedMessagePipeHandle pipe) { |
4251 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 4254 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
4252 } | 4255 } |
4253 #endif | 4256 #endif |
4254 | 4257 |
4255 } // namespace content | 4258 } // namespace content |
OLD | NEW |