Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(442)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2805763004: [System-Keyboard-Lock] Forward navigator functions to RenderFrameHost (Closed)
Patch Set: Sync latest changes Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 2488 matching lines...) Expand 10 before | Expand all | Expand 10 after
2538 base::Unretained(media_stream_manager)), 2539 base::Unretained(media_stream_manager)),
2539 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); 2540 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
2540 } 2541 }
2541 #endif 2542 #endif
2542 2543
2543 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 2544 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2544 GetInterfaceRegistry()->AddInterface(base::Bind( 2545 GetInterfaceRegistry()->AddInterface(base::Bind(
2545 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); 2546 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID()));
2546 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 2547 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
2547 2548
2549 GetInterfaceRegistry()->AddInterface(base::Bind(
2550 &KeyboardLockServiceImpl::CreateMojoService, base::Unretained(this)));
2551
2548 GetContentClient()->browser()->RegisterRenderFrameMojoInterfaces( 2552 GetContentClient()->browser()->RegisterRenderFrameMojoInterfaces(
2549 GetInterfaceRegistry(), this); 2553 GetInterfaceRegistry(), this);
2550 } 2554 }
2551 2555
2552 void RenderFrameHostImpl::ResetWaitingState() { 2556 void RenderFrameHostImpl::ResetWaitingState() {
2553 DCHECK(is_active()); 2557 DCHECK(is_active());
2554 2558
2555 // Whenever we reset the RFH state, we should not be waiting for beforeunload 2559 // Whenever we reset the RFH state, we should not be waiting for beforeunload
2556 // or close acks. We clear them here to be safe, since they can cause 2560 // or close acks. We clear them here to be safe, since they can cause
2557 // navigations to be ignored in OnDidCommitProvisionalLoad. 2561 // navigations to be ignored in OnDidCommitProvisionalLoad.
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
3664 } 3668 }
3665 3669
3666 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( 3670 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame(
3667 const std::string& interface_name, 3671 const std::string& interface_name,
3668 mojo::ScopedMessagePipeHandle pipe) { 3672 mojo::ScopedMessagePipeHandle pipe) {
3669 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); 3673 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe));
3670 } 3674 }
3671 #endif 3675 #endif
3672 3676
3673 } // namespace content 3677 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698