summaryrefslogtreecommitdiff
path: root/chromium/ipc/ipc_channel.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:22:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-09 15:11:45 +0000
commit2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch)
treee75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/ipc/ipc_channel.h
parenta4f3d46271c57e8155ba912df46a05559d14726e (diff)
downloadqtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/ipc/ipc_channel.h')
-rw-r--r--chromium/ipc/ipc_channel.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/chromium/ipc/ipc_channel.h b/chromium/ipc/ipc_channel.h
index dd882bb5cc0..a008e7e15d5 100644
--- a/chromium/ipc/ipc_channel.h
+++ b/chromium/ipc/ipc_channel.h
@@ -12,6 +12,7 @@
#include "base/compiler_specific.h"
#include "base/files/scoped_file.h"
+#include "base/memory/scoped_ptr.h"
#include "base/process/process.h"
#include "build/build_config.h"
#include "ipc/ipc_channel_handle.h"
@@ -164,6 +165,9 @@ class IPC_EXPORT Channel : public Endpoint {
// connect to a pre-existing pipe. Note, calling Connect()
// will not block the calling thread and may complete
// asynchronously.
+ //
+ // The subclass implementation must call WillConnect() at the beginning of its
+ // implementation.
virtual bool Connect() WARN_UNUSED_RESULT = 0;
// Close this Channel explicitly. May be called multiple times.
@@ -223,6 +227,7 @@ class IPC_EXPORT Channel : public Endpoint {
// message from client to server we need to send the PID from the global
// PID namespace.
static void SetGlobalPid(int pid);
+ static int GetGlobalPid();
#endif
#if defined(OS_ANDROID)
@@ -253,6 +258,16 @@ class IPC_EXPORT Channel : public Endpoint {
void* buffer_;
size_t length_;
};
+
+ // Endpoint overrides.
+ void OnSetAttachmentBrokerEndpoint() override;
+
+ // Subclasses must call this method at the beginning of their implementation
+ // of Connect().
+ void WillConnect();
+
+ private:
+ bool did_start_connect_ = false;
};
#if defined(OS_POSIX)