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

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, 7 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
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/keyboard_lock/keyboard_lock_service_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 20 matching lines...) Expand all
31 #include "content/browser/frame_host/frame_tree_node.h" 31 #include "content/browser/frame_host/frame_tree_node.h"
32 #include "content/browser/frame_host/navigation_entry_impl.h" 32 #include "content/browser/frame_host/navigation_entry_impl.h"
33 #include "content/browser/frame_host/navigation_handle_impl.h" 33 #include "content/browser/frame_host/navigation_handle_impl.h"
34 #include "content/browser/frame_host/navigation_request.h" 34 #include "content/browser/frame_host/navigation_request.h"
35 #include "content/browser/frame_host/navigator.h" 35 #include "content/browser/frame_host/navigator.h"
36 #include "content/browser/frame_host/navigator_impl.h" 36 #include "content/browser/frame_host/navigator_impl.h"
37 #include "content/browser/frame_host/render_frame_host_delegate.h" 37 #include "content/browser/frame_host/render_frame_host_delegate.h"
38 #include "content/browser/frame_host/render_frame_proxy_host.h" 38 #include "content/browser/frame_host/render_frame_proxy_host.h"
39 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 39 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
40 #include "content/browser/installedapp/installed_app_provider_impl_default.h" 40 #include "content/browser/installedapp/installed_app_provider_impl_default.h"
41 #include "content/browser/keyboard_lock/keyboard_lock_service_impl.h"
41 #include "content/browser/loader/resource_dispatcher_host_impl.h" 42 #include "content/browser/loader/resource_dispatcher_host_impl.h"
42 #include "content/browser/media/media_interface_proxy.h" 43 #include "content/browser/media/media_interface_proxy.h"
43 #include "content/browser/media/session/media_session_service_impl.h" 44 #include "content/browser/media/session/media_session_service_impl.h"
44 #include "content/browser/permissions/permission_service_context.h" 45 #include "content/browser/permissions/permission_service_context.h"
45 #include "content/browser/permissions/permission_service_impl.h" 46 #include "content/browser/permissions/permission_service_impl.h"
46 #include "content/browser/presentation/presentation_service_impl.h" 47 #include "content/browser/presentation/presentation_service_impl.h"
47 #include "content/browser/renderer_host/dip_util.h" 48 #include "content/browser/renderer_host/dip_util.h"
48 #include "content/browser/renderer_host/input/input_router_impl.h" 49 #include "content/browser/renderer_host/input/input_router_impl.h"
49 #include "content/browser/renderer_host/input/timeout_monitor.h" 50 #include "content/browser/renderer_host/input/timeout_monitor.h"
50 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" 51 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h"
(...skipping 2656 matching lines...) Expand 10 before | Expand all | Expand 10 after
2707 base::Unretained(media_stream_manager)), 2708 base::Unretained(media_stream_manager)),
2708 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); 2709 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
2709 } 2710 }
2710 #endif 2711 #endif
2711 2712
2712 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 2713 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2713 GetInterfaceRegistry()->AddInterface(base::Bind( 2714 GetInterfaceRegistry()->AddInterface(base::Bind(
2714 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); 2715 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID()));
2715 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 2716 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
2716 2717
2718 GetInterfaceRegistry()->AddInterface(base::Bind(
2719 &KeyboardLockServiceImpl::CreateMojoService));
2720
2717 GetContentClient()->browser()->ExposeInterfacesToFrame(GetInterfaceRegistry(), 2721 GetContentClient()->browser()->ExposeInterfacesToFrame(GetInterfaceRegistry(),
2718 this); 2722 this);
2719 } 2723 }
2720 2724
2721 void RenderFrameHostImpl::ResetWaitingState() { 2725 void RenderFrameHostImpl::ResetWaitingState() {
2722 DCHECK(is_active()); 2726 DCHECK(is_active());
2723 2727
2724 // Whenever we reset the RFH state, we should not be waiting for beforeunload 2728 // Whenever we reset the RFH state, we should not be waiting for beforeunload
2725 // or close acks. We clear them here to be safe, since they can cause 2729 // or close acks. We clear them here to be safe, since they can cause
2726 // navigations to be ignored in OnDidCommitProvisionalLoad. 2730 // navigations to be ignored in OnDidCommitProvisionalLoad.
(...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after
3861 } 3865 }
3862 3866
3863 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( 3867 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame(
3864 const std::string& interface_name, 3868 const std::string& interface_name,
3865 mojo::ScopedMessagePipeHandle pipe) { 3869 mojo::ScopedMessagePipeHandle pipe) {
3866 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); 3870 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe));
3867 } 3871 }
3868 #endif 3872 #endif
3869 3873
3870 } // namespace content 3874 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/keyboard_lock/keyboard_lock_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698