| 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 2782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2793 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 2793 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 2794 } | 2794 } |
| 2795 #endif | 2795 #endif |
| 2796 | 2796 |
| 2797 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2797 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 2798 GetInterfaceRegistry()->AddInterface(base::Bind( | 2798 GetInterfaceRegistry()->AddInterface(base::Bind( |
| 2799 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); | 2799 &RemoterFactoryImpl::Bind, GetProcess()->GetID(), GetRoutingID())); |
| 2800 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2800 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 2801 | 2801 |
| 2802 GetInterfaceRegistry()->AddInterface(base::Bind( | 2802 GetInterfaceRegistry()->AddInterface(base::Bind( |
| 2803 &KeyboardLockServiceImpl::CreateMojoService)); | 2803 &KeyboardLockServiceImpl::CreateMojoService, base::Unretained(this))); |
| 2804 | 2804 |
| 2805 GetContentClient()->browser()->ExposeInterfacesToFrame(GetInterfaceRegistry(), | 2805 GetContentClient()->browser()->ExposeInterfacesToFrame(GetInterfaceRegistry(), |
| 2806 this); | 2806 this); |
| 2807 } | 2807 } |
| 2808 | 2808 |
| 2809 void RenderFrameHostImpl::ResetWaitingState() { | 2809 void RenderFrameHostImpl::ResetWaitingState() { |
| 2810 DCHECK(is_active()); | 2810 DCHECK(is_active()); |
| 2811 | 2811 |
| 2812 // Whenever we reset the RFH state, we should not be waiting for beforeunload | 2812 // Whenever we reset the RFH state, we should not be waiting for beforeunload |
| 2813 // or close acks. We clear them here to be safe, since they can cause | 2813 // or close acks. We clear them here to be safe, since they can cause |
| (...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3984 } | 3984 } |
| 3985 | 3985 |
| 3986 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 3986 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
| 3987 const std::string& interface_name, | 3987 const std::string& interface_name, |
| 3988 mojo::ScopedMessagePipeHandle pipe) { | 3988 mojo::ScopedMessagePipeHandle pipe) { |
| 3989 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 3989 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
| 3990 } | 3990 } |
| 3991 #endif | 3991 #endif |
| 3992 | 3992 |
| 3993 } // namespace content | 3993 } // namespace content |
| OLD | NEW |