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

Unified Diff: ipc/mojo/ipc_channel_mojo.h

Issue 679453002: ChannelMojo: Replace hand written messsages with mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ipc/mojo/ipc_channel_mojo.h
diff --git a/ipc/mojo/ipc_channel_mojo.h b/ipc/mojo/ipc_channel_mojo.h
index e5a4e335541c7f46d194290f2b88bb51b4aecc5c..45d248231fceb31aec8479f93936e9578d3e696d 100644
--- a/ipc/mojo/ipc_channel_mojo.h
+++ b/ipc/mojo/ipc_channel_mojo.h
@@ -114,15 +114,12 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel,
#endif // defined(OS_POSIX) && !defined(OS_NACL)
// MojoBootstrapDelegate implementation
- void OnPipeAvailable(mojo::embedder::ScopedPlatformHandle handle) override;
void OnBootstrapError() override;
// Called from MessagePipeReader implementations
void OnMessageReceived(Message& message);
- void OnConnected(mojo::ScopedMessagePipeHandle pipe);
void OnPipeClosed(internal::MessagePipeReader* reader);
void OnPipeError(internal::MessagePipeReader* reader);
- void set_peer_pid(base::ProcessId pid) { peer_pid_ = pid; }
protected:
ChannelMojo(Delegate* delegate,
@@ -130,6 +127,13 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel,
Mode mode,
Listener* listener);
+ mojo::ScopedMessagePipeHandle CreateMessagingPipe(
+ mojo::embedder::ScopedPlatformHandle handle);
+ void InitMessageReader(mojo::ScopedMessagePipeHandle pipe, int32_t peer_pid);
+
+ Listener* listener() const { return listener_; }
+ void set_peer_pid(base::ProcessId pid) { peer_pid_ = pid; }
+
private:
struct ChannelInfoDeleter {
void operator()(mojo::embedder::ChannelInfo* ptr) const;
@@ -141,7 +145,6 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel,
typedef internal::MessagePipeReader::DelayedDeleter ReaderDeleter;
void InitDelegate(ChannelMojo::Delegate* delegate);
- void InitControlReader(mojo::embedder::ScopedPlatformHandle handle);
scoped_ptr<MojoBootstrap> bootstrap_;
base::WeakPtr<Delegate> delegate_;
@@ -151,7 +154,6 @@ class IPC_MOJO_EXPORT ChannelMojo : public Channel,
scoped_ptr<mojo::embedder::ChannelInfo,
ChannelInfoDeleter> channel_info_;
- scoped_ptr<internal::ControlReader, ReaderDeleter> control_reader_;
scoped_ptr<internal::MessageReader, ReaderDeleter> message_reader_;
ScopedVector<Message> pending_messages_;

Powered by Google App Engine
This is Rietveld 408576698