projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
ipc
/
mojo
/
ipc_mojo_bootstrap.h
diff --git
a/src/ipc/mojo/ipc_mojo_bootstrap.h
b/src/ipc/mojo/ipc_mojo_bootstrap.h
index
a099af9
..
ad5283d
100644
(file)
--- a/
src/ipc/mojo/ipc_mojo_bootstrap.h
+++ b/
src/ipc/mojo/ipc_mojo_bootstrap.h
@@
-9,7
+9,7
@@
#include "base/process/process_handle.h"
#include "ipc/ipc_channel.h"
#include "ipc/ipc_listener.h"
#include "base/process/process_handle.h"
#include "ipc/ipc_channel.h"
#include "ipc/ipc_listener.h"
-#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/e
dk/e
mbedder/scoped_platform_handle.h"
namespace IPC {
namespace IPC {
@@
-41,7
+41,7
@@
class IPC_MOJO_EXPORT MojoBootstrap : public Listener {
Delegate* delegate);
MojoBootstrap();
Delegate* delegate);
MojoBootstrap();
-
virtual ~MojoBootstrap()
;
+
~MojoBootstrap() override
;
// Start the handshake over the underlying platform channel.
bool Connect();
// Start the handshake over the underlying platform channel.
bool Connect();
@@
-51,14
+51,16
@@
class IPC_MOJO_EXPORT MojoBootstrap : public Listener {
#if defined(OS_POSIX) && !defined(OS_NACL)
int GetClientFileDescriptor() const;
#if defined(OS_POSIX) && !defined(OS_NACL)
int GetClientFileDescriptor() const;
-
int
TakeClientFileDescriptor();
+
base::ScopedFD
TakeClientFileDescriptor();
#endif // defined(OS_POSIX) && !defined(OS_NACL)
protected:
#endif // defined(OS_POSIX) && !defined(OS_NACL)
protected:
- enum State { STATE_INITIALIZED, STATE_WAITING_ACK, STATE_READY };
+ enum State { STATE_INITIALIZED, STATE_WAITING_ACK, STATE_READY
, STATE_ERROR
};
Delegate* delegate() const { return delegate_; }
bool Send(Message* message);
Delegate* delegate() const { return delegate_; }
bool Send(Message* message);
+ void Fail();
+ bool HasFailed() const;
State state() const { return state_; }
void set_state(State state) { state_ = state; }
State state() const { return state_; }
void set_state(State state) { state_ = state; }
@@
-67,8
+69,8
@@
class IPC_MOJO_EXPORT MojoBootstrap : public Listener {
void Init(scoped_ptr<Channel> channel, Delegate* delegate);
// Listener implementations
void Init(scoped_ptr<Channel> channel, Delegate* delegate);
// Listener implementations
- v
irtual void OnBadMessageReceived(const Message& message) OVERRIDE
;
- v
irtual void OnChannelError() OVERRIDE
;
+ v
oid OnBadMessageReceived(const Message& message) override
;
+ v
oid OnChannelError() override
;
scoped_ptr<Channel> channel_;
Delegate* delegate_;
scoped_ptr<Channel> channel_;
Delegate* delegate_;