diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/ipc/ipc_channel.h | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ipc/ipc_channel.h')
-rw-r--r-- | chromium/ipc/ipc_channel.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/chromium/ipc/ipc_channel.h b/chromium/ipc/ipc_channel.h index b1eacf35d15..3a5abf0219d 100644 --- a/chromium/ipc/ipc_channel.h +++ b/chromium/ipc/ipc_channel.h @@ -26,6 +26,7 @@ #include "ipc/ipc_sender.h" #include "mojo/public/cpp/bindings/associated_interface_ptr.h" #include "mojo/public/cpp/bindings/associated_interface_request.h" +#include "mojo/public/cpp/bindings/associated_remote.h" #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h" #include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h" @@ -121,13 +122,23 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { base::Bind(&BindAssociatedInterfaceRequest<Interface>, factory)); } + // Remove this after done with migrating all AsscoiatedInterfacePtr to + // AsscoiatedRemote. // Template helper to request a remote associated interface. template <typename Interface> void GetRemoteAssociatedInterface( mojo::AssociatedInterfacePtr<Interface>* proxy) { auto request = mojo::MakeRequest(proxy); - GetGenericRemoteAssociatedInterface( - Interface::Name_, request.PassHandle()); + GetGenericRemoteAssociatedInterface(Interface::Name_, + request.PassHandle()); + } + + // Template helper to request a remote associated interface. + template <typename Interface> + void GetRemoteAssociatedInterface( + mojo::PendingAssociatedReceiver<Interface> receiver) { + GetGenericRemoteAssociatedInterface(Interface::Name_, + receiver.PassHandle()); } private: |