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 19 matching lines...) Expand all Loading... |
30 #include "content/browser/frame_host/frame_tree_node.h" | 30 #include "content/browser/frame_host/frame_tree_node.h" |
31 #include "content/browser/frame_host/navigation_entry_impl.h" | 31 #include "content/browser/frame_host/navigation_entry_impl.h" |
32 #include "content/browser/frame_host/navigation_handle_impl.h" | 32 #include "content/browser/frame_host/navigation_handle_impl.h" |
33 #include "content/browser/frame_host/navigation_request.h" | 33 #include "content/browser/frame_host/navigation_request.h" |
34 #include "content/browser/frame_host/navigator.h" | 34 #include "content/browser/frame_host/navigator.h" |
35 #include "content/browser/frame_host/navigator_impl.h" | 35 #include "content/browser/frame_host/navigator_impl.h" |
36 #include "content/browser/frame_host/render_frame_host_delegate.h" | 36 #include "content/browser/frame_host/render_frame_host_delegate.h" |
37 #include "content/browser/frame_host/render_frame_proxy_host.h" | 37 #include "content/browser/frame_host/render_frame_proxy_host.h" |
38 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 38 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
39 #include "content/browser/installedapp/installed_app_provider_impl_default.h" | 39 #include "content/browser/installedapp/installed_app_provider_impl_default.h" |
| 40 #include "content/browser/keyboard_lock/keyboard_lock_service_impl.h" |
40 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 41 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
41 #include "content/browser/media/media_interface_proxy.h" | 42 #include "content/browser/media/media_interface_proxy.h" |
42 #include "content/browser/media/session/media_session_service_impl.h" | 43 #include "content/browser/media/session/media_session_service_impl.h" |
43 #include "content/browser/permissions/permission_service_context.h" | 44 #include "content/browser/permissions/permission_service_context.h" |
44 #include "content/browser/permissions/permission_service_impl.h" | 45 #include "content/browser/permissions/permission_service_impl.h" |
45 #include "content/browser/presentation/presentation_service_impl.h" | 46 #include "content/browser/presentation/presentation_service_impl.h" |
46 #include "content/browser/renderer_host/dip_util.h" | 47 #include "content/browser/renderer_host/dip_util.h" |
47 #include "content/browser/renderer_host/input/input_router_impl.h" | 48 #include "content/browser/renderer_host/input/input_router_impl.h" |
48 #include "content/browser/renderer_host/input/timeout_monitor.h" | 49 #include "content/browser/renderer_host/input/timeout_monitor.h" |
49 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" | 50 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" |
(...skipping 2481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2531 base::Unretained(media_stream_manager)), | 2532 base::Unretained(media_stream_manager)), |
2532 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 2533 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
2533 } | 2534 } |
2534 #endif | 2535 #endif |
2535 | 2536 |
2536 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2537 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
2537 GetInterfaceRegistry()->AddInterface(base::Bind( | 2538 GetInterfaceRegistry()->AddInterface(base::Bind( |
2538 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); | 2539 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); |
2539 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2540 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) |
2540 | 2541 |
| 2542 GetInterfaceRegistry()->AddInterface(base::Bind( |
| 2543 &KeyboardLockServiceImpl::CreateMojoService, base::Unretained(this))); |
| 2544 |
2541 GetContentClient()->browser()->RegisterRenderFrameMojoInterfaces( | 2545 GetContentClient()->browser()->RegisterRenderFrameMojoInterfaces( |
2542 GetInterfaceRegistry(), this); | 2546 GetInterfaceRegistry(), this); |
2543 } | 2547 } |
2544 | 2548 |
2545 void RenderFrameHostImpl::ResetWaitingState() { | 2549 void RenderFrameHostImpl::ResetWaitingState() { |
2546 DCHECK(is_active()); | 2550 DCHECK(is_active()); |
2547 | 2551 |
2548 // Whenever we reset the RFH state, we should not be waiting for beforeunload | 2552 // Whenever we reset the RFH state, we should not be waiting for beforeunload |
2549 // or close acks. We clear them here to be safe, since they can cause | 2553 // or close acks. We clear them here to be safe, since they can cause |
2550 // navigations to be ignored in OnDidCommitProvisionalLoad. | 2554 // navigations to be ignored in OnDidCommitProvisionalLoad. |
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3657 } | 3661 } |
3658 | 3662 |
3659 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 3663 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
3660 const std::string& interface_name, | 3664 const std::string& interface_name, |
3661 mojo::ScopedMessagePipeHandle pipe) { | 3665 mojo::ScopedMessagePipeHandle pipe) { |
3662 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 3666 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
3663 } | 3667 } |
3664 #endif | 3668 #endif |
3665 | 3669 |
3666 } // namespace content | 3670 } // namespace content |
OLD | NEW |